diff --git a/Herebyfile.mjs b/Herebyfile.mjs index 781bf86a8aa02..9089afba368a7 100644 --- a/Herebyfile.mjs +++ b/Herebyfile.mjs @@ -649,13 +649,13 @@ const copyBuiltLocalDiagnosticMessages = task({ export const otherOutputs = task({ name: "other-outputs", - description: "Builds miscelaneous scripts and documents distributed with the LKG", + description: "Builds miscellaneous scripts and documents distributed with the LKG", dependencies: [typingsInstaller, watchGuard, generateTypesMap, copyBuiltLocalDiagnosticMessages], }); export const watchOtherOutputs = task({ name: "watch-other-outputs", - description: "Builds miscelaneous scripts and documents distributed with the LKG", + description: "Builds miscellaneous scripts and documents distributed with the LKG", hiddenFromTaskList: true, dependencies: [watchTypingsInstaller, watchWatchGuard, generateTypesMap, copyBuiltLocalDiagnosticMessages], }); @@ -704,7 +704,7 @@ export const runTestsAndWatch = task({ dependencies: [watchTests], run: async () => { if (!cmdLineOptions.tests && !cmdLineOptions.failed) { - console.log(pc.redBright(`You must specifiy either --tests/-t or --failed to use 'runtests-watch'.`)); + console.log(pc.redBright(`You must specify either --tests/-t or --failed to use 'runtests-watch'.`)); return; } diff --git a/scripts/eslint/rules/argument-trivia.cjs b/scripts/eslint/rules/argument-trivia.cjs index 44e3d4391e000..7636c59910100 100644 --- a/scripts/eslint/rules/argument-trivia.cjs +++ b/scripts/eslint/rules/argument-trivia.cjs @@ -117,7 +117,7 @@ module.exports = createRule({ const name = ts.unescapeLeadingUnderscores(expectedName); // If a parameter is unused, we prepend an underscore. Ignore this // so that we can switch between used and unused without modifying code, - // requiring that arugments are tagged with the non-underscored name. + // requiring that arguments are tagged with the non-underscored name. return name.startsWith("_") ? name.slice(1) : name; } } diff --git a/scripts/eslint/tests/support/RuleTester.cjs b/scripts/eslint/tests/support/RuleTester.cjs index 51ed464060f69..2c612847bf785 100644 --- a/scripts/eslint/tests/support/RuleTester.cjs +++ b/scripts/eslint/tests/support/RuleTester.cjs @@ -2,7 +2,7 @@ const path = require("path"); const Mocha = require("mocha"); const { RuleTester } = require("@typescript-eslint/rule-tester"); -RuleTester.afterAll = Mocha.after; +RuleTester.after all = Mocha.after; module.exports.ROOT_DIR = path.join(process.cwd(), "scripts", "eslint", "tests", "fixtures"); module.exports.FILENAME = path.join(module.exports.ROOT_DIR, "file.ts"); diff --git a/src/compiler/builder.ts b/src/compiler/builder.ts index 34adf6e49b7da..91a0b57cae3c0 100644 --- a/src/compiler/builder.ts +++ b/src/compiler/builder.ts @@ -340,7 +340,7 @@ function createBuilderProgramState( let canCopySemanticDiagnostics = useOldState && !compilerOptionsAffectSemanticDiagnostics(compilerOptions, oldCompilerOptions!); // We can only reuse emit signatures (i.e. .d.ts signatures) if the .d.ts file is unchanged, - // which will eg be depedent on change in options like declarationDir and outDir options are unchanged. + // which will eg be dependent on change in options like declarationDir and outDir options are unchanged. // We need to look in oldState.compilerOptions, rather than oldCompilerOptions (i.e.we need to disregard useOldState) because // oldCompilerOptions can be undefined if there was change in say module from None to some other option // which would make useOldState as false since we can now use reference maps that are needed to track what to emit, what to check etc @@ -359,7 +359,7 @@ function createBuilderProgramState( } state.programEmitPending = oldState!.programEmitPending; // If there is changeSet with --outFile, cannot copy semantic diagnsotics or emitDiagnostics - // as they all need to be calculated again all together since we dont know whats the affected file set because of the way d.ts works + // as they all need to be calculated again all together since we dont know what's the affected file set because of the way d.ts works if (outFilePath && state.changedFilesSet.size) { canCopySemanticDiagnostics = false; canCopyEmitDiagnostics = false; @@ -367,7 +367,7 @@ function createBuilderProgramState( state.hasErrorsFromOldState = oldState!.hasErrors; } else { - // We arent using old state, so atleast emit buildInfo with current information + // We aren't using old state, so at least emit buildInfo with current information state.buildInfoEmitPending = isIncrementalCompilation(compilerOptions); } @@ -489,7 +489,7 @@ function createBuilderProgramState( state.changedFilesSet.add(path); if (outFilePath) { // If there is changeSet with --outFile, cannot copy semantic diagnsotics or emitDiagnostics - // as they all need to be calculated again all together since we dont know whats the affected file set because of the way d.ts works + // as they all need to be calculated again all together since we dont know what's the affected file set because of the way d.ts works canCopySemanticDiagnostics = false; canCopyEmitDiagnostics = false; state.semanticDiagnosticsFromOldState = undefined; @@ -620,7 +620,7 @@ function releaseCache(state: BuilderProgramState) { } /** - * Verifies that source file is ok to be used in calls that arent handled by next + * Verifies that source file is ok to be used in calls that aren't handled by next */ function assertSourceFileOkWithoutNextAffectedCall(state: BuilderProgramState, sourceFile: SourceFile | undefined) { Debug.assert(!sourceFile || !state.affectedFiles || state.affectedFiles[state.affectedFilesIndex! - 1] !== sourceFile || !state.semanticDiagnosticsPerFile.has(sourceFile.resolvedPath)); @@ -1063,7 +1063,7 @@ function getBinderAndCheckerDiagnosticsOfFile( return filterSemanticDiagnostics(cachedDiagnostics, state.compilerOptions); } - // Diagnostics werent cached, get them from program, and cache the result + // Diagnostics weren't cached, get them from program, and cache the result const diagnostics = state.program.getBindAndCheckDiagnostics(sourceFile, cancellationToken); semanticDiagnosticsPerFile.set(path, diagnostics); state.buildInfoEmitPending = true; @@ -1105,7 +1105,7 @@ export type IncrementalMultiFileEmitBuildInfoBuilderStateFileInfo = Omit { // Ensure fileId const fileId = toFileId(key); @@ -1277,7 +1277,7 @@ function getBuildInfo(state: BuilderProgramStateWithDefinedProgram): BuildInfo { pendingEmit: !state.programEmitPending ? undefined : // Pending is undefined or None is encoded as undefined state.programEmitPending === getBuilderFileEmit(state.compilerOptions) ? - false : // Pending emit is same as deteremined by compilerOptions + false : // Pending emit is same as determined by compilerOptions state.programEmitPending, // Actual value errors: state.hasErrors ? true : undefined, checkPending: state.checkPending, @@ -1319,7 +1319,7 @@ function getBuildInfo(state: BuilderProgramStateWithDefinedProgram): BuildInfo { value.version : actualSignature !== undefined ? // If signature is not same as version, encode signature in the fileInfo oldSignature === undefined ? - // If we havent computed signature, use fileInfo as is + // If we haven't computed signature, use fileInfo as is value : // Serialize fileInfo with new updated signature { version: value.version, signature: actualSignature, affectsGlobalScope: value.affectsGlobalScope, impliedFormat: value.impliedFormat } : @@ -1685,7 +1685,7 @@ export function createBuilderProgram( const state = createBuilderProgramState(newProgram, oldState); newProgram.getBuildInfo = () => getBuildInfo(toBuilderProgramStateWithDefinedProgram(state)); - // To ensure that we arent storing any references to old program or new program without state + // To ensure that we aren't storing any references to old program or new program without state newProgram = undefined!; oldProgram = undefined; oldState = undefined; @@ -1968,7 +1968,7 @@ export function createBuilderProgram( /** * Compare to existing computed signature and store it or handle the changes in d.ts map option from before - * returning undefined means that, we dont need to emit this d.ts file since its contents didnt change + * returning undefined means that, we dont need to emit this d.ts file since its contents didn't change */ function handleNewSignature(oldSignatureFormat: EmitSignature | undefined, newSignature: string | undefined) { const oldSignature = !oldSignatureFormat || isString(oldSignatureFormat) ? oldSignatureFormat : oldSignatureFormat[0]; diff --git a/src/compiler/builderPublic.ts b/src/compiler/builderPublic.ts index 7a0265f84a579..9e555993a54b2 100644 --- a/src/compiler/builderPublic.ts +++ b/src/compiler/builderPublic.ts @@ -234,7 +234,7 @@ export function createEmitAndSemanticDiagnosticsBuilderProgram( } /** - * Creates a builder thats just abstraction over program and can be used with watch + * Creates a builder that's just abstraction over program and can be used with watch */ export function createAbstractBuilder( newProgram: Program, diff --git a/src/compiler/builderState.ts b/src/compiler/builderState.ts index 625a64e266fee..e188710300547 100644 --- a/src/compiler/builderState.ts +++ b/src/compiler/builderState.ts @@ -436,7 +436,7 @@ export namespace BuilderState { host: HostForComputeHash, useFileVersionAsSignature: boolean | undefined = state.useFileVersionAsSignature, ): boolean { - // If we have cached the result for this file, that means hence forth we should assume file shape is uptodate + // If we have cached the result for this file, that means hence forth we should assume file shape is up-to-date if (state.hasCalledUpdateShapeSignature?.has(sourceFile.resolvedPath)) return false; const info = state.fileInfos.get(sourceFile.resolvedPath)!; diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 0567712f11da3..a228dc9fdb4e4 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -3099,7 +3099,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { break; } - // ForIn/ForOf case - use site should not be used in expression part + // foreign/ForOf case - use site should not be used in expression part const grandparent = declaration.parent.parent; return isForInOrOfStatement(grandparent) && isSameScopeDescendentOf(usage, grandparent.expression, declContainer); } @@ -9232,7 +9232,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { } if (sym) { - // If a parameter is resolvable in the current context it is also visible, so no need to go to symbol accesibility + // If a parameter is resolvable in the current context it is also visible, so no need to go to symbol accessibility if ( sym.flags & SymbolFlags.FunctionScopedVariable && sym.valueDeclaration @@ -10334,7 +10334,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { context.approximateLength += 9; // `#private;` } const publicProperties = serializePropertySymbolsForClassOrInterface(publicSymbolProps, /*isClass*/ true, baseTypes[0], /*isStatic*/ false); - // Consider static members empty if symbol also has function or module meaning - function namespacey emit will handle statics + // Consider static members empty if symbol also has function or module meaning - function namespacey emit will handle statistics const staticMembers = serializePropertySymbolsForClassOrInterface( filter(getPropertiesOfType(staticType), p => !(p.flags & SymbolFlags.Prototype) && p.escapedName !== "prototype" && !isNamespaceMember(p)), /*isClass*/ true, @@ -10343,7 +10343,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { ); // When we encounter an `X.prototype.y` assignment in a JS file, we bind `X` as a class regardless as to whether // the value is ever initialized with a class or function-like value. For cases where `X` could never be - // created via `new`, we will inject a `private constructor()` declaration to indicate it is not createable. + // created via `new`, we will inject a `private constructor()` declaration to indicate it is not creatable. const isNonConstructableClassLikeInJsFile = !isClass && !!symbol.valueDeclaration && isInJSFile(symbol.valueDeclaration) && @@ -10821,7 +10821,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { const modifierFlags = getDeclarationModifierFlagsFromSymbol(p); const omitType = !!(modifierFlags & ModifierFlags.Private) && !isExpanding(context); if (isStatic && (p.flags & (SymbolFlags.Type | SymbolFlags.Namespace | SymbolFlags.Alias))) { - // Only value-only-meaning symbols can be correctly encoded as class statics, type/namespace/alias meaning symbols + // Only value-only-meaning symbols can be correctly encoded as class statistics, type/namespace/alias meaning symbols // need to be merged namespace members return []; } @@ -13391,7 +13391,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { return isValidBaseType(constraint); } } - // TODO: Given that we allow type parmeters here now, is this `!isGenericMappedType(type)` check really needed? + // TODO: Given that we allow type parameters here now, is this `!isGenericMappedType(type)` check really needed? // There's no reason a `T` should be allowed while a `Readonly` should not. return !!(type.flags & (TypeFlags.Object | TypeFlags.NonPrimitive | TypeFlags.Any) && !isGenericMappedType(type) || type.flags & TypeFlags.Intersection && every((type as IntersectionType).types, isValidBaseType)); @@ -14739,7 +14739,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { ) { // A reverse mapping of `{[K in keyof T[K_1]]: T[K_1]}` is the same as that of `{[K in keyof T]: T}`, since all we care about is // inferring to the "type parameter" (or indexed access) shared by the constraint and template. So, to reduce the number of - // type identities produced, we simplify such indexed access occurences + // type identities produced, we simplify such indexed access occurrences const newTypeParam = (type.constraintType.type as IndexedAccessType).objectType; const newMappedType = replaceIndexedAccess(type.mappedType, type.constraintType.type as ReplaceableIndexedAccessType, newTypeParam); inferredProp.links.mappedType = newMappedType as MappedType; @@ -16291,7 +16291,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { } else { // Parameter has no annotation - // By using a `DeferredType` symbol, we allow the type of this rest arg to be overriden by contextual type assignment so long as its type hasn't been + // By using a `DeferredType` symbol, we allow the type of this rest arg to be overridden by contextual type assignment so long as its type hasn't been // cached by `getTypeOfSymbol` yet. syntheticArgsSymbol.links.checkFlags |= CheckFlags.DeferredType; syntheticArgsSymbol.links.deferralParent = neverType; @@ -16392,7 +16392,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { } } // If this is a function or method declaration, get the signature from the @type tag for the sake of optional parameters. - // Exclude contextually-typed kinds because we already apply the @type tag to the context, plus applying it here to the initializer would supress checks that the two are compatible. + // Exclude contextually-typed kinds because we already apply the @type tag to the context, plus applying it here to the initializer would suppress checks that the two are compatible. result.push( (!isFunctionExpressionOrArrowFunction(decl) && !isObjectLiteralMethod(decl) && @@ -16851,7 +16851,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { } else { let type = getTypeFromTypeNode(constraintDeclaration); - if (type.flags & TypeFlags.Any && !isErrorType(type)) { // Allow errorType to propegate to keep downstream errors suppressed + if (type.flags & TypeFlags.Any && !isErrorType(type)) { // Allow errorType to propagate to keep downstream errors suppressed // use stringNumberSymbolType as the base constraint for mapped type key constraints (unknown isn;t assignable to that, but `any` was), // use unknown otherwise type = constraintDeclaration.parent.parent.kind === SyntaxKind.MappedType ? stringNumberSymbolType : unknownType; @@ -21023,7 +21023,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { } if (instantiationDepth === 100 || instantiationCount >= 5000000) { // We have reached 100 recursive type instantiations, or 5M type instantiations caused by the same statement - // or expression. There is a very high likelyhood we're dealing with a combination of infinite generic types + // or expression. There is a very high likelihood we're dealing with a combination of infinite generic types // that perpetually generate new type identities, so we stop the recursion here by yielding the error type. tracing?.instant(tracing.Phase.CheckTypes, "instantiateType_DepthLimit", { typeId: type.id, instantiationDepth, instantiationCount }); error(currentNode, Diagnostics.Type_instantiation_is_excessively_deep_and_possibly_infinite); @@ -21534,7 +21534,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { type ElaborationIterator = IterableIterator<{ errorNode: Node; innerExpression: Expression | undefined; nameType: Type; errorMessage?: DiagnosticMessage | undefined; }>; /** * For every element returned from the iterator, checks that element to issue an error on a property of that element's type - * If that element would issue an error, we first attempt to dive into that element's inner expression and issue a more specific error by recuring into `elaborateError` + * If that element would issue an error, we first attempt to dive into that element's inner expression and issue a more specific error by recurring into `elaborateError` * Otherwise, we issue an error on _every_ element which fail the assignability check */ function elaborateElementwise( @@ -22538,7 +22538,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { case Diagnostics.Call_signatures_with_no_arguments_have_incompatible_return_types_0_and_1.code: case Diagnostics.Construct_signatures_with_no_arguments_have_incompatible_return_types_0_and_1.code: { if (path.length === 0) { - // Don't flatten signature compatability errors at the start of a chain - instead prefer + // Don't flatten signature compatibility errors at the start of a chain - instead prefer // to unify (the with no arguments bit is excessive for printback) and print them back let mappedMsg = msg; if (msg.code === Diagnostics.Call_signatures_with_no_arguments_have_incompatible_return_types_0_and_1.code) { @@ -22912,7 +22912,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { if (!headMessage && maybeSuppress) { // We suppress a call to `reportRelationError` or not depending on the state of the type checker, so // we call `reportRelationError` here and then undo its effects to figure out what would be the diagnostic - // if we hadn't supress it, and save that as a canonical diagnostic for deduplication purposes. + // if we hadn't suppress it, and save that as a canonical diagnostic for deduplication purposes. const savedErrorState = captureErrorCalculationState(); reportRelationError(headMessage, source, target); let canonical; @@ -26597,7 +26597,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { } function templateLiteralTypesDefinitelyUnrelated(source: TemplateLiteralType, target: TemplateLiteralType) { - // Two template literal types with diffences in their starting or ending text spans are definitely unrelated. + // Two template literal types with differences in their starting or ending text spans are definitely unrelated. const sourceStart = source.texts[0]; const targetStart = target.texts[0]; const sourceEnd = source.texts[source.texts.length - 1]; @@ -29888,7 +29888,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { // as a subtype of `{}`, and we need the type facts check because function types are subtypes of `object`, // but are classified as "function" according to `typeof`. isTypeRelatedTo(t, impliedType, strictSubtypeRelation) ? hasTypeFacts(t, facts) ? t : neverType : - // We next check if the consituent is a supertype of the implied type. If so, we substitute the implied + // We next check if the constituent is a supertype of the implied type. If so, we substitute the implied // type. This handles top types like `unknown` and `{}`, and supertypes like `{ toString(): string }`. isTypeSubtypeOf(impliedType, t) ? impliedType : // Neither the constituent nor the implied type is a subtype of the other, however their domains may still @@ -30518,7 +30518,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { * unless you *really* want to *definitely* mark those as referenced. * These shouldn't be directly marked, and should only get marked transitively by the internals of this function. * - * @param location The location to mark js import refernces for + * @param location The location to mark js import references for * @param hint The kind of reference `location` has already been checked to be * @param propSymbol The optional symbol of the property we're looking up - this is used for property accesses when `const enum`s do not count as references (no `isolatedModules`, no `preserveConstEnums` + export). It will be calculated if not provided. * @param parentType The optional type of the parent of the LHS of the property access - this will be recalculated if not provided (but is costly). @@ -30696,10 +30696,10 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { if (jsxFactorySym) { // Mark local symbol as referenced here because it might not have been marked - // if jsx emit was not jsxFactory as there wont be error being emitted + // if jsx emit was not jsxFactory as there won't be error being emitted jsxFactorySym.isReferenced = SymbolFlags.All; - // If react/jsxFactory symbol is alias, mark it as refereced + // If react/jsxFactory symbol is alias, mark it as referenced if (canCollectSymbolAliasAccessabilityData && jsxFactorySym.flags & SymbolFlags.Alias && !getTypeOnlyAliasDeclaration(jsxFactorySym)) { markAliasSymbolAsReferenced(jsxFactorySym); } @@ -31010,7 +31010,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { } /** - * This part of `checkIdentifier` is kept seperate from the rest, so `NodeCheckFlags` (and related diagnostics) can be lazily calculated + * This part of `checkIdentifier` is kept separate from the rest, so `NodeCheckFlags` (and related diagnostics) can be lazily calculated * without calculating the flow type of the identifier. */ function checkIdentifierCalculateNodeCheckFlags(node: Identifier, symbol: Symbol) { @@ -34303,7 +34303,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { } function instantiateAliasOrInterfaceWithDefaults(managedSym: Symbol, inJs: boolean, ...typeArguments: Type[]) { - const declaredManagedType = getDeclaredTypeOfSymbol(managedSym); // fetches interface type, or initializes symbol links type parmaeters + const declaredManagedType = getDeclaredTypeOfSymbol(managedSym); // fetches interface type, or initializes symbol links type parameters if (managedSym.flags & SymbolFlags.TypeAlias) { const params = getSymbolLinks(managedSym).typeParameters; if (length(params) >= typeArguments.length) { @@ -37315,7 +37315,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { ); } if (hasSignatures) { - // Bail early if we already found a siganture, no chance of "No constituent of type is callable" + // Bail early if we already found a signature, no chance of "No constituent of type is callable" break; } } @@ -37669,7 +37669,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { if (!cached) { // If we haven't already done so, temporarily reset the resolution stack. This allows us to // handle "inverted" situations where, for example, an API client asks for the type of a symbol - // containined in a function call argument whose contextual type depends on the symbol itself + // contained in a function call argument whose contextual type depends on the symbol itself // through resolution of the containing function call. By resetting the resolution stack we'll // retry the symbol type resolution with the resolvingSignature marker in place to suppress // the contextual type circularity. @@ -39786,7 +39786,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { function isAssignmentToReadonlyEntity(expr: Expression, symbol: Symbol, assignmentKind: AssignmentKind) { if (assignmentKind === AssignmentKind.None) { - // no assigment means it doesn't matter whether the entity is readonly + // no assignment means it doesn't matter whether the entity is readonly return false; } if (isReadonlySymbol(symbol)) { @@ -43472,7 +43472,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { // SyntaxKind.ElementAccessExpression - `thing["aField"] = 42;` or `thing["aField"];` (with a doc comment on it) // or SyntaxKind.PropertyAccessExpression - `thing.aField = 42;` // all of which are pretty much always values, or at least imply a value meaning. - // It may be apprpriate to treat these as aliases in the future. + // It may be appropriate to treat these as aliases in the future. return DeclarationSpaces.ExportValue; case SyntaxKind.MethodSignature: case SyntaxKind.PropertySignature: @@ -44367,7 +44367,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { // Since the javascript won't do semantic analysis like typescript, // if the javascript file comes before the typescript file and both contain same name functions, - // checkFunctionOrConstructorSymbol wouldn't be called if we didnt ignore javascript function. + // checkFunctionOrConstructorSymbol wouldn't be called if we didn't ignore javascript function. const firstDeclaration = localSymbol.declarations?.find( // Get first non javascript function declaration declaration => declaration.kind === node.kind && !(declaration.flags & NodeFlags.JavaScriptFile), @@ -44878,7 +44878,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { return; } - // Uninstantiated modules shouldnt do this check + // Uninstantiated modules shouldn't do this check if (isModuleDeclaration(node) && getModuleInstanceState(node) !== ModuleInstanceState.Instantiated) { return; } @@ -44896,7 +44896,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { return; } - // Uninstantiated modules shouldnt do this check + // Uninstantiated modules shouldn't do this check if (isModuleDeclaration(node) && getModuleInstanceState(node) !== ModuleInstanceState.Instantiated) { return; } @@ -45039,7 +45039,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { container.kind === SyntaxKind.SourceFile); // here we know that function scoped variable is "shadowed" by block scoped one - // a var declatation can't hoist past a lexical declaration and it results in a SyntaxError at runtime + // a var declaration can't hoist past a lexical declaration and it results in a SyntaxError at runtime if (!namesShareScope) { const name = symbolToString(localDeclarationSymbol); error(node, Diagnostics.Cannot_initialize_outer_scoped_variable_0_in_the_same_scope_as_block_scoped_declaration_1, name, name); @@ -50787,7 +50787,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { const container = getSourceFileOfNode(symbol.valueDeclaration); const fileSymbol = container && getSymbolOfDeclaration(container); // Ensures cjs export assignment is setup, since this symbol may point at, and merge with, the file itself. - // If we don't, the merge may not have yet occured, and the flags check below will be missing flags that + // If we don't, the merge may not have yet occurred, and the flags check below will be missing flags that // are added as a result of the merge. void resolveExternalModuleSymbol(fileSymbol); const target = getExportSymbolOfValueSymbolIfExported(resolveAlias(symbol)); diff --git a/src/compiler/commandLineParser.ts b/src/compiler/commandLineParser.ts index c17cc4ef9ca01..4dd6bd6c13fcf 100644 --- a/src/compiler/commandLineParser.ts +++ b/src/compiler/commandLineParser.ts @@ -3921,7 +3921,7 @@ const wildcardDirectoryPattern = /^[^*?]*(?=\/[^/]*[*?])/; * @param basePath The base path for any relative file specifications. * @param options Compiler options. * @param host The host used to resolve files and directories. - * @param extraFileExtensions optionaly file extra file extension information from host + * @param extraFileExtensions optionally file extra file extension information from host * * @internal */ @@ -4116,7 +4116,7 @@ function getWildcardDirectories({ validatedIncludeSpecs: include, validatedExclu // // /a/b/**/d - Watch /a/b recursively to catch changes to any d in any subfolder recursively // /a/b/*/d - Watch /a/b recursively to catch any d in any immediate subfolder, even if a new subfolder is added - // /a/b - Watch /a/b recursively to catch changes to anything in any recursive subfoler + // /a/b - Watch /a/b recursively to catch changes to anything in any recursive subfolder // // We watch a directory without recursion if it contains a wildcard in the file segment of // the pattern: diff --git a/src/compiler/core.ts b/src/compiler/core.ts index 2085548836e8d..da5239fb03f52 100644 --- a/src/compiler/core.ts +++ b/src/compiler/core.ts @@ -1852,7 +1852,7 @@ function toLowerCase(x: string) { // | 7. | \u00DF | 223 | Lower case sharp s | // // Because item 3 is special where in its lowercase character has its own -// upper case form we cant convert its case. +// upper case form we can't convert its case. // Rest special characters are either already in lower case format or // they have corresponding upper case character so they dont need special handling // @@ -1864,10 +1864,10 @@ const fileNameLowerCaseRegExp = /[^\u0130\u0131\u00DFa-z0-9\\/:\-_. ]+/g; * This function is used in places where we want to make file name as a key on these systems * It is possible on mac to be able to refer to file name with I with dot on top as a fileName with its lower case form * But on windows we cannot. Windows can have fileName with I with dot on top next to its lower case and they can not each be referred with the lowercase forms - * Technically we would want this function to be platform sepcific as well but + * Technically we would want this function to be platform specific as well but * our api has till now only taken caseSensitive as the only input and just for some characters we dont want to update API and ensure all customers use those api * We could use upper case and we would still need to deal with the descripencies but - * we want to continue using lower case since in most cases filenames are lowercasewe and wont need any case changes and avoid having to store another string for the key + * we want to continue using lower case since in most cases filenames are lowercasewe and won't need any case changes and avoid having to store another string for the key * So for this function purpose, we go ahead and assume character I with dot on top it as case sensitive since its very unlikely to use lower case form of that special character * * @internal diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index 5a4858b572dc1..7a4a52af64fea 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -897,7 +897,7 @@ export function emitFiles( const filesForEmit = forceDtsEmit ? sourceFiles : filter(sourceFiles, isSourceFileNotJson); // Setup and perform the transformation to retrieve declarations from the input files const inputListOrBundle = compilerOptions.outFile ? [factory.createBundle(filesForEmit)] : filesForEmit; - // Checker wont collect the linked aliases since thats only done when declaration is enabled and checking is performed. + // Checker won't collect the linked aliases since that's only done when declaration is enabled and checking is performed. // Do that here when emitting only dts files filesForEmit.forEach(sourceFile => { if ( @@ -982,7 +982,7 @@ export function emitFiles( } function markLinkedReferences(file: SourceFile) { - if (ts.isSourceFileJS(file)) return; // JS files don't use reference calculations as they don't do import ellision, no need to calculate it + if (ts.isSourceFileJS(file)) return; // JS files don't use reference calculations as they don't do import elision, no need to calculate it ts.forEachChildRecursively(file, n => { if (isImportEqualsDeclaration(n) && !(ts.getSyntacticModifierFlags(n) & ts.ModifierFlags.Export)) return "skip"; // These are deferred and marked in a chain when referenced if (ts.isImportDeclaration(n)) return "skip"; // likewise, these are ultimately what get marked by calls on other nodes - we want to skip them diff --git a/src/compiler/executeCommandLine.ts b/src/compiler/executeCommandLine.ts index a43020c735fc1..1db4c2a0c2c2e 100644 --- a/src/compiler/executeCommandLine.ts +++ b/src/compiler/executeCommandLine.ts @@ -741,7 +741,7 @@ function executeCommandLineWorker( } } -/** Returns true if commandline is --build and needs to be parsed useing parseBuildCommand */ +/** Returns true if commandline is --build and needs to be parsed using parseBuildCommand */ export function isBuildCommand(commandLineArgs: readonly string[]): boolean { if (commandLineArgs.length > 0 && commandLineArgs[0].charCodeAt(0) === CharacterCodes.minus) { const firstOption = commandLineArgs[0].slice(commandLineArgs[0].charCodeAt(1) === CharacterCodes.minus ? 2 : 1).toLowerCase(); diff --git a/src/compiler/expressionToTypeNode.ts b/src/compiler/expressionToTypeNode.ts index 0df3a399b8f14..59d564556ae80 100644 --- a/src/compiler/expressionToTypeNode.ts +++ b/src/compiler/expressionToTypeNode.ts @@ -226,7 +226,7 @@ export function createSyntacticTypeNodeBuilder( // the position information if the node comes from a different file than the one the node builder // is set to build for (even though we are reusing the node structure, the position information // would make the printer print invalid spans for literals and identifiers, and the formatter would - // choke on the mismatched positonal spans between a parent and an injected child from another file). + // choke on the mismatched positional spans between a parent and an injected child from another file). return result ? resolver.markNodeReuse(context, result, node) : undefined; } @@ -693,7 +693,7 @@ export function createSyntacticTypeNodeBuilder( case SyntaxKind.ShorthandPropertyAssignment: return typeFromPropertyAssignment(node, symbol, context); default: - Debug.assertNever(node, `Node needs to be an inferrable node, found ${Debug.formatSyntaxKind((node as Node).kind)}`); + Debug.assertNever(node, `Node needs to be an inferable node, found ${Debug.formatSyntaxKind((node as Node).kind)}`); } } @@ -735,7 +735,7 @@ export function createSyntacticTypeNodeBuilder( case SyntaxKind.JSDocSignature: return createReturnFromSignature(node, symbol, context); default: - Debug.assertNever(node, `Node needs to be an inferrable node, found ${Debug.formatSyntaxKind((node as Node).kind)}`); + Debug.assertNever(node, `Node needs to be an inferable node, found ${Debug.formatSyntaxKind((node as Node).kind)}`); } } function getTypeAnnotationFromAccessor(accessor: AccessorDeclaration): TypeNode | undefined { diff --git a/src/compiler/factory/emitHelpers.ts b/src/compiler/factory/emitHelpers.ts index 255518a2842cf..109141ce538a9 100644 --- a/src/compiler/factory/emitHelpers.ts +++ b/src/compiler/factory/emitHelpers.ts @@ -1064,7 +1064,7 @@ const valuesHelper: UnscopedEmitHelper = { // generator body. The state object has the following members: // sent() - A method that returns or throws the current completion value. // label - The next point at which to resume evaluation of the generator body. -// trys - A stack of protected regions (try/catch/finally blocks). +// tries - A stack of protected regions (try/catch/finally blocks). // ops - A stack of pending instructions when inside of a finally block. // f A value indicating whether the generator is executing. // y An iterator to delegate for a yield*. @@ -1118,7 +1118,7 @@ const generatorHelper: UnscopedEmitHelper = { priority: 6, text: ` var __generator = (this && this.__generator) || function (thisArg, body) { - var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); + var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, tries: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; function verb(n) { return function (v) { return step([n, v]); }; } function step(op) { @@ -1130,14 +1130,14 @@ const generatorHelper: UnscopedEmitHelper = { case 0: case 1: t = op; break; case 4: _.label++; return { value: op[1], done: false }; case 5: _.label++; y = op[1]; op = [0]; continue; - case 7: op = _.ops.pop(); _.trys.pop(); continue; + case 7: op = _.ops.pop(); _.tries.pop(); continue; default: - if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } + if (!(t = _.tries, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } if (t[2]) _.ops.pop(); - _.trys.pop(); continue; + _.tries.pop(); continue; } op = body.call(thisArg, _); } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } diff --git a/src/compiler/factory/nodeFactory.ts b/src/compiler/factory/nodeFactory.ts index 03e0345c7ea7b..4ce918aa4343e 100644 --- a/src/compiler/factory/nodeFactory.ts +++ b/src/compiler/factory/nodeFactory.ts @@ -496,7 +496,7 @@ export function createNodeFactory(flags: NodeFactoryFlags, baseFactory: BaseNode const parenthesizerRules = memoize(() => flags & NodeFactoryFlags.NoParenthesizerRules ? nullParenthesizerRules : createParenthesizerRules(factory)); const converters = memoize(() => flags & NodeFactoryFlags.NoNodeConverters ? nullNodeConverters : createNodeConverters(factory)); - // lazy initializaton of common operator factories + // lazy initialization of common operator factories const getBinaryCreateFunction = memoizeOne((operator: BinaryOperator) => (left: Expression, right: Expression) => createBinaryExpression(left, operator, right)); const getPrefixUnaryCreateFunction = memoizeOne((operator: PrefixUnaryOperator) => (operand: Expression) => createPrefixUnaryExpression(operator, operand)); const getPostfixUnaryCreateFunction = memoizeOne((operator: PostfixUnaryOperator) => (operand: Expression) => createPostfixUnaryExpression(operand, operator)); diff --git a/src/compiler/factory/parenthesizerRules.ts b/src/compiler/factory/parenthesizerRules.ts index 58284decd437a..b584569c258b4 100644 --- a/src/compiler/factory/parenthesizerRules.ts +++ b/src/compiler/factory/parenthesizerRules.ts @@ -405,17 +405,17 @@ export function createParenthesizerRules(factory: NodeFactory): ParenthesizerRul return expression as LeftHandSideExpression; } - // TODO(rbuckton): Verifiy whether `setTextRange` is needed. + // TODO(rbuckton): Verify whether `setTextRange` is needed. return setTextRange(factory.createParenthesizedExpression(expression), expression); } function parenthesizeOperandOfPostfixUnary(operand: Expression): LeftHandSideExpression { - // TODO(rbuckton): Verifiy whether `setTextRange` is needed. + // TODO(rbuckton): Verify whether `setTextRange` is needed. return isLeftHandSideExpression(operand) ? operand : setTextRange(factory.createParenthesizedExpression(operand), operand); } function parenthesizeOperandOfPrefixUnary(operand: Expression): UnaryExpression { - // TODO(rbuckton): Verifiy whether `setTextRange` is needed. + // TODO(rbuckton): Verify whether `setTextRange` is needed. return isUnaryExpression(operand) ? operand : setTextRange(factory.createParenthesizedExpression(operand), operand); } @@ -428,7 +428,7 @@ export function createParenthesizerRules(factory: NodeFactory): ParenthesizerRul const emittedExpression = skipPartiallyEmittedExpressions(expression); const expressionPrecedence = getExpressionPrecedence(emittedExpression); const commaPrecedence = getOperatorPrecedence(SyntaxKind.BinaryExpression, SyntaxKind.CommaToken); - // TODO(rbuckton): Verifiy whether `setTextRange` is needed. + // TODO(rbuckton): Verify whether `setTextRange` is needed. return expressionPrecedence > commaPrecedence ? expression : setTextRange(factory.createParenthesizedExpression(expression), expression); } @@ -438,7 +438,7 @@ export function createParenthesizerRules(factory: NodeFactory): ParenthesizerRul const callee = emittedExpression.expression; const kind = skipPartiallyEmittedExpressions(callee).kind; if (kind === SyntaxKind.FunctionExpression || kind === SyntaxKind.ArrowFunction) { - // TODO(rbuckton): Verifiy whether `setTextRange` is needed. + // TODO(rbuckton): Verify whether `setTextRange` is needed. const updated = factory.updateCallExpression( emittedExpression, setTextRange(factory.createParenthesizedExpression(callee), callee), @@ -451,7 +451,7 @@ export function createParenthesizerRules(factory: NodeFactory): ParenthesizerRul const leftmostExpressionKind = getLeftmostExpression(emittedExpression, /*stopAtCallExpressions*/ false).kind; if (leftmostExpressionKind === SyntaxKind.ObjectLiteralExpression || leftmostExpressionKind === SyntaxKind.FunctionExpression) { - // TODO(rbuckton): Verifiy whether `setTextRange` is needed. + // TODO(rbuckton): Verify whether `setTextRange` is needed. return setTextRange(factory.createParenthesizedExpression(expression), expression); } @@ -462,7 +462,7 @@ export function createParenthesizerRules(factory: NodeFactory): ParenthesizerRul function parenthesizeConciseBodyOfArrowFunction(body: ConciseBody): ConciseBody; function parenthesizeConciseBodyOfArrowFunction(body: ConciseBody): ConciseBody { if (!isBlock(body) && (isCommaSequence(body) || getLeftmostExpression(body, /*stopAtCallExpressions*/ false).kind === SyntaxKind.ObjectLiteralExpression)) { - // TODO(rbuckton): Verifiy whether `setTextRange` is needed. + // TODO(rbuckton): Verify whether `setTextRange` is needed. return setTextRange(factory.createParenthesizedExpression(body), body); } diff --git a/src/compiler/moduleNameResolver.ts b/src/compiler/moduleNameResolver.ts index bfa3384d58e77..2b9e6ed131392 100644 --- a/src/compiler/moduleNameResolver.ts +++ b/src/compiler/moduleNameResolver.ts @@ -1537,7 +1537,7 @@ type ResolutionKindSpecificLoader = (extensions: Extensions, candidate: string, * // it is rooted so it will be final candidate location * } * - * 'rootDirs' allows the project to be spreaded across multiple locations and resolve modules with relative names as if + * 'rootDirs' allows the project to be spread across multiple locations and resolve modules with relative names as if * they were in the same location. For example lets say there are two files * '/local/src/content/file1.ts' * '/shared/components/contracts/src/content/protocols/file2.ts' @@ -2947,7 +2947,7 @@ function getLoadModuleFromTargetExportOrImport(extensions: Extensions, state: Mo for (const candidateDir of candidateDirectories) { if (containsPath(candidateDir, finalPath, !useCaseSensitiveFileNames(state))) { // The matched export is looking up something in either the out declaration or js dir, now map the written path back into the source dir and source extension - const pathFragment = finalPath.slice(candidateDir.length + 1); // +1 to also remove directory seperator + const pathFragment = finalPath.slice(candidateDir.length + 1); // +1 to also remove directory separator const possibleInputBase = combinePaths(commonSourceDirGuess, pathFragment); const jsAndDtsExtensions = [Extension.Mjs, Extension.Cjs, Extension.Js, Extension.Json, Extension.Dmts, Extension.Dcts, Extension.Dts]; for (const ext of jsAndDtsExtensions) { @@ -2969,7 +2969,7 @@ function getLoadModuleFromTargetExportOrImport(extensions: Extensions, state: Mo return undefined; function getOutputDirectoriesForBaseDirectory(commonSourceDirGuess: string) { - // Config file ouput paths are processed to be relative to the host's current directory, while + // Config file output paths are processed to be relative to the host's current directory, while // otherwise the paths are resolved relative to the common source dir the compiler puts together const currentDir = state.compilerOptions.configFile ? state.host.getCurrentDirectory?.() || "" : commonSourceDirGuess; const candidateDirectories = []; @@ -3357,7 +3357,7 @@ export function shouldAllowImportingTsExtension(compilerOptions: CompilerOptions /** * A host may load a module from a global cache of typings. - * This is the minumum code needed to expose that functionality; the rest is in the host. + * This is the minimum code needed to expose that functionality; the rest is in the host. * * @internal */ diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts index 68133ac5f1e40..1ce2725736d39 100644 --- a/src/compiler/parser.ts +++ b/src/compiler/parser.ts @@ -2357,7 +2357,7 @@ namespace Parser { /** * Provides a better error message than the generic "';' expected" if possible for - * known common variants of a missing semicolon, such as from a mispelled names. + * known common variants of a missing semicolon, such as from a misspelled names. * * @param node Node preceding the expected semicolon location. */ diff --git a/src/compiler/program.ts b/src/compiler/program.ts index b44a155f0146c..1de80fbbb9060 100644 --- a/src/compiler/program.ts +++ b/src/compiler/program.ts @@ -1302,7 +1302,7 @@ export function isProgramUptoDate( // Add to seen before checking the referenced paths of this config file (seenResolvedRefs || (seenResolvedRefs = [])).push(oldResolvedRef); - // If child project references are upto date, this project reference is uptodate + // If child project references are upto date, this project reference is up-to-date return !forEach( oldResolvedRef.references, (childResolvedRef, index) => @@ -1314,7 +1314,7 @@ export function isProgramUptoDate( } // In old program, not able to resolve project reference path, - // so if config file doesnt exist, it is uptodate. + // so if config file doesnt exist, it is up-to-date. const refPath = resolveProjectReferencePath(oldRef); return !getParsedCommandLine(refPath); } @@ -2107,12 +2107,12 @@ export function createProgram(_rootNamesOrOptions: readonly string[] | CreatePro const redirect = getRedirectFromSourceFile(file.originalFileName); if (redirect || !isDeclarationFileName(file.originalFileName)) return redirect?.resolvedRef; - // The originalFileName could not be actual source file name if file found was d.ts from referecned project + // The originalFileName could not be actual source file name if file found was d.ts from referenced project // So in this case try to look up if this is output from referenced project, if it is use the redirected project in that case const resultFromDts = getRedirectFromOutput(file.path)?.resolvedRef; if (resultFromDts) return resultFromDts; - // If preserveSymlinks is true, module resolution wont jump the symlink + // If preserveSymlinks is true, module resolution won't jump the symlink // but the resolved real path may be the .d.ts from project reference // Note:: Currently we try the real path only if the // file is from node_modules to avoid having to run real path on all file paths @@ -2335,7 +2335,7 @@ export function createProgram(_rootNamesOrOptions: readonly string[] | CreatePro } }, (oldProjectReferences, parent) => { - // If array of references is changed, we cant resue old program + // If array of references is changed, we can't resue old program const newReferences = parent ? getResolvedProjectReferenceByPath(parent.sourceFile.path)!.commandLine.projectReferences : projectReferences; return !arrayIsEqualTo(oldProjectReferences, newReferences, projectReferenceIsEqualTo); }, @@ -2373,8 +2373,8 @@ export function createProgram(_rootNamesOrOptions: readonly string[] | CreatePro const modifiedSourceFiles: SourceFile[] = []; structureIsReused = StructureIsReused.Completely; - // If the missing file paths are now present, it can change the progam structure, - // and hence cant reuse the structure. + // If the missing file paths are now present, it can change the program structure, + // and hence can't reuse the structure. // This is same as how we dont reuse the structure if one of the file from old program is now missing if (forEachEntry(oldProgram.getMissingFilePaths(), missingFileName => host.fileExists(missingFileName))) { return StructureIsReused.Not; @@ -2423,7 +2423,7 @@ export function createProgram(_rootNamesOrOptions: readonly string[] | CreatePro fileChanged = newSourceFile !== oldSourceFile; } - // Since the project references havent changed, its right to set originalFileName and resolvedPath here + // Since the project references haven't changed, its right to set originalFileName and resolvedPath here newSourceFile.path = oldSourceFile.path; newSourceFile.originalFileName = oldSourceFile.originalFileName; newSourceFile.resolvedPath = oldSourceFile.resolvedPath; @@ -3234,7 +3234,7 @@ export function createProgram(_rootNamesOrOptions: readonly string[] | CreatePro } // Since these are syntactic diagnostics, parent might not have been set - // this means the sourceFile cannot be infered from the node + // this means the sourceFile cannot be inferred from the node function createDiagnosticForNode(node: Node, message: DiagnosticMessage, ...args: DiagnosticArguments): DiagnosticWithLocation { return createDiagnosticForNodeInSourceFile(sourceFile, node, message, ...args); } @@ -3546,7 +3546,7 @@ export function createProgram(_rootNamesOrOptions: readonly string[] | CreatePro const path = toPath(fileName); if (useSourceOfProjectReferenceRedirect) { let source = getRedirectFromOutput(path); - // If preserveSymlinks is true, module resolution wont jump the symlink + // If preserveSymlinks is true, module resolution won't jump the symlink // but the resolved real path may be the .d.ts from project reference // Note:: Currently we try the real path only if the // file is from node_modules to avoid having to run real path on all file paths @@ -3617,7 +3617,7 @@ export function createProgram(_rootNamesOrOptions: readonly string[] | CreatePro const redirectProject = getRedirectFromSourceFile(fileName); if (redirectProject?.outputDts) { if (redirectProject.resolvedRef.commandLine.options.outFile) { - // Shouldnt create many to 1 mapping file in --out scenario + // Shouldn't create many to 1 mapping file in --out scenario return undefined; } fileName = redirectProject.outputDts; @@ -4121,7 +4121,7 @@ export function createProgram(_rootNamesOrOptions: readonly string[] | CreatePro verifyDeprecatedCompilerOptions(); verifyProjectReferences(); - // List of collected files is complete; validate exhautiveness if this is a project with a file list + // List of collected files is complete; validate exhaustiveness if this is a project with a file list if (options.composite) { const rootPaths = new Set(rootNames.map(toPath)); for (const file of files) { @@ -4935,7 +4935,7 @@ function updateHostForUseSourceOfProjectReferenceRedirect(host: HostForUseSource if (originalGetDirectories) { // Call getDirectories only if directory actually present on the host - // This is needed to ensure that we arent getting directories that we fake about presence for + // This is needed to ensure that we aren't getting directories that we fake about presence for host.compilerHost.getDirectories = path => !host.getResolvedProjectReferences() || (originalDirectoryExists && originalDirectoryExists.call(host.compilerHost, path)) ? originalGetDirectories.call(host.compilerHost, path) : diff --git a/src/compiler/programDiagnostics.ts b/src/compiler/programDiagnostics.ts index fd11d1ec0ec99..8973eb3ef44f2 100644 --- a/src/compiler/programDiagnostics.ts +++ b/src/compiler/programDiagnostics.ts @@ -274,9 +274,9 @@ export function createProgramDiagnostics(getCompilerOptionsObjectLiteralSyntax: // - File is in program because: // - Files reasons listed // - extra reason if its not already processed - this happens in case sensitive file system where files differ in casing and we are giving reasons for two files so reason is not in file's reason - // fyi above whole secton is ommited if we have single reason and we are reporting at that reason's location + // fyi above whole section is omitted if we have single reason and we are reporting at that reason's location // - redirect and additional information about file - // So cache result if we havent ommited file include reasons + // So cache result if we haven't omitted file include reasons if (file) { if (cachedChain) { // Cache new fileIncludeDetails if we have update @@ -288,7 +288,7 @@ export function createProgramDiagnostics(getCompilerOptionsObjectLiteralSyntax: else { (fileReasonsToChain ??= new Map()).set(file.path, cachedChain = { fileIncludeReasonDetails, redirectInfo }); } - // If we didnt compute extra file include reason , cache the details to use directly + // If we didn't compute extra file include reason , cache the details to use directly if (!cachedChain.details && !processedExtraReason) cachedChain.details = chain.next; } diff --git a/src/compiler/resolutionCache.ts b/src/compiler/resolutionCache.ts index da7c2f288947d..115c343fa2a24 100644 --- a/src/compiler/resolutionCache.ts +++ b/src/compiler/resolutionCache.ts @@ -1682,7 +1682,7 @@ export function createResolutionCache(resolutionHost: ResolutionCacheHost, rootD } // we need to assume the directories exist to ensure that we can get all the type root directories that get included - // But filter directories that are at root level to say directory doesnt exist, so that we arent watching them + // But filter directories that are at root level to say directory doesnt exist, so that we aren't watching them const typeRoots = getEffectiveTypeRoots(options, { getCurrentDirectory }); if (typeRoots) { mutateMap( diff --git a/src/compiler/scanner.ts b/src/compiler/scanner.ts index 343df39ad9cbc..31858bc5e5424 100644 --- a/src/compiler/scanner.ts +++ b/src/compiler/scanner.ts @@ -4093,7 +4093,7 @@ const binaryUnicodePropertiesOfStrings = new Set(["Basic_Emoji", "Emoji_Keycap_S // dprint-ignore const valuesOfNonBinaryUnicodeProperties = { General_Category: new Set(["C", "Other", "Cc", "Control", "cntrl", "Cf", "Format", "Cn", "Unassigned", "Co", "Private_Use", "Cs", "Surrogate", "L", "Letter", "LC", "Cased_Letter", "Ll", "Lowercase_Letter", "Lm", "Modifier_Letter", "Lo", "Other_Letter", "Lt", "Titlecase_Letter", "Lu", "Uppercase_Letter", "M", "Mark", "Combining_Mark", "Mc", "Spacing_Mark", "Me", "Enclosing_Mark", "Mn", "Nonspacing_Mark", "N", "Number", "Nd", "Decimal_Number", "digit", "Nl", "Letter_Number", "No", "Other_Number", "P", "Punctuation", "punct", "Pc", "Connector_Punctuation", "Pd", "Dash_Punctuation", "Pe", "Close_Punctuation", "Pf", "Final_Punctuation", "Pi", "Initial_Punctuation", "Po", "Other_Punctuation", "Ps", "Open_Punctuation", "S", "Symbol", "Sc", "Currency_Symbol", "Sk", "Modifier_Symbol", "Sm", "Math_Symbol", "So", "Other_Symbol", "Z", "Separator", "Zl", "Line_Separator", "Zp", "Paragraph_Separator", "Zs", "Space_Separator"]), - Script: new Set(["Adlm", "Adlam", "Aghb", "Caucasian_Albanian", "Ahom", "Arab", "Arabic", "Armi", "Imperial_Aramaic", "Armn", "Armenian", "Avst", "Avestan", "Bali", "Balinese", "Bamu", "Bamum", "Bass", "Bassa_Vah", "Batk", "Batak", "Beng", "Bengali", "Bhks", "Bhaiksuki", "Bopo", "Bopomofo", "Brah", "Brahmi", "Brai", "Braille", "Bugi", "Buginese", "Buhd", "Buhid", "Cakm", "Chakma", "Cans", "Canadian_Aboriginal", "Cari", "Carian", "Cham", "Cher", "Cherokee", "Chrs", "Chorasmian", "Copt", "Coptic", "Qaac", "Cpmn", "Cypro_Minoan", "Cprt", "Cypriot", "Cyrl", "Cyrillic", "Deva", "Devanagari", "Diak", "Dives_Akuru", "Dogr", "Dogra", "Dsrt", "Deseret", "Dupl", "Duployan", "Egyp", "Egyptian_Hieroglyphs", "Elba", "Elbasan", "Elym", "Elymaic", "Ethi", "Ethiopic", "Geor", "Georgian", "Glag", "Glagolitic", "Gong", "Gunjala_Gondi", "Gonm", "Masaram_Gondi", "Goth", "Gothic", "Gran", "Grantha", "Grek", "Greek", "Gujr", "Gujarati", "Guru", "Gurmukhi", "Hang", "Hangul", "Hani", "Han", "Hano", "Hanunoo", "Hatr", "Hatran", "Hebr", "Hebrew", "Hira", "Hiragana", "Hluw", "Anatolian_Hieroglyphs", "Hmng", "Pahawh_Hmong", "Hmnp", "Nyiakeng_Puachue_Hmong", "Hrkt", "Katakana_Or_Hiragana", "Hung", "Old_Hungarian", "Ital", "Old_Italic", "Java", "Javanese", "Kali", "Kayah_Li", "Kana", "Katakana", "Kawi", "Khar", "Kharoshthi", "Khmr", "Khmer", "Khoj", "Khojki", "Kits", "Khitan_Small_Script", "Knda", "Kannada", "Kthi", "Kaithi", "Lana", "Tai_Tham", "Laoo", "Lao", "Latn", "Latin", "Lepc", "Lepcha", "Limb", "Limbu", "Lina", "Linear_A", "Linb", "Linear_B", "Lisu", "Lyci", "Lycian", "Lydi", "Lydian", "Mahj", "Mahajani", "Maka", "Makasar", "Mand", "Mandaic", "Mani", "Manichaean", "Marc", "Marchen", "Medf", "Medefaidrin", "Mend", "Mende_Kikakui", "Merc", "Meroitic_Cursive", "Mero", "Meroitic_Hieroglyphs", "Mlym", "Malayalam", "Modi", "Mong", "Mongolian", "Mroo", "Mro", "Mtei", "Meetei_Mayek", "Mult", "Multani", "Mymr", "Myanmar", "Nagm", "Nag_Mundari", "Nand", "Nandinagari", "Narb", "Old_North_Arabian", "Nbat", "Nabataean", "Newa", "Nkoo", "Nko", "Nshu", "Nushu", "Ogam", "Ogham", "Olck", "Ol_Chiki", "Orkh", "Old_Turkic", "Orya", "Oriya", "Osge", "Osage", "Osma", "Osmanya", "Ougr", "Old_Uyghur", "Palm", "Palmyrene", "Pauc", "Pau_Cin_Hau", "Perm", "Old_Permic", "Phag", "Phags_Pa", "Phli", "Inscriptional_Pahlavi", "Phlp", "Psalter_Pahlavi", "Phnx", "Phoenician", "Plrd", "Miao", "Prti", "Inscriptional_Parthian", "Rjng", "Rejang", "Rohg", "Hanifi_Rohingya", "Runr", "Runic", "Samr", "Samaritan", "Sarb", "Old_South_Arabian", "Saur", "Saurashtra", "Sgnw", "SignWriting", "Shaw", "Shavian", "Shrd", "Sharada", "Sidd", "Siddham", "Sind", "Khudawadi", "Sinh", "Sinhala", "Sogd", "Sogdian", "Sogo", "Old_Sogdian", "Sora", "Sora_Sompeng", "Soyo", "Soyombo", "Sund", "Sundanese", "Sylo", "Syloti_Nagri", "Syrc", "Syriac", "Tagb", "Tagbanwa", "Takr", "Takri", "Tale", "Tai_Le", "Talu", "New_Tai_Lue", "Taml", "Tamil", "Tang", "Tangut", "Tavt", "Tai_Viet", "Telu", "Telugu", "Tfng", "Tifinagh", "Tglg", "Tagalog", "Thaa", "Thaana", "Thai", "Tibt", "Tibetan", "Tirh", "Tirhuta", "Tnsa", "Tangsa", "Toto", "Ugar", "Ugaritic", "Vaii", "Vai", "Vith", "Vithkuqi", "Wara", "Warang_Citi", "Wcho", "Wancho", "Xpeo", "Old_Persian", "Xsux", "Cuneiform", "Yezi", "Yezidi", "Yiii", "Yi", "Zanb", "Zanabazar_Square", "Zinh", "Inherited", "Qaai", "Zyyy", "Common", "Zzzz", "Unknown"]), + Script: new Set(["Adlm", "Adlam", "Aghb", "Caucasian_Albanian", "Ahom", "Arab", "Arabic", "Armi", "Imperial_Aramaic", "Armn", "Armenian", "Avst", "Avestan", "Bali", "Balinese", "Bamu", "Bamum", "Bass", "Bassa_Vah", "Batk", "Batak", "Being", "Bengali", "Bhks", "Bhaiksuki", "Bopo", "Bopomofo", "Brah", "Brahmi", "Brai", "Braille", "Bugi", "Buginese", "Buhd", "Buhid", "Cakm", "Chakma", "Cans", "Canadian_Aboriginal", "Cari", "Carian", "Cham", "Cher", "Cherokee", "Chrs", "Chorasmian", "Copt", "Coptic", "Qaac", "Cpmn", "Cypro_Minoan", "Cprt", "Cypriot", "Cyrl", "Cyrillic", "Deva", "Devanagari", "Diak", "Dives_Akuru", "Dogr", "Dogra", "Dsrt", "Deseret", "Dupl", "Duployan", "Egyp", "Egyptian_Hieroglyphs", "Elba", "Elbasan", "Elym", "Elymaic", "Ethi", "Ethiopic", "Geor", "Georgian", "Glag", "Glagolitic", "Gong", "Gunjala_Gondi", "Gonm", "Masaram_Gondi", "Goth", "Gothic", "Gran", "Grantha", "Grek", "Greek", "Gujr", "Gujarati", "Guru", "Gurmukhi", "Hang", "Hangul", "Hani", "Han", "Hano", "Hanunoo", "Hatr", "Hatran", "Hebr", "Hebrew", "Hira", "Hiragana", "Hluw", "Anatolian_Hieroglyphs", "Hmng", "Pahawh_Hmong", "Hmnp", "Nyiakeng_Puachue_Hmong", "Hrkt", "Katakana_Or_Hiragana", "Hung", "Old_Hungarian", "Ital", "Old_Italic", "Java", "Javanese", "Kali", "Kayah_Li", "Kana", "Katakana", "Kawi", "Khar", "Kharoshthi", "Khmr", "Khmer", "Khoj", "Khojki", "Kits", "Khitan_Small_Script", "Knda", "Kannada", "Kthi", "Kaithi", "Lana", "Tai_Tham", "Laoo", "Lao", "Latn", "Latin", "Lepc", "Lepcha", "Limb", "Limbu", "Lina", "Linear_A", "Linb", "Linear_B", "Lisu", "Lyci", "Lycian", "Lydi", "Lydian", "Mahj", "Mahajani", "Make", "Makasar", "Mand", "Mandaic", "Mani", "Manichaean", "Marc", "Marchen", "Medf", "Medefaidrin", "Mend", "Mende_Kikakui", "Merc", "Meroitic_Cursive", "Mero", "Meroitic_Hieroglyphs", "Mlym", "Malayalam", "Modi", "Mong", "Mongolian", "Mroo", "Mro", "Mtei", "Meetei_Mayek", "Mult", "Multani", "Mymr", "Myanmar", "Nagm", "Nag_Mundari", "Nand", "Nandinagari", "Narb", "Old_North_Arabian", "Nbat", "Nabataean", "Newa", "Nkoo", "Nko", "Nshu", "Nushu", "Ogam", "Ogham", "Olck", "Ol_Chiki", "Orkh", "Old_Turkic", "Orya", "Oriya", "Osge", "Osage", "Osma", "Osmanya", "Ougr", "Old_Uyghur", "Palm", "Palmyrene", "Pauc", "Pau_Cin_Hau", "Perm", "Old_Permic", "Phag", "Phags_Pa", "Phli", "Inscriptional_Pahlavi", "Phlp", "Psalter_Pahlavi", "Phnx", "Phoenician", "Plrd", "Miao", "Prti", "Inscriptional_Parthian", "Rjng", "Rejang", "Rohg", "Hanifi_Rohingya", "Runr", "Runic", "Samr", "Samaritan", "Sarb", "Old_South_Arabian", "Saur", "Saurashtra", "Sgnw", "SignWriting", "Shaw", "Shavian", "Shrd", "Sharada", "Sidd", "Siddham", "Sind", "Khudawadi", "Sinh", "Sinhala", "Sogd", "Sogdian", "Sogo", "Old_Sogdian", "Sora", "Sora_Sompeng", "Soyo", "Soyombo", "Sund", "Sundanese", "Sylo", "Syloti_Nagri", "Syrc", "Syriac", "Tagb", "Tagbanwa", "Takr", "Takri", "Tale", "Tai_Le", "Talu", "New_Tai_Lue", "Taml", "Tamil", "Tang", "Tangut", "Tavt", "Tai_Viet", "Telu", "Telugu", "Tfng", "Tifinagh", "Tglg", "Tagalog", "Thaa", "Thaana", "Thai", "Tibt", "Tibetan", "Tirh", "Tirhuta", "Tnsa", "Tangsa", "Toto", "Ugar", "Ugaritic", "Vaii", "Vai", "Vith", "Vithkuqi", "Wara", "Warang_Citi", "Wcho", "Wancho", "Xpeo", "Old_Persian", "Xsux", "Cuneiform", "Yezi", "Yezidi", "Yiii", "Yi", "Zanb", "Zanabazar_Square", "Zinh", "Inherited", "Qaai", "Zyyy", "Common", "Zzzz", "Unknown"]), Script_Extensions: undefined! as Set, }; // The Script_Extensions property of a character contains one or more Script values. See https://www.unicode.org/reports/tr24/#Script_Extensions diff --git a/src/compiler/sourcemap.ts b/src/compiler/sourcemap.ts index 1ce989b250af7..7e67d30a16b72 100644 --- a/src/compiler/sourcemap.ts +++ b/src/compiler/sourcemap.ts @@ -199,7 +199,7 @@ export function createSourceMapGenerator(host: EmitHost, file: string, sourceRoo ) { continue; } - // Then reencode all the updated mappings into the overall map + // Then re-encode all the updated mappings into the overall map let newSourceIndex: number | undefined; let newSourceLine: number | undefined; let newSourceCharacter: number | undefined; diff --git a/src/compiler/symbolWalker.ts b/src/compiler/symbolWalker.ts index 3f1181236f90a..d73afd9dc7774 100644 --- a/src/compiler/symbolWalker.ts +++ b/src/compiler/symbolWalker.ts @@ -79,7 +79,7 @@ export function createGetSymbolWalker( visitedTypes[type.id] = type; // Reuse visitSymbol to visit the type's symbol, - // but be sure to bail on recuring into the type if accept declines the symbol. + // but be sure to bail on recurring into the type if accept declines the symbol. const shouldBail = visitSymbol(type.symbol); if (shouldBail) return; diff --git a/src/compiler/sys.ts b/src/compiler/sys.ts index c8f176603002b..1cf62e077e3f2 100644 --- a/src/compiler/sys.ts +++ b/src/compiler/sys.ts @@ -305,7 +305,7 @@ function createDynamicPriorityPollingWatchFile(host: { // Finally do the actual polling of the queue pollPollingIntervalQueue(_timeoutType, queue); // Schedule poll if there are files in changedFilesInLastPoll but no files in the actual queue - // as pollPollingIntervalQueue wont schedule for next poll + // as pollPollingIntervalQueue won't schedule for next poll if (!queue.pollScheduled && changedFilesInLastPoll.length) { scheduleNextPoll(PollingInterval.Low); } @@ -512,7 +512,7 @@ function createSingleWatcherPerName cache.get(path)?.callbacks.slice().forEach(cb => cb(param1, param2, param3)) ) as T, ), @@ -835,7 +835,7 @@ function createDirectoryWatcherSupportingRecursive({ hasChanges = enumerateInsertsAndDeletes( fileSystemEntryExists(parentDir, FileSystemEntryKind.Directory) ? mapDefined(getAccessibleSortedChildDirectories(parentDir), child => { const childFullName = getNormalizedAbsolutePath(child, parentDir); - // Filter our the symbolic link directories since those arent included in recursive watch + // Filter our the symbolic link directories since those aren't included in recursive watch // which is same behaviour when recursive: true is passed to fs.watch return !isIgnoredPath(childFullName, options) && filePathComparer(childFullName, normalizePath(realpath(childFullName))) === Comparison.EqualTo ? childFullName : undefined; }) : emptyArray, @@ -1287,7 +1287,7 @@ export function createSystemWatchFunctions({ // In some scenarios, file save operation fires event with fileName.ext~ instead of fileName.ext // To ensure we see the file going missing and coming back up (file delete and then recreated) // and watches being updated correctly we are calling back with fileName.ext as well as fileName.ext~ - // The worst is we have fired event that was not needed but we wont miss any changes + // The worst is we have fired event that was not needed but we won't miss any changes // especially in cases where file goes missing and watches wrong inode let originalRelativeName: string | undefined; if (relativeName && endsWith(relativeName, "~")) { @@ -1724,7 +1724,7 @@ export let sys: System = (() => { if (platform === "win32" || platform === "win64") { return false; } - // If this file exists under a different case, we must be case-insensitve. + // If this file exists under a different case, we must be case-insensitive. return !fileExists(swapCase(__filename)); } @@ -1744,7 +1744,7 @@ export let sys: System = (() => { }; function fileChanged(curr: import("fs").Stats, prev: import("fs").Stats) { - // previous event kind check is to ensure we recongnize the file as previously also missing when it is restored or renamed twice (that is it disappears and reappears) + // previous event kind check is to ensure we recognize the file as previously also missing when it is restored or renamed twice (that is it disappears and reappears) // In such case, prevTime returned is same as prev time of event when file was deleted as per node documentation const isPreviouslyDeleted = +prev.mtime === 0 || eventKind === FileWatcherEventKind.Deleted; if (+curr.mtime === 0) { diff --git a/src/compiler/transformers/classFields.ts b/src/compiler/transformers/classFields.ts index 7d8bc6f8eab22..9a4e557bf65a8 100644 --- a/src/compiler/transformers/classFields.ts +++ b/src/compiler/transformers/classFields.ts @@ -2045,7 +2045,7 @@ export function transformClassFields(context: TransformationContext): (x: Source else { temp ??= createClassTempVar(); if (isClassWithConstructorReference) { - // record an alias as the class name is not in scope for statics. + // record an alias as the class name is not in scope for statistics. enableSubstitutionForClassAliases(); const alias = factory.cloneNode(temp) as GeneratedIdentifier; alias.emitNode.autoGenerate.flags &= ~GeneratedIdentifierFlags.ReservedInNestedScopes; @@ -3296,7 +3296,7 @@ export function transformClassFields(context: TransformationContext): (x: Source // Due to the emit for class decorators, any reference to the class from inside of the class body // must instead be rewritten to point to a temporary variable to avoid issues with the double-bind // behavior of class names in ES6. - // Also, when emitting statics for class expressions, we must substitute a class alias for + // Also, when emitting statistics for class expressions, we must substitute a class alias for // constructor references in static property initializers. const declaration = resolver.getReferencedValueDeclaration(node); if (declaration) { diff --git a/src/compiler/transformers/declarations.ts b/src/compiler/transformers/declarations.ts index b1340ccfd7f92..6e2c2d22d7de6 100644 --- a/src/compiler/transformers/declarations.ts +++ b/src/compiler/transformers/declarations.ts @@ -978,7 +978,7 @@ export function transformDeclarations(context: TransformationContext): Transform } // And lastly, we need to get the final form of all those indetermine import declarations from before and add them to the output list - // (and remove them from the set to examine for outter declarations) + // (and remove them from the set to examine for outer declarations) return visitNodes(statements, visitLateVisibilityMarkedStatements, isStatement); function visitLateVisibilityMarkedStatements(statement: Statement) { diff --git a/src/compiler/transformers/es2015.ts b/src/compiler/transformers/es2015.ts index 5b29d34da9387..bd955d1df785b 100644 --- a/src/compiler/transformers/es2015.ts +++ b/src/compiler/transformers/es2015.ts @@ -359,7 +359,7 @@ interface ConvertedLoopState { loopParameters: ParameterDeclaration[]; /** - * List of loop out parameters - detailed descripion can be found in the comment to LoopOutParameter + * List of loop out parameters - detailed description can be found in the comment to LoopOutParameter */ loopOutParameters: LoopOutParameter[]; } diff --git a/src/compiler/transformers/generators.ts b/src/compiler/transformers/generators.ts index 4031cb704665a..7ed3178215eae 100644 --- a/src/compiler/transformers/generators.ts +++ b/src/compiler/transformers/generators.ts @@ -111,10 +111,10 @@ import { // .mark LABEL - Mark the location of a label. // .br LABEL - Jump to a label. If jumping out of a protected // region, all .finally blocks are executed. -// .brtrue LABEL, (x) - Jump to a label IIF the expression `x` is truthy. +// .brtrue LABEL, (x) - Jump to a label IF the expression `x` is truthy. // If jumping out of a protected region, all .finally // blocks are executed. -// .brfalse LABEL, (x) - Jump to a label IIF the expression `x` is falsey. +// .brfalse LABEL, (x) - Jump to a label IF the expression `x` is falsey. // If jumping out of a protected region, all .finally // blocks are executed. // .yield (x) - Yield the value of the optional expression `x`. @@ -196,11 +196,11 @@ import { // .endwith | // -------------------------------|---------------------------------------------- // | case 0: -// | state.trys = []; +// | state.tries = []; // | ... // .try TRY, CATCH, FINALLY, END | // .mark TRY | case TRY: -// | state.trys.push([TRY, CATCH, FINALLY, END]); +// | state.tries.push([TRY, CATCH, FINALLY, END]); // .nop | // a(); | a(); // .br END | return [3 /*break*/, END]; @@ -2889,7 +2889,7 @@ export function transformGenerators(context: TransformationContext): (x: SourceF statements.unshift( factory.createExpressionStatement( factory.createCallExpression( - factory.createPropertyAccessExpression(factory.createPropertyAccessExpression(state, "trys"), "push"), + factory.createPropertyAccessExpression(factory.createPropertyAccessExpression(state, "tries"), "push"), /*typeArguments*/ undefined, [ factory.createArrayLiteralExpression([ diff --git a/src/compiler/transformers/jsx.ts b/src/compiler/transformers/jsx.ts index cd4ef8a7aaafd..f32c3d11614a9 100644 --- a/src/compiler/transformers/jsx.ts +++ b/src/compiler/transformers/jsx.ts @@ -690,7 +690,7 @@ const entities = new Map(Object.entries({ iexcl: 0x00A1, cent: 0x00A2, pound: 0x00A3, - curren: 0x00A4, + current: 0x00A4, yen: 0x00A5, brvbar: 0x00A6, sect: 0x00A7, diff --git a/src/compiler/transformers/legacyDecorators.ts b/src/compiler/transformers/legacyDecorators.ts index 8edba2affaab3..ba320ac2aba59 100644 --- a/src/compiler/transformers/legacyDecorators.ts +++ b/src/compiler/transformers/legacyDecorators.ts @@ -826,7 +826,7 @@ export function transformLegacyDecorators(context: TransformationContext): (x: S // Due to the emit for class decorators, any reference to the class from inside of the class body // must instead be rewritten to point to a temporary variable to avoid issues with the double-bind // behavior of class names in ES6. - // Also, when emitting statics for class expressions, we must substitute a class alias for + // Also, when emitting statistics for class expressions, we must substitute a class alias for // constructor references in static property initializers. const declaration = resolver.getReferencedValueDeclaration(node); if (declaration) { diff --git a/src/compiler/transformers/module/esnextAnd2015.ts b/src/compiler/transformers/module/esnextAnd2015.ts index 7776e2c4bb2f0..a46223b638551 100644 --- a/src/compiler/transformers/module/esnextAnd2015.ts +++ b/src/compiler/transformers/module/esnextAnd2015.ts @@ -334,7 +334,7 @@ export function transformECMAScriptModule(context: TransformationContext): (x: S (compilerOptions.module !== undefined && compilerOptions.module > ModuleKind.ES2015) || !node.exportClause || !isNamespaceExport(node.exportClause) || !node.moduleSpecifier ) { - // Either ill-formed or don't need to be tranformed. + // Either ill-formed or don't need to be transformed. return (!node.moduleSpecifier || updatedModuleSpecifier === node.moduleSpecifier) ? node : factory.updateExportDeclaration( node, diff --git a/src/compiler/transformers/module/module.ts b/src/compiler/transformers/module/module.ts index 1c43d18afccc5..21a001853d4b4 100644 --- a/src/compiler/transformers/module/module.ts +++ b/src/compiler/transformers/module/module.ts @@ -1270,7 +1270,7 @@ export function transformModule(context: TransformationContext): (x: SourceFile } function createImportCallExpressionAMD(arg: Expression | undefined, containsLexicalThis: boolean): Expression { - // improt("./blah") + // import("./blah") // emit as // define(["require", "exports", "blah"], function (require, exports) { // ... diff --git a/src/compiler/transformers/module/system.ts b/src/compiler/transformers/module/system.ts index 8a4f01392decb..684b2f1e54773 100644 --- a/src/compiler/transformers/module/system.ts +++ b/src/compiler/transformers/module/system.ts @@ -433,7 +433,7 @@ export function transformSystemModule(context: TransformationContext): (x: Sourc // when resolving exports local exported entries/indirect exported entries in the module // should always win over entries with similar names that were added via star exports // to support this we store names of local/indirect exported entries in a set. - // this set is used to filter names brought by star expors. + // this set is used to filter names brought by star exports. // local names set should only be added if we have anything exported if (!some(moduleInfo.exportedNames) && moduleInfo.exportedFunctions.size === 0 && moduleInfo.exportSpecifiers.size === 0) { diff --git a/src/compiler/transformers/ts.ts b/src/compiler/transformers/ts.ts index f66568ac169ed..b83b0617e0c16 100644 --- a/src/compiler/transformers/ts.ts +++ b/src/compiler/transformers/ts.ts @@ -2344,7 +2344,7 @@ export function transformTypeScript(context: TransformationContext): Transformer } if (!node.exportClause || isNamespaceExport(node.exportClause)) { - // never elide `export from ` declarations - + // never elide `export from ` declarations - // they should be kept for sideffects/untyped exports, even when the // type checker doesn't know about any exports return factory.updateExportDeclaration( @@ -2688,7 +2688,7 @@ export function transformTypeScript(context: TransformationContext): Transformer function trySubstituteNamespaceExportedName(node: Identifier): Expression | undefined { // If this is explicitly a local name, do not substitute. if (enabledSubstitutions & applicableSubstitutions && !isGeneratedIdentifier(node) && !isLocalName(node)) { - // If we are nested within a namespace declaration, we may need to qualifiy + // If we are nested within a namespace declaration, we may need to qualify // an identifier that is exported from a merged namespace. const container = resolver.getReferencedExportContainer(node, /*prefixLocals*/ false); if (container && container.kind !== SyntaxKind.SourceFile) { diff --git a/src/compiler/transformers/utilities.ts b/src/compiler/transformers/utilities.ts index 584cb865e403d..b6b760971db6a 100644 --- a/src/compiler/transformers/utilities.ts +++ b/src/compiler/transformers/utilities.ts @@ -165,7 +165,7 @@ export function getImportNeedsImportStarHelper(node: ImportDeclaration): boolean defaultRefCount++; } } - // Import star is required if there's default named refs mixed with non-default refs, or if theres non-default refs and it has a default import + // Import star is required if there's default named refs mixed with non-default refs, or if there's non-default refs and it has a default import return (defaultRefCount > 0 && defaultRefCount !== bindings.elements.length) || (!!(bindings.elements.length - defaultRefCount) && isDefaultImport(node)); } @@ -563,7 +563,7 @@ function findSuperStatementIndexPathWorker(statements: NodeArray, sta /** * Finds a path of indices to navigate to a `super()` call, descending only through `try` statements. * - * @returns An array of indicies to walk down through `try` statements, with the last element being the index of + * @returns An array of indices to walk down through `try` statements, with the last element being the index of * the statement containing `super()`. Otherwise, an empty array if `super()` was not found. * * @internal diff --git a/src/compiler/tsbuild.ts b/src/compiler/tsbuild.ts index 74ec7be532261..d279e947a576a 100644 --- a/src/compiler/tsbuild.ts +++ b/src/compiler/tsbuild.ts @@ -9,7 +9,7 @@ import { /** @internal */ export enum UpToDateStatusType { Unbuildable, - UpToDate, + up-to-date, /** * The project appears out of date because its upstream inputs are newer than its outputs, * but all of its outputs are actually newer than the previous identical outputs of its (.d.ts) inputs. @@ -40,7 +40,7 @@ export enum UpToDateStatusType { /** @internal */ export type UpToDateStatus = | Status.Unbuildable - | Status.UpToDate + | Status.up-to-date | Status.OutputMissing | Status.ErrorReadingFile | Status.OutOfDateWithSelf @@ -76,9 +76,9 @@ export namespace Status { * The project is up to date with respect to its inputs. * We track what the newest input file is. */ - export interface UpToDate { + export interface up-to-date { type: - | UpToDateStatusType.UpToDate + | UpToDateStatusType.up-to-date | UpToDateStatusType.UpToDateWithUpstreamTypes | UpToDateStatusType.UpToDateWithInputFileText; newestInputFileTime?: Date; diff --git a/src/compiler/tsbuildPublic.ts b/src/compiler/tsbuildPublic.ts index 04ca4db0fde66..8ac94b7765780 100644 --- a/src/compiler/tsbuildPublic.ts +++ b/src/compiler/tsbuildPublic.ts @@ -282,7 +282,7 @@ export interface SolutionBuilder { } /** - * Create a function that reports watch status by writing to the system and handles the formating of the diagnostic + * Create a function that reports watch status by writing to the system and handles the formatting of the diagnostic */ export function createBuilderStatusReporter(system: System, pretty?: boolean): DiagnosticReporter { return diagnostic => { @@ -872,9 +872,9 @@ export interface BuildInvalidedProject extends Invalid * Calling emit directly with targetSourceFile and emitOnlyDtsFiles set to true is not advised since * emit in build system is responsible in updating status of the project * If called with targetSourceFile and emitOnlyDtsFiles set to true, the emit just passes to underlying builder and - * wont reflect the status of file as being emitted in the builder + * won't reflect the status of file as being emitted in the builder * (if that emit of that source file is required it would be emitted again when making sure invalidated project is completed) - * This emit is not considered actual emit (and hence uptodate status is not reflected if + * This emit is not considered actual emit (and hence up-to-date status is not reflected if */ emit(targetSourceFile?: SourceFile, writeFile?: WriteFileCallback, cancellationToken?: CancellationToken, emitOnlyDtsFiles?: boolean, customTransformers?: CustomTransformers): EmitResult | undefined; // TODO(shkamat):: investigate later if we can emit even when there are declaration diagnostics @@ -1145,7 +1145,7 @@ function createBuildOrUpdateInvalidedProject( if (!diagnostics.length) { state.diagnostics.delete(projectPath); state.projectStatus.set(projectPath, { - type: UpToDateStatusType.UpToDate, + type: UpToDateStatusType.up-to-date, oldestOutputFileName: firstOrUndefinedIterator(emittedOutputs.values()) ?? getFirstProjectOutput(config, !host.useCaseSensitiveFileNames()), }); } @@ -1250,7 +1250,7 @@ function getNextInvalidatedProjectCreateInfo( const status = getUpToDateStatus(state, config, projectPath); if (!options.force) { - if (status.type === UpToDateStatusType.UpToDate) { + if (status.type === UpToDateStatusType.up-to-date) { verboseReportProjectStatus(state, project, status); reportAndStoreErrors(state, projectPath, getConfigFileParsingDiagnostics(config)); projectPendingBuild.delete(projectPath); @@ -1684,7 +1684,7 @@ function getUpToDateStatusWorker(state: SolutionBuilde } // Now see if all outputs are newer than the newest input - // Dont check output timestamps if we have buildinfo telling us output is uptodate + // Dont check output timestamps if we have buildinfo telling us output is up-to-date if (!isIncremental) { // Collect the expected outputs of this project const outputs = getAllProjectOutputs(project, !host.useCaseSensitiveFileNames()); @@ -1715,7 +1715,7 @@ function getUpToDateStatusWorker(state: SolutionBuilde }; } - // No need to get newestDeclarationFileContentChangedTime since thats needed only for composite projects + // No need to get newestDeclarationFileContentChangedTime since that's needed only for composite projects // And composite projects are the only ones that can be referenced if (outputTime < oldestOutputFileTime) { oldestOutputFileTime = outputTime; @@ -1730,7 +1730,7 @@ function getUpToDateStatusWorker(state: SolutionBuilde for (const { ref, refStatus, resolvedConfig, resolvedRefPath } of referenceStatuses) { // If the upstream project's newest file is older than our oldest output, we // can't be out of date because of it - if ((refStatus as Status.UpToDate).newestInputFileTime && (refStatus as Status.UpToDate).newestInputFileTime! <= oldestOutputFileTime) { + if ((refStatus as Status.up-to-date).newestInputFileTime && (refStatus as Status.up-to-date).newestInputFileTime! <= oldestOutputFileTime) { continue; } @@ -1744,7 +1744,7 @@ function getUpToDateStatusWorker(state: SolutionBuilde } // If the upstream project has only change .d.ts files, and we've built - // *after* those files, then we're "psuedo up to date" and eligible for a fast rebuild + // *after* those files, then we're "pseudo up to date" and eligible for a fast rebuild const newestDeclarationFileContentChangedTime = getLatestChangedDtsTime(state, resolvedConfig.options, resolvedRefPath); if (newestDeclarationFileContentChangedTime && newestDeclarationFileContentChangedTime <= oldestOutputFileTime) { pseudoUpToDate = true; @@ -1783,7 +1783,7 @@ function getUpToDateStatusWorker(state: SolutionBuilde UpToDateStatusType.UpToDateWithUpstreamTypes : pseudoInputUpToDate ? UpToDateStatusType.UpToDateWithInputFileText : - UpToDateStatusType.UpToDate, + UpToDateStatusType.up-to-date, newestInputFileTime, newestInputFileName, oldestOutputFileName, @@ -1882,7 +1882,7 @@ function updateOutputTimestamps(state: SolutionBuilder } updateOutputTimestampsWorker(state, proj, resolvedPath, Diagnostics.Updating_output_timestamps_of_project_0); state.projectStatus.set(resolvedPath, { - type: UpToDateStatusType.UpToDate, + type: UpToDateStatusType.up-to-date, oldestOutputFileName: getFirstProjectOutput(proj, !state.host.useCaseSensitiveFileNames()), }); } @@ -1916,7 +1916,7 @@ function queueReferencingProjects( const status = state.projectStatus.get(nextProjectPath); if (status) { switch (status.type) { - case UpToDateStatusType.UpToDate: + case UpToDateStatusType.up-to-date: if (buildResult & BuildResultFlags.DeclarationOutputUnchanged) { status.type = UpToDateStatusType.UpToDateWithUpstreamTypes; break; @@ -2037,7 +2037,7 @@ function cleanWorker(state: SolutionBuilderState, p } function invalidateProject(state: SolutionBuilderState, resolved: ResolvedConfigFilePath, updateLevel: ProgramUpdateLevel) { - // If host implements getParsedCommandLine, we cant get list of files from parseConfigFileHost + // If host implements getParsedCommandLine, we can't get list of files from parseConfigFileHost if (state.host.getParsedCommandLine && updateLevel === ProgramUpdateLevel.RootNamesAndUpdate) { updateLevel = ProgramUpdateLevel.Full; } @@ -2411,7 +2411,7 @@ function reportUpToDateStatus(state: SolutionBuilderSt relName(state, status.buildInfoFile), relName(state, status.inputFile), ); - case UpToDateStatusType.UpToDate: + case UpToDateStatusType.up-to-date: if (status.newestInputFileTime !== undefined) { return reportStatus( state, diff --git a/src/compiler/types.ts b/src/compiler/types.ts index 4d8d22afb54e6..8a63909a9e662 100644 --- a/src/compiler/types.ts +++ b/src/compiler/types.ts @@ -838,7 +838,7 @@ export const enum NodeFlags { TypeExcludesFlags = YieldContext | AwaitContext, // Represents all flags that are potentially set once and - // never cleared on SourceFiles which get re-used in between incremental parses. + // never cleared on SourceFiles which get reused in between incremental parses. // See the comment above on `PossiblyContainsDynamicImport` and `PossiblyContainsImportMeta`. /** @internal */ PermanentlySetIncrementalFlags = PossiblyContainsDynamicImport | PossiblyContainsImportMeta, @@ -4381,7 +4381,7 @@ export interface SourceFile extends Declaration, LocalsContainer { * * Note that this field is only set by the module resolution process when * `moduleResolution` is `Node16` or `NodeNext`, which is implied by the `module` setting - * of `Node16` or `NodeNext`, respectively, but may be overriden (eg, by a `moduleResolution` + * of `Node16` or `NodeNext`, respectively, but may be overridden (eg, by a `moduleResolution` * of `node`). If so, this field will be unset and source files will be considered to be * CommonJS-output-format by the node module transformer and type checker, regardless of extension or context. */ @@ -5983,7 +5983,7 @@ export const enum SymbolFlags { // same name, or any other value that is not a variable, e.g. ValueModule or Class FunctionScopedVariableExcludes = Value & ~FunctionScopedVariable, - // Block-scoped declarations are not allowed to be re-declared + // Block-scoped declarations are not allowed to be redeclared // they can not merge with anything in the value space BlockScopedVariableExcludes = Value, @@ -7757,7 +7757,7 @@ export interface CommandLineOptionBase { isFilePath?: boolean; // True if option value is a path or fileName shortName?: string; // A short mnemonic for convenience - for instance, 'h' can be used in place of 'help' description?: DiagnosticMessage; // The message describing what the command line switch does. - defaultValueDescription?: string | number | boolean | DiagnosticMessage | undefined; // The message describing what the dafault value is. string type is prepared for fixed chosen like "false" which do not need I18n. + defaultValueDescription?: string | number | boolean | DiagnosticMessage | undefined; // The message describing what the default value is. string type is prepared for fixed chosen like "false" which do not need I18n. paramType?: DiagnosticMessage; // The name to be used for a non-boolean option's parameter isTSConfigOnly?: boolean; // True if option can only be specified via tsconfig.json file isCommandLineOnly?: boolean; diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts index 38425f9ab052e..ae15d07a4541f 100644 --- a/src/compiler/utilities.ts +++ b/src/compiler/utilities.ts @@ -8994,7 +8994,7 @@ export function getSetExternalModuleIndicator(options: CompilerOptions): (file: case ModuleDetectionKind.Auto: // If module is nodenext or node16, all esm format files are modules // If jsx is react-jsx or react-jsxdev then jsx tags force module-ness - // otherwise, the presence of import or export statments (or import.meta) implies module-ness + // otherwise, the presence of import or export statements (or import.meta) implies module-ness const checks: ((file: SourceFile, options: CompilerOptions) => Node | true | undefined)[] = [isFileProbablyExternalModule]; if (options.jsx === JsxEmit.ReactJSX || options.jsx === JsxEmit.ReactJSXDev) { checks.push(isFileModuleFromUsingJSXTag); @@ -9965,7 +9965,7 @@ export function getScriptKindFromFileName(fileName: string): ScriptKind { } /** - * Groups of supported extensions in order of file resolution precedence. (eg, TS > TSX > DTS and seperately, CTS > DCTS) + * Groups of supported extensions in order of file resolution precedence. (eg, TS > TSX > DTS and separately, CTS > DCTS) */ const supportedTSExtensions: readonly Extension[][] = [[Extension.Ts, Extension.Tsx, Extension.Dts], [Extension.Cts, Extension.Dcts], [Extension.Mts, Extension.Dmts]]; /** @internal */ @@ -10570,7 +10570,7 @@ export function isValidBigIntString(s: string, roundTripOnly: boolean): boolean // * scanning proceeded without error // * a bigint can be scanned, and that when it is scanned, it is // * the full length of the input string (so the scanner is one character beyond the augmented input length) - // * it does not contain a numeric seperator (the `BigInt` constructor does not accept a numeric seperator in its input) + // * it does not contain a numeric separator (the `BigInt` constructor does not accept a numeric separator in its input) return success && result === SyntaxKind.BigIntLiteral && scanner.getTokenEnd() === (s.length + 1) && !(flags & TokenFlags.ContainsSeparator) && (!roundTripOnly || s === pseudoBigIntToString({ negative, base10Value: parsePseudoBigInt(scanner.getTokenValue()) })); } diff --git a/src/compiler/watch.ts b/src/compiler/watch.ts index 0bb26dedff5b4..18eb0261db387 100644 --- a/src/compiler/watch.ts +++ b/src/compiler/watch.ts @@ -694,7 +694,7 @@ export const WatchType: WatchTypeRegistry = { FailedLookupLocations: "Failed Lookup Locations", AffectingFileLocation: "File location affecting resolution", TypeRoots: "Type roots", - ConfigFileOfReferencedProject: "Config file of referened project", + ConfigFileOfReferencedProject: "Config file of referenced project", ExtendedConfigOfReferencedProject: "Extended config file of referenced project", WildcardDirectoryOfReferencedProject: "Wild card directory of referenced project", PackageJson: "package.json file", @@ -719,7 +719,7 @@ export interface WatchTypeRegistry { FailedLookupLocations: "Failed Lookup Locations"; AffectingFileLocation: "File location affecting resolution"; TypeRoots: "Type roots"; - ConfigFileOfReferencedProject: "Config file of referened project"; + ConfigFileOfReferencedProject: "Config file of referenced project"; ExtendedConfigOfReferencedProject: "Extended config file of referenced project"; WildcardDirectoryOfReferencedProject: "Wild card directory of referenced project"; PackageJson: "package.json file"; @@ -786,7 +786,7 @@ export function createCompilerHostFromProgramHost(host: ProgramHost, getCom /** @internal */ export function getSourceFileVersionAsHashFromText(host: Pick, text: string): string { - // If text can contain the sourceMapUrl ignore sourceMapUrl for calcualting hash + // If text can contain the sourceMapUrl ignore sourceMapUrl for calculating hash if (text.match(sourceMapCommentRegExpDontCareLineStart)) { let lineEnd = text.length; let lineStart = lineEnd; diff --git a/src/compiler/watchPublic.ts b/src/compiler/watchPublic.ts index 4bcedabb7eb0f..4146eda723d4f 100644 --- a/src/compiler/watchPublic.ts +++ b/src/compiler/watchPublic.ts @@ -187,12 +187,12 @@ export interface ProgramHost { /** * Use to check file presence for source files and - * if resolveModuleNames is not provided (complier is in charge of module resolution) then module files as well + * if resolveModuleNames is not provided (compiler is in charge of module resolution) then module files as well */ fileExists(path: string): boolean; /** * Use to read file text for source files and - * if resolveModuleNames is not provided (complier is in charge of module resolution) then module files as well + * if resolveModuleNames is not provided (compiler is in charge of module resolution) then module files as well */ readFile(path: string, encoding?: string): string | undefined; @@ -317,7 +317,7 @@ export interface WatchCompilerHostOfConfigFile extends /** * Used to generate source file names from the config file and its include, exclude, files rules - * and also to cache the directory stucture + * and also to cache the directory structure */ readDirectory(path: string, extensions?: readonly string[], exclude?: readonly string[], include?: readonly string[], depth?: number): string[]; } @@ -544,7 +544,7 @@ export function createWatchProgram(host: WatchCompiler (() => resolutionCache.getModuleResolutionCache()); const userProvidedResolution = !!host.resolveModuleNameLiterals || !!host.resolveTypeReferenceDirectiveReferences || !!host.resolveModuleNames || !!host.resolveTypeReferenceDirectives; - // All resolutions are invalid if user provided resolutions and didnt supply hasInvalidatedResolutions + // All resolutions are invalid if user provided resolutions and didn't supply hasInvalidatedResolutions const customHasInvalidatedResolutions = userProvidedResolution ? maybeBind(host, host.hasInvalidatedResolutions) || returnTrue : returnFalse; @@ -709,7 +709,7 @@ export function createWatchProgram(host: WatchCompiler if (missingFilePathsRequestedForRelease) { // These are the paths that program creater told us as not in use any more but were missing on the disk. - // We didnt remove the entry for them from sourceFiles cache so that we dont have to do File IO, + // We didn't remove the entry for them from sourceFiles cache so that we dont have to do File IO, // if there is already watcher for it (for missing files) // At this point our watches were updated, hence now we know that these paths are not tracked and need to be removed // so that at later time we have correct result of their presence @@ -821,12 +821,12 @@ export function createWatchProgram(host: WatchCompiler function onReleaseOldSourceFile(oldSourceFile: SourceFile, _oldOptions: CompilerOptions, hasSourceFileByPath: boolean) { const hostSourceFileInfo = sourceFilesCache.get(oldSourceFile.resolvedPath); - // If this is the source file thats in the cache and new program doesnt need it, + // If this is the source file that's in the cache and new program doesnt need it, // remove the cached entry. - // Note we arent deleting entry if file became missing in new program or + // Note we aren't deleting entry if file became missing in new program or // there was version update and new source file was created. if (hostSourceFileInfo !== undefined) { - // record the missing file paths so they can be removed later if watchers arent tracking them + // record the missing file paths so they can be removed later if watchers aren't tracking them if (isFileMissingOnHost(hostSourceFileInfo)) { (missingFilePathsRequestedForRelease || (missingFilePathsRequestedForRelease = [])).push(oldSourceFile.path); } @@ -985,7 +985,7 @@ export function createWatchProgram(host: WatchCompiler let config = parsedConfigs?.get(configPath); if (config) { if (!config.updateLevel) return config.parsedCommandLine; - // With host implementing getParsedCommandLine we cant just update file names + // With host implementing getParsedCommandLine we can't just update file names if (config.parsedCommandLine && config.updateLevel === ProgramUpdateLevel.RootNamesAndUpdate && !host.getParsedCommandLine) { writeLog("Reloading new file names and options"); Debug.assert(compilerOptions); diff --git a/src/compiler/watchUtilities.ts b/src/compiler/watchUtilities.ts index 82c9dbf32e28c..b8e441420e94f 100644 --- a/src/compiler/watchUtilities.ts +++ b/src/compiler/watchUtilities.ts @@ -61,7 +61,7 @@ import { } from "./_namespaces/ts.js"; /** - * Partial interface of the System thats needed to support the caching of directory structure + * Partial interface of the System that's needed to support the caching of directory structure * * @internal */ @@ -507,7 +507,7 @@ export interface WildcardDirectoryWatcher { * Updates the existing wild card directory watches with the new set of wild card directories from the config file * after new program is created because the config file was reloaded or program was created first time from the config file * Note that there is no need to call this function when the program is updated with additional files without reloading config files, - * as wildcard directories wont change unless reloading config file + * as wildcard directories won't change unless reloading config file * * @internal */ @@ -523,7 +523,7 @@ export function updateWatchingWildcardDirectories( { // Create new watch and recursive info createNewValue: createWildcardDirectoryWatcher, - // Close existing watch thats not needed any more + // Close existing watch that's not needed any more onDeleteValue: closeFileWatcherOf, // Close existing watch that doesnt match in the flags onExistingValue: updateWildcardDirectoryWatcher, diff --git a/src/harness/fourslashImpl.ts b/src/harness/fourslashImpl.ts index dc6341ef018f7..1efe304e30212 100644 --- a/src/harness/fourslashImpl.ts +++ b/src/harness/fourslashImpl.ts @@ -1675,7 +1675,7 @@ export class TestState { // Marker is ok to skip over if (textStartDetail.span) break; } - // Skip contextId on span thats surrounded by context span immediately + // Skip contextId on span that's surrounded by context span immediately if (!isAfterContextStart) { text = `contextId: ${contextId}` + (text ? `, ${text}` : ""); } diff --git a/src/harness/harnessGlobals.ts b/src/harness/harnessGlobals.ts index 05193e79f17f6..63f663bb75e10 100644 --- a/src/harness/harnessGlobals.ts +++ b/src/harness/harnessGlobals.ts @@ -14,7 +14,7 @@ declare global { globalThis.assert = chai.assert; { // chai's builtin `assert.isFalse` is featureful but slow - we don't use those features, - // so we'll just overwrite it as an alterative to migrating a bunch of code off of chai + // so we'll just overwrite it as an alternative to migrating a bunch of code off of chai assert.isFalse = (expr: any, msg: string) => { if (expr !== false) throw new Error(msg); }; diff --git a/src/harness/harnessLanguageService.ts b/src/harness/harnessLanguageService.ts index 1703d466619aa..82f237bf11a97 100644 --- a/src/harness/harnessLanguageService.ts +++ b/src/harness/harnessLanguageService.ts @@ -591,19 +591,19 @@ class SessionServerHost implements ts.server.ServerHost { } setTimeout(_callback: (...args: any[]) => void, _ms: number, ..._args: any[]): any { - // Currently none of the tests use this and we would want something thats deterministic like unittests where we tell which callbacks to invoke + // Currently none of the tests use this and we would want something that's deterministic like unittests where we tell which callbacks to invoke } clearTimeout(_timeoutId: any): void { - // Currently none of the tests use this and we would want something thats deterministic like unittests where we tell which callbacks to invoke + // Currently none of the tests use this and we would want something that's deterministic like unittests where we tell which callbacks to invoke } setImmediate(_callback: (...args: any[]) => void, ..._args: any[]): any { - // Currently none of the tests use this and we would want something thats deterministic like unittests where we tell which callbacks to invoke + // Currently none of the tests use this and we would want something that's deterministic like unittests where we tell which callbacks to invoke } clearImmediate(_timeoutId: any): void { - // Currently none of the tests use this and we would want something thats deterministic like unittests where we tell which callbacks to invoke + // Currently none of the tests use this and we would want something that's deterministic like unittests where we tell which callbacks to invoke } createHash(s: string) { diff --git a/src/harness/incrementalUtils.ts b/src/harness/incrementalUtils.ts index d7459f1ba489f..f01562190b3ad 100644 --- a/src/harness/incrementalUtils.ts +++ b/src/harness/incrementalUtils.ts @@ -278,7 +278,7 @@ export function verifyResolutionCache( expected.finishCachingPerDirectoryResolution(/*newProgram*/ undefined, actualProgram); resolutionToExpected.forEach( - expected => ts.Debug.assert(!expected.files?.size, `${projectName}:: Shouldnt ref to any files`), + expected => ts.Debug.assert(!expected.files?.size, `${projectName}:: Shouldn't ref to any files`), ); ts.Debug.assert(expected.resolvedFileToResolution.size === 0, `${projectName}:: resolvedFileToResolution should be released`); ts.Debug.assert(expected.resolutionsWithFailedLookups.size === 0, `${projectName}:: resolutionsWithFailedLookups should be released`); diff --git a/src/harness/sourceMapRecorder.ts b/src/harness/sourceMapRecorder.ts index 11366f98c5076..f51decea2aabc 100644 --- a/src/harness/sourceMapRecorder.ts +++ b/src/harness/sourceMapRecorder.ts @@ -318,7 +318,7 @@ export function getSourceMapRecord(sourceMapDataList: readonly ts.SourceMapEmitR SourceMapSpanWriter.recordSourceMapSpan(decodedSourceMapping); } } - SourceMapSpanWriter.close(); // If the last spans werent emitted, emit them + SourceMapSpanWriter.close(); // If the last spans weren't emitted, emit them } sourceMapRecorder.Close(); return sourceMapRecorder.lines.join("\r\n"); @@ -353,7 +353,7 @@ export function getSourceMapRecordWithSystem(sys: ts.System, sourceMapFile: stri SourceMapSpanWriter.recordSourceMapSpan(decodedSourceMapping); } } - SourceMapSpanWriter.close(); // If the last spans werent emitted, emit them + SourceMapSpanWriter.close(); // If the last spans weren't emitted, emit them } sourceMapRecorder.Close(); return sourceMapRecorder.lines.join("\r\n"); diff --git a/src/lib/es5.d.ts b/src/lib/es5.d.ts index 43ff5837a9500..6a41bda58ad39 100644 --- a/src/lib/es5.d.ts +++ b/src/lib/es5.d.ts @@ -1379,7 +1379,7 @@ interface Array { * Removes elements from an array and, if necessary, inserts new elements in their place, returning the deleted elements. * @param start The zero-based location in the array from which to start removing elements. * @param deleteCount The number of elements to remove. Omitting this argument will remove all elements from the start - * paramater location to end of the array. If value of this argument is either a negative number, zero, undefined, or a type + * parameter location to end of the array. If value of this argument is either a negative number, zero, undefined, or a type * that cannot be converted to an integer, the function will evaluate the argument as zero and not remove any elements. * @returns An array containing the elements that were deleted. */ diff --git a/src/loc/lcl/csy/diagnosticMessages/diagnosticMessages.generated.json.lcl b/src/loc/lcl/csy/diagnosticMessages/diagnosticMessages.generated.json.lcl index 5bd7de830eb55..b40150f0d54bd 100644 --- a/src/loc/lcl/csy/diagnosticMessages/diagnosticMessages.generated.json.lcl +++ b/src/loc/lcl/csy/diagnosticMessages/diagnosticMessages.generated.json.lcl @@ -52,7 +52,7 @@ - + @@ -106,7 +106,7 @@ - + @@ -217,7 +217,7 @@ - + @@ -319,7 +319,7 @@ - + @@ -382,7 +382,7 @@ - + @@ -391,7 +391,7 @@ - + @@ -484,7 +484,7 @@ - + @@ -493,7 +493,7 @@ - + @@ -502,7 +502,7 @@ - + @@ -577,7 +577,7 @@ - + @@ -610,7 +610,7 @@ - + @@ -727,7 +727,7 @@ - + @@ -793,7 +793,7 @@ - + @@ -802,7 +802,7 @@ - + @@ -811,7 +811,7 @@ - + @@ -820,7 +820,7 @@ - + @@ -829,7 +829,7 @@ - + @@ -865,7 +865,7 @@ - + @@ -874,7 +874,7 @@ - + @@ -883,7 +883,7 @@ - + @@ -892,7 +892,7 @@ - + @@ -901,7 +901,7 @@ - + @@ -955,7 +955,7 @@ - + @@ -1018,7 +1018,7 @@ - + @@ -1036,7 +1036,7 @@ - + @@ -1441,7 +1441,7 @@ - + @@ -1570,7 +1570,7 @@ - + @@ -1627,7 +1627,7 @@ - + @@ -1681,7 +1681,7 @@ - + @@ -1690,7 +1690,7 @@ - + @@ -1930,7 +1930,7 @@ - + @@ -1984,7 +1984,7 @@ - + @@ -2002,7 +2002,7 @@ - + @@ -2011,7 +2011,7 @@ - + @@ -2029,7 +2029,7 @@ - + @@ -2047,7 +2047,7 @@ - + @@ -2083,7 +2083,7 @@ - + @@ -2167,7 +2167,7 @@ - + @@ -2194,7 +2194,7 @@ - + @@ -2203,7 +2203,7 @@ - + @@ -2212,7 +2212,7 @@ - + @@ -2341,7 +2341,7 @@ - + @@ -2350,7 +2350,7 @@ - + @@ -2377,7 +2377,7 @@ - + @@ -2404,7 +2404,7 @@ - + @@ -2548,7 +2548,7 @@ - + @@ -2731,7 +2731,7 @@ - + @@ -2794,7 +2794,7 @@ - + @@ -2803,7 +2803,7 @@ - + @@ -2821,7 +2821,7 @@ - + @@ -3214,7 +3214,7 @@ - + @@ -3223,7 +3223,7 @@ - + @@ -3232,7 +3232,7 @@ - + @@ -3268,7 +3268,7 @@ - + @@ -3352,7 +3352,7 @@ - + @@ -3364,7 +3364,7 @@ - + @@ -3373,7 +3373,7 @@ - + @@ -3382,7 +3382,7 @@ - + @@ -3559,7 +3559,7 @@ - + @@ -3604,7 +3604,7 @@ - + @@ -3613,7 +3613,7 @@ - + @@ -3622,7 +3622,7 @@ - + @@ -3754,7 +3754,7 @@ - + @@ -3916,7 +3916,7 @@ - + @@ -3964,7 +3964,7 @@ - + @@ -3973,7 +3973,7 @@ - + @@ -4036,7 +4036,7 @@ - + @@ -4177,7 +4177,7 @@ - + @@ -4213,7 +4213,7 @@ - + @@ -4471,7 +4471,7 @@ - + @@ -4705,7 +4705,7 @@ - + @@ -4723,7 +4723,7 @@ - + @@ -4876,7 +4876,7 @@ - + @@ -4939,7 +4939,7 @@ - + @@ -5059,7 +5059,7 @@ - + @@ -5068,7 +5068,7 @@ - + @@ -5281,7 +5281,7 @@ - + @@ -5392,7 +5392,7 @@ - + @@ -5476,7 +5476,7 @@ - + @@ -5698,7 +5698,7 @@ - + @@ -5785,7 +5785,7 @@ - + @@ -5830,7 +5830,7 @@ - + @@ -5929,7 +5929,7 @@ - + @@ -5938,7 +5938,7 @@ - + @@ -6061,7 +6061,7 @@ - + @@ -6100,7 +6100,7 @@ - + @@ -6118,7 +6118,7 @@ - + @@ -6127,7 +6127,7 @@ - + @@ -6466,7 +6466,7 @@ - + @@ -6505,7 +6505,7 @@ - + @@ -6763,7 +6763,7 @@ - + @@ -6790,7 +6790,7 @@ - + @@ -6889,7 +6889,7 @@ - + @@ -6907,7 +6907,7 @@ - + @@ -6925,7 +6925,7 @@ - + @@ -6982,7 +6982,7 @@ - + @@ -6991,7 +6991,7 @@ - + @@ -7000,7 +7000,7 @@ - + @@ -7315,7 +7315,7 @@ - + @@ -7342,7 +7342,7 @@ - + @@ -7414,7 +7414,7 @@ - + @@ -7423,7 +7423,7 @@ - + @@ -7432,7 +7432,7 @@ - + @@ -7441,7 +7441,7 @@ - + @@ -7450,7 +7450,7 @@ - + @@ -8023,7 +8023,7 @@ - + @@ -8032,7 +8032,7 @@ - + @@ -8041,7 +8041,7 @@ - + @@ -8098,7 +8098,7 @@ - + @@ -8182,7 +8182,7 @@ - + @@ -8194,7 +8194,7 @@ - + @@ -8368,7 +8368,7 @@ - + @@ -8434,7 +8434,7 @@ - + @@ -8473,7 +8473,7 @@ - + @@ -8545,7 +8545,7 @@ - + @@ -8554,7 +8554,7 @@ - + @@ -8911,7 +8911,7 @@ - + @@ -8920,7 +8920,7 @@ - + @@ -8938,7 +8938,7 @@ - + @@ -8947,7 +8947,7 @@ - + @@ -9091,7 +9091,7 @@ - + @@ -9100,7 +9100,7 @@ - + @@ -9262,7 +9262,7 @@ - + @@ -9370,7 +9370,7 @@ - + @@ -9409,7 +9409,7 @@ - + @@ -9418,7 +9418,7 @@ - + @@ -9601,7 +9601,7 @@ - + @@ -9646,7 +9646,7 @@ - + @@ -9655,7 +9655,7 @@ - + @@ -9667,7 +9667,7 @@ - + @@ -9676,7 +9676,7 @@ - + @@ -9685,7 +9685,7 @@ - + @@ -9694,7 +9694,7 @@ - + @@ -9703,7 +9703,7 @@ - + @@ -9712,7 +9712,7 @@ - + @@ -9721,7 +9721,7 @@ - + @@ -9730,7 +9730,7 @@ - + @@ -9739,7 +9739,7 @@ - + @@ -9748,7 +9748,7 @@ - + @@ -9760,7 +9760,7 @@ - + @@ -9769,7 +9769,7 @@ - + @@ -9778,7 +9778,7 @@ - + @@ -9787,7 +9787,7 @@ - + @@ -9796,7 +9796,7 @@ - + @@ -9814,7 +9814,7 @@ - + @@ -9823,7 +9823,7 @@ - + @@ -9832,7 +9832,7 @@ - + @@ -9841,7 +9841,7 @@ - + @@ -9850,7 +9850,7 @@ - + @@ -9859,7 +9859,7 @@ - + @@ -9979,7 +9979,7 @@ - + @@ -10216,7 +10216,7 @@ - + @@ -10279,7 +10279,7 @@ - + @@ -10288,7 +10288,7 @@ - + @@ -10297,7 +10297,7 @@ - + @@ -10306,7 +10306,7 @@ - + @@ -10585,7 +10585,7 @@ - + @@ -10903,7 +10903,7 @@ - + @@ -10912,7 +10912,7 @@ - + @@ -10921,7 +10921,7 @@ - + @@ -10930,7 +10930,7 @@ - + @@ -10939,7 +10939,7 @@ - + @@ -10948,7 +10948,7 @@ - + @@ -10957,7 +10957,7 @@ - + @@ -10966,7 +10966,7 @@ - + @@ -10975,7 +10975,7 @@ - + @@ -10984,7 +10984,7 @@ - + @@ -10993,7 +10993,7 @@ - + @@ -11002,7 +11002,7 @@ - + @@ -11011,7 +11011,7 @@ - + @@ -11020,7 +11020,7 @@ - + @@ -11029,7 +11029,7 @@ - + @@ -11038,7 +11038,7 @@ - + @@ -11047,7 +11047,7 @@ - + @@ -11056,7 +11056,7 @@ - + @@ -11065,7 +11065,7 @@ - + @@ -11074,7 +11074,7 @@ - + @@ -11083,7 +11083,7 @@ - + @@ -11092,7 +11092,7 @@ - + @@ -11101,7 +11101,7 @@ - + @@ -11110,7 +11110,7 @@ - + @@ -11119,7 +11119,7 @@ - + @@ -11128,7 +11128,7 @@ - + @@ -11137,7 +11137,7 @@ - + @@ -11146,7 +11146,7 @@ - + @@ -11155,7 +11155,7 @@ - + @@ -11173,7 +11173,7 @@ - + @@ -11191,7 +11191,7 @@ - + @@ -11200,7 +11200,7 @@ - + @@ -11218,7 +11218,7 @@ - + @@ -11425,7 +11425,7 @@ - + @@ -11773,7 +11773,7 @@ - + @@ -11782,7 +11782,7 @@ - + @@ -11791,7 +11791,7 @@ - + @@ -11800,7 +11800,7 @@ - + @@ -11992,7 +11992,7 @@ - + @@ -12091,7 +12091,7 @@ - + @@ -12100,7 +12100,7 @@ - + @@ -12118,7 +12118,7 @@ - + @@ -12127,7 +12127,7 @@ - + @@ -12145,7 +12145,7 @@ - + @@ -12154,7 +12154,7 @@ - + @@ -12172,7 +12172,7 @@ - + @@ -12181,7 +12181,7 @@ - + @@ -12208,7 +12208,7 @@ - + @@ -12652,7 +12652,7 @@ - + @@ -12670,7 +12670,7 @@ - + @@ -12733,7 +12733,7 @@ - + @@ -12742,7 +12742,7 @@ - + @@ -12829,7 +12829,7 @@ - + @@ -12838,7 +12838,7 @@ - + @@ -12874,7 +12874,7 @@ - + @@ -12892,7 +12892,7 @@ - + @@ -12922,7 +12922,7 @@ - + @@ -12931,7 +12931,7 @@ - + @@ -12949,7 +12949,7 @@ - + @@ -12967,7 +12967,7 @@ - + @@ -12985,7 +12985,7 @@ - + @@ -12994,7 +12994,7 @@ - + @@ -13012,7 +13012,7 @@ - + @@ -13021,7 +13021,7 @@ - + @@ -13039,7 +13039,7 @@ - + @@ -13048,7 +13048,7 @@ - + @@ -13066,7 +13066,7 @@ - + @@ -13075,7 +13075,7 @@ - + @@ -13093,7 +13093,7 @@ - + @@ -13102,7 +13102,7 @@ - + @@ -13111,7 +13111,7 @@ - + @@ -13120,7 +13120,7 @@ - + @@ -13129,7 +13129,7 @@ - + @@ -13138,7 +13138,7 @@ - + @@ -13438,7 +13438,7 @@ - + @@ -13501,7 +13501,7 @@ - + @@ -13669,7 +13669,7 @@ - + @@ -13705,7 +13705,7 @@ - + @@ -13714,7 +13714,7 @@ - + @@ -13879,7 +13879,7 @@ - + @@ -13891,7 +13891,7 @@ - + @@ -13966,7 +13966,7 @@ - + @@ -13975,7 +13975,7 @@ - + @@ -14212,7 +14212,7 @@ - + @@ -14251,7 +14251,7 @@ - + @@ -14260,7 +14260,7 @@ - + @@ -14368,7 +14368,7 @@ - + @@ -14377,7 +14377,7 @@ - + @@ -14422,7 +14422,7 @@ - + @@ -14431,7 +14431,7 @@ - + @@ -14440,7 +14440,7 @@ - + @@ -14539,7 +14539,7 @@ - + @@ -14626,7 +14626,7 @@ - + @@ -14635,7 +14635,7 @@ - + @@ -15040,7 +15040,7 @@ - + @@ -15049,7 +15049,7 @@ - + @@ -15058,7 +15058,7 @@ - + @@ -15133,7 +15133,7 @@ - + @@ -15295,7 +15295,7 @@ - + @@ -15304,7 +15304,7 @@ - + @@ -15313,7 +15313,7 @@ - + @@ -15448,7 +15448,7 @@ - + @@ -15628,7 +15628,7 @@ - + @@ -15637,7 +15637,7 @@ - + @@ -15673,7 +15673,7 @@ - + @@ -15736,7 +15736,7 @@ - + @@ -15745,7 +15745,7 @@ - + @@ -15754,7 +15754,7 @@ - + @@ -15763,7 +15763,7 @@ - + @@ -15772,7 +15772,7 @@ - + @@ -15781,7 +15781,7 @@ - + @@ -15790,7 +15790,7 @@ - + @@ -15808,7 +15808,7 @@ - + @@ -15817,7 +15817,7 @@ - + @@ -15826,7 +15826,7 @@ - + @@ -15835,7 +15835,7 @@ - + @@ -15898,7 +15898,7 @@ - + @@ -15928,7 +15928,7 @@ - + @@ -16429,7 +16429,7 @@ - + @@ -16528,7 +16528,7 @@ - + @@ -16546,7 +16546,7 @@ - + @@ -16555,7 +16555,7 @@ - + @@ -16564,7 +16564,7 @@ - + @@ -16573,7 +16573,7 @@ - + @@ -16582,7 +16582,7 @@ - + @@ -16591,7 +16591,7 @@ - + @@ -16600,7 +16600,7 @@ - + @@ -16609,7 +16609,7 @@ - + @@ -16618,7 +16618,7 @@ - + @@ -16627,7 +16627,7 @@ - + @@ -16636,7 +16636,7 @@ - + @@ -16645,7 +16645,7 @@ - + @@ -16783,7 +16783,7 @@ - + @@ -16900,7 +16900,7 @@ - + @@ -17314,7 +17314,7 @@ - + @@ -17548,7 +17548,7 @@ - + @@ -17668,7 +17668,7 @@ - + @@ -17713,7 +17713,7 @@ - + @@ -17740,7 +17740,7 @@ - + @@ -17749,7 +17749,7 @@ - + @@ -17758,7 +17758,7 @@ - + @@ -17974,7 +17974,7 @@ - + @@ -18055,7 +18055,7 @@ - + @@ -18064,7 +18064,7 @@ - + @@ -18229,7 +18229,7 @@ - + @@ -18406,7 +18406,7 @@ - + @@ -18607,7 +18607,7 @@ - + @@ -18661,7 +18661,7 @@ - + @@ -18688,7 +18688,7 @@ - + @@ -18919,7 +18919,7 @@ - + @@ -19144,7 +19144,7 @@ - + @@ -19189,7 +19189,7 @@ - + @@ -19279,7 +19279,7 @@ - + @@ -19390,7 +19390,7 @@ - + diff --git a/src/loc/lcl/deu/diagnosticMessages/diagnosticMessages.generated.json.lcl b/src/loc/lcl/deu/diagnosticMessages/diagnosticMessages.generated.json.lcl index 193e9960fd17b..4bbd1b3ad9932 100644 --- a/src/loc/lcl/deu/diagnosticMessages/diagnosticMessages.generated.json.lcl +++ b/src/loc/lcl/deu/diagnosticMessages/diagnosticMessages.generated.json.lcl @@ -70,7 +70,7 @@ - + @@ -373,7 +373,7 @@ - + @@ -400,7 +400,7 @@ - + @@ -409,7 +409,7 @@ - + @@ -418,7 +418,7 @@ - + @@ -439,7 +439,7 @@ - + @@ -448,7 +448,7 @@ - + @@ -457,7 +457,7 @@ - + @@ -511,7 +511,7 @@ - + @@ -520,7 +520,7 @@ - + @@ -532,7 +532,7 @@ - + @@ -559,7 +559,7 @@ - + @@ -568,7 +568,7 @@ - + @@ -577,7 +577,7 @@ - + @@ -589,7 +589,7 @@ - + @@ -601,7 +601,7 @@ - + @@ -691,7 +691,7 @@ - + @@ -952,7 +952,7 @@ - + @@ -961,7 +961,7 @@ - + @@ -1024,7 +1024,7 @@ - + @@ -1042,7 +1042,7 @@ - + @@ -1069,7 +1069,7 @@ - + @@ -1078,7 +1078,7 @@ - + @@ -1087,7 +1087,7 @@ - + @@ -1123,7 +1123,7 @@ - + @@ -1132,7 +1132,7 @@ - + @@ -1177,7 +1177,7 @@ - + @@ -1348,7 +1348,7 @@ - + @@ -1393,7 +1393,7 @@ - + @@ -1429,7 +1429,7 @@ - + @@ -1660,7 +1660,7 @@ - + @@ -1678,7 +1678,7 @@ - + @@ -1696,7 +1696,7 @@ - + @@ -1807,7 +1807,7 @@ - + @@ -1843,7 +1843,7 @@ - + @@ -1882,7 +1882,7 @@ - + @@ -1891,7 +1891,7 @@ - + @@ -1918,7 +1918,7 @@ - + @@ -1954,7 +1954,7 @@ - + @@ -2026,7 +2026,7 @@ - + @@ -2080,7 +2080,7 @@ - + @@ -2089,7 +2089,7 @@ - + @@ -2155,7 +2155,7 @@ - + @@ -2191,7 +2191,7 @@ - + @@ -2200,7 +2200,7 @@ - + @@ -2218,7 +2218,7 @@ - + @@ -2236,7 +2236,7 @@ - + @@ -2293,7 +2293,7 @@ - + @@ -2302,7 +2302,7 @@ - + @@ -2329,7 +2329,7 @@ - + @@ -2338,7 +2338,7 @@ - + @@ -2500,7 +2500,7 @@ - + @@ -2545,7 +2545,7 @@ - + @@ -2554,7 +2554,7 @@ - + @@ -2590,7 +2590,7 @@ - + @@ -2644,7 +2644,7 @@ - + @@ -2653,7 +2653,7 @@ - + @@ -2764,7 +2764,7 @@ - + @@ -2809,7 +2809,7 @@ - + @@ -2872,7 +2872,7 @@ - + @@ -2908,7 +2908,7 @@ - + @@ -3148,7 +3148,7 @@ - + @@ -3202,7 +3202,7 @@ - + @@ -3211,7 +3211,7 @@ - + @@ -3220,7 +3220,7 @@ - + @@ -3256,7 +3256,7 @@ - + @@ -3265,7 +3265,7 @@ - + @@ -3340,7 +3340,7 @@ - + @@ -3352,7 +3352,7 @@ - + @@ -3361,7 +3361,7 @@ - + @@ -3415,7 +3415,7 @@ - + @@ -3583,7 +3583,7 @@ - + @@ -3592,7 +3592,7 @@ - + @@ -3601,7 +3601,7 @@ - + @@ -3610,7 +3610,7 @@ - + @@ -3751,7 +3751,7 @@ - + @@ -3760,7 +3760,7 @@ - + @@ -3904,7 +3904,7 @@ - + @@ -3952,7 +3952,7 @@ - + @@ -3961,7 +3961,7 @@ - + @@ -3970,7 +3970,7 @@ - + @@ -3988,7 +3988,7 @@ - + @@ -4006,7 +4006,7 @@ - + @@ -4084,7 +4084,7 @@ - + @@ -4111,7 +4111,7 @@ - + @@ -4120,7 +4120,7 @@ - + @@ -4138,7 +4138,7 @@ - + @@ -4288,7 +4288,7 @@ - + @@ -4342,7 +4342,7 @@ - + @@ -4441,7 +4441,7 @@ - + @@ -4450,7 +4450,7 @@ - + @@ -4459,7 +4459,7 @@ - + @@ -4630,7 +4630,7 @@ - + @@ -4684,7 +4684,7 @@ - + @@ -4693,7 +4693,7 @@ - + @@ -4729,7 +4729,7 @@ - + @@ -4747,7 +4747,7 @@ - + @@ -4765,7 +4765,7 @@ - + @@ -4819,7 +4819,7 @@ - + @@ -4837,7 +4837,7 @@ - + @@ -4846,7 +4846,7 @@ - + @@ -4864,7 +4864,7 @@ - + @@ -5020,7 +5020,7 @@ - + @@ -5047,7 +5047,7 @@ - + @@ -5065,7 +5065,7 @@ - + @@ -5083,7 +5083,7 @@ - + @@ -5092,7 +5092,7 @@ - + @@ -5122,7 +5122,7 @@ - + @@ -5131,7 +5131,7 @@ - + @@ -5143,7 +5143,7 @@ - + @@ -5173,7 +5173,7 @@ - + @@ -5215,7 +5215,7 @@ - + @@ -5242,7 +5242,7 @@ - + @@ -5251,7 +5251,7 @@ - + @@ -5260,7 +5260,7 @@ - + @@ -5269,7 +5269,7 @@ - + @@ -5380,7 +5380,7 @@ - + @@ -5455,7 +5455,7 @@ - + @@ -5881,7 +5881,7 @@ - + @@ -5917,7 +5917,7 @@ - + @@ -5926,7 +5926,7 @@ - + @@ -5944,7 +5944,7 @@ - + @@ -6049,7 +6049,7 @@ - + @@ -6070,7 +6070,7 @@ - + @@ -6079,7 +6079,7 @@ - + @@ -6097,7 +6097,7 @@ - + @@ -6187,7 +6187,7 @@ - + @@ -6292,7 +6292,7 @@ - + @@ -6331,7 +6331,7 @@ - + @@ -6595,7 +6595,7 @@ - + @@ -6613,7 +6613,7 @@ - + @@ -6640,7 +6640,7 @@ - + @@ -6868,7 +6868,7 @@ - + @@ -6877,7 +6877,7 @@ - + @@ -6895,7 +6895,7 @@ - + @@ -6931,7 +6931,7 @@ - + @@ -6970,7 +6970,7 @@ - + @@ -6979,7 +6979,7 @@ - + @@ -6988,7 +6988,7 @@ - + @@ -7024,7 +7024,7 @@ - + @@ -7150,7 +7150,7 @@ - + @@ -7159,7 +7159,7 @@ - + @@ -7168,7 +7168,7 @@ - + @@ -7177,7 +7177,7 @@ - + @@ -7258,7 +7258,7 @@ - + @@ -7303,7 +7303,7 @@ - + @@ -7330,7 +7330,7 @@ - + @@ -7348,7 +7348,7 @@ - + @@ -7402,7 +7402,7 @@ - + @@ -7411,7 +7411,7 @@ - + @@ -7429,7 +7429,7 @@ - + @@ -7741,7 +7741,7 @@ - + @@ -7795,7 +7795,7 @@ - + @@ -7813,7 +7813,7 @@ - + @@ -7822,7 +7822,7 @@ - + @@ -7831,7 +7831,7 @@ - + @@ -7840,7 +7840,7 @@ - + @@ -7894,7 +7894,7 @@ - + @@ -8086,7 +8086,7 @@ - + @@ -8143,7 +8143,7 @@ - + @@ -8170,7 +8170,7 @@ - + @@ -8182,7 +8182,7 @@ - + @@ -8401,7 +8401,7 @@ - + @@ -8413,7 +8413,7 @@ - + @@ -8452,7 +8452,7 @@ - + @@ -8533,7 +8533,7 @@ - + @@ -8551,7 +8551,7 @@ - + @@ -8641,7 +8641,7 @@ - + @@ -8863,7 +8863,7 @@ - + @@ -8890,7 +8890,7 @@ - + @@ -8899,7 +8899,7 @@ - + @@ -9061,7 +9061,7 @@ - + @@ -9079,7 +9079,7 @@ - + @@ -9340,7 +9340,7 @@ - + @@ -9349,7 +9349,7 @@ - + @@ -9358,7 +9358,7 @@ - + @@ -9388,7 +9388,7 @@ - + @@ -9397,7 +9397,7 @@ - + @@ -9439,7 +9439,7 @@ - + @@ -9451,7 +9451,7 @@ - + @@ -9469,7 +9469,7 @@ - + @@ -9490,7 +9490,7 @@ - + @@ -9553,7 +9553,7 @@ - + @@ -9571,7 +9571,7 @@ - + @@ -9580,7 +9580,7 @@ - + @@ -9589,7 +9589,7 @@ - + @@ -9598,7 +9598,7 @@ - + @@ -9607,7 +9607,7 @@ - + @@ -9625,7 +9625,7 @@ - + @@ -9634,7 +9634,7 @@ - + @@ -9646,7 +9646,7 @@ - + @@ -9655,7 +9655,7 @@ - + @@ -9664,7 +9664,7 @@ - + @@ -9673,7 +9673,7 @@ - + @@ -9682,7 +9682,7 @@ - + @@ -9691,7 +9691,7 @@ - + @@ -9700,7 +9700,7 @@ - + @@ -9709,7 +9709,7 @@ - + @@ -9718,7 +9718,7 @@ - + @@ -9727,7 +9727,7 @@ - + @@ -9739,7 +9739,7 @@ - + @@ -9748,7 +9748,7 @@ - + @@ -9757,7 +9757,7 @@ - + @@ -9766,7 +9766,7 @@ - + @@ -9775,7 +9775,7 @@ - + @@ -10057,7 +10057,7 @@ - + @@ -10066,7 +10066,7 @@ - + @@ -10240,7 +10240,7 @@ - + @@ -10258,7 +10258,7 @@ - + @@ -10267,7 +10267,7 @@ - + @@ -10276,7 +10276,7 @@ - + @@ -10285,7 +10285,7 @@ - + @@ -10348,7 +10348,7 @@ - + @@ -10375,7 +10375,7 @@ - + @@ -10456,7 +10456,7 @@ - + @@ -10810,7 +10810,7 @@ - + @@ -10837,7 +10837,7 @@ - + @@ -10927,7 +10927,7 @@ - + @@ -10936,7 +10936,7 @@ - + @@ -10954,7 +10954,7 @@ - + @@ -10972,7 +10972,7 @@ - + @@ -10981,7 +10981,7 @@ - + @@ -10999,7 +10999,7 @@ - + @@ -11017,7 +11017,7 @@ - + @@ -11026,7 +11026,7 @@ - + @@ -11035,7 +11035,7 @@ - + @@ -11044,7 +11044,7 @@ - + @@ -11062,7 +11062,7 @@ - + @@ -11071,7 +11071,7 @@ - + @@ -11080,7 +11080,7 @@ - + @@ -11089,7 +11089,7 @@ - + @@ -11098,7 +11098,7 @@ - + @@ -11107,7 +11107,7 @@ - + @@ -11116,7 +11116,7 @@ - + @@ -11125,7 +11125,7 @@ - + @@ -11179,7 +11179,7 @@ - + @@ -11197,7 +11197,7 @@ - + @@ -11410,7 +11410,7 @@ - + @@ -11437,7 +11437,7 @@ - + @@ -11446,7 +11446,7 @@ - + @@ -11455,7 +11455,7 @@ - + @@ -11557,7 +11557,7 @@ - + @@ -11602,7 +11602,7 @@ - + @@ -11611,7 +11611,7 @@ - + @@ -11665,7 +11665,7 @@ - + @@ -11923,7 +11923,7 @@ - + @@ -11932,7 +11932,7 @@ - + @@ -11959,7 +11959,7 @@ - + @@ -11968,7 +11968,7 @@ - + @@ -12004,7 +12004,7 @@ - + @@ -12040,7 +12040,7 @@ - + @@ -12067,7 +12067,7 @@ - + @@ -12076,7 +12076,7 @@ - + @@ -12085,7 +12085,7 @@ - + @@ -12094,7 +12094,7 @@ - + @@ -12103,7 +12103,7 @@ - + @@ -12121,7 +12121,7 @@ - + @@ -12130,7 +12130,7 @@ - + @@ -12139,7 +12139,7 @@ - + @@ -12148,7 +12148,7 @@ - + @@ -12157,7 +12157,7 @@ - + @@ -12484,7 +12484,7 @@ - + @@ -12574,7 +12574,7 @@ - + @@ -12601,7 +12601,7 @@ - + @@ -12646,7 +12646,7 @@ - + @@ -12682,7 +12682,7 @@ - + @@ -12691,7 +12691,7 @@ - + @@ -12709,7 +12709,7 @@ - + @@ -12718,7 +12718,7 @@ - + @@ -12784,7 +12784,7 @@ - + @@ -12841,7 +12841,7 @@ - + @@ -12850,7 +12850,7 @@ - + @@ -12868,7 +12868,7 @@ - + @@ -12898,7 +12898,7 @@ - + @@ -12907,7 +12907,7 @@ - + @@ -12916,7 +12916,7 @@ - + @@ -12925,7 +12925,7 @@ - + @@ -12943,7 +12943,7 @@ - + @@ -12952,7 +12952,7 @@ - + @@ -12961,7 +12961,7 @@ - + @@ -12970,7 +12970,7 @@ - + @@ -12988,7 +12988,7 @@ - + @@ -12997,7 +12997,7 @@ - + @@ -13006,7 +13006,7 @@ - + @@ -13015,7 +13015,7 @@ - + @@ -13024,7 +13024,7 @@ - + @@ -13042,7 +13042,7 @@ - + @@ -13051,7 +13051,7 @@ - + @@ -13060,7 +13060,7 @@ - + @@ -13069,7 +13069,7 @@ - + @@ -13078,7 +13078,7 @@ - + @@ -13087,7 +13087,7 @@ - + @@ -13096,7 +13096,7 @@ - + @@ -13105,7 +13105,7 @@ - + @@ -13114,7 +13114,7 @@ - + @@ -13150,7 +13150,7 @@ - + @@ -13159,7 +13159,7 @@ - + @@ -13168,7 +13168,7 @@ - + @@ -13177,7 +13177,7 @@ - + @@ -13186,7 +13186,7 @@ - + @@ -13261,7 +13261,7 @@ - + @@ -13405,7 +13405,7 @@ - + @@ -13477,7 +13477,7 @@ - + @@ -13495,7 +13495,7 @@ - + @@ -13654,7 +13654,7 @@ - + @@ -13702,7 +13702,7 @@ - + @@ -13744,7 +13744,7 @@ - + @@ -13768,7 +13768,7 @@ - + @@ -13786,7 +13786,7 @@ - + @@ -13867,7 +13867,7 @@ - + @@ -14218,7 +14218,7 @@ - + @@ -14308,7 +14308,7 @@ - + @@ -14317,7 +14317,7 @@ - + @@ -14344,7 +14344,7 @@ - + @@ -14353,7 +14353,7 @@ - + @@ -14434,7 +14434,7 @@ - + @@ -14443,7 +14443,7 @@ - + @@ -14461,7 +14461,7 @@ - + @@ -14602,7 +14602,7 @@ - + @@ -14611,7 +14611,7 @@ - + @@ -14755,7 +14755,7 @@ - + @@ -14827,7 +14827,7 @@ - + @@ -14953,7 +14953,7 @@ - + @@ -14962,7 +14962,7 @@ type.]]> - " sein.]]> + " sein.]]> @@ -14971,7 +14971,7 @@ type. Did you mean to write 'Promise<{0}>'?]]> - " sein. Wollten Sie eigentlich "Promise<{0}>" verwenden?]]> + " sein. Wollten Sie eigentlich "Promise<{0}>" verwenden?]]> @@ -14998,7 +14998,7 @@ - + @@ -15016,7 +15016,7 @@ - + @@ -15043,7 +15043,7 @@ - + @@ -15052,7 +15052,7 @@ - + @@ -15082,7 +15082,7 @@ - + @@ -15091,7 +15091,7 @@ - + @@ -15100,7 +15100,7 @@ - + @@ -15109,7 +15109,7 @@ - + @@ -15118,7 +15118,7 @@ - + @@ -15145,7 +15145,7 @@ - + @@ -15226,7 +15226,7 @@ - + @@ -15235,7 +15235,7 @@ - + @@ -15244,7 +15244,7 @@ - + @@ -15280,7 +15280,7 @@ - + @@ -15379,7 +15379,7 @@ - + @@ -15469,7 +15469,7 @@ - + @@ -15496,7 +15496,7 @@ - + @@ -15595,7 +15595,7 @@ - + @@ -15604,7 +15604,7 @@ - + @@ -15613,7 +15613,7 @@ - + @@ -15739,7 +15739,7 @@ - + @@ -15784,7 +15784,7 @@ - + @@ -15793,7 +15793,7 @@ - + @@ -15802,7 +15802,7 @@ - + @@ -15811,7 +15811,7 @@ - + @@ -15874,7 +15874,7 @@ - + @@ -15940,7 +15940,7 @@ - + @@ -16057,7 +16057,7 @@ - + @@ -16183,7 +16183,7 @@ - + @@ -16192,7 +16192,7 @@ - + @@ -16201,7 +16201,7 @@ - + @@ -16210,7 +16210,7 @@ - + @@ -16222,7 +16222,7 @@ - + @@ -16405,7 +16405,7 @@ - + @@ -16504,7 +16504,7 @@ - + @@ -16567,7 +16567,7 @@ - + @@ -16603,7 +16603,7 @@ - + @@ -16612,7 +16612,7 @@ - + @@ -16621,7 +16621,7 @@ - + @@ -16795,7 +16795,7 @@ - + @@ -16804,7 +16804,7 @@ - + @@ -16813,7 +16813,7 @@ - + @@ -16822,7 +16822,7 @@ - + @@ -16876,7 +16876,7 @@ - + @@ -17209,7 +17209,7 @@ - + @@ -17308,7 +17308,7 @@ - + @@ -17389,7 +17389,7 @@ - + @@ -17434,7 +17434,7 @@ - + @@ -17470,7 +17470,7 @@ - + @@ -17635,7 +17635,7 @@ - + @@ -17644,7 +17644,7 @@ - + @@ -17653,7 +17653,7 @@ - + @@ -17662,7 +17662,7 @@ - + @@ -17689,7 +17689,7 @@ - + @@ -17716,7 +17716,7 @@ - + @@ -17725,7 +17725,7 @@ - + @@ -17797,7 +17797,7 @@ - + @@ -17806,7 +17806,7 @@ - + @@ -17815,7 +17815,7 @@ - + @@ -17824,7 +17824,7 @@ - + @@ -17977,7 +17977,7 @@ - + @@ -18031,7 +18031,7 @@ - + @@ -18040,7 +18040,7 @@ - + @@ -18079,7 +18079,7 @@ - + @@ -18088,7 +18088,7 @@ - + @@ -18187,7 +18187,7 @@ - + @@ -18343,7 +18343,7 @@ - + @@ -18352,7 +18352,7 @@ - + @@ -18361,7 +18361,7 @@ - + @@ -18370,7 +18370,7 @@ - + @@ -18382,7 +18382,7 @@ - + @@ -18391,7 +18391,7 @@ - + @@ -18400,7 +18400,7 @@ - + @@ -18409,7 +18409,7 @@ - + @@ -18418,7 +18418,7 @@ - + @@ -18427,7 +18427,7 @@ - + @@ -18436,7 +18436,7 @@ - + @@ -18562,7 +18562,7 @@ - + @@ -18583,7 +18583,7 @@ - + @@ -18628,7 +18628,7 @@ - + @@ -18742,7 +18742,7 @@ - + @@ -18886,7 +18886,7 @@ - + @@ -18976,7 +18976,7 @@ - + @@ -19075,7 +19075,7 @@ - + @@ -19093,7 +19093,7 @@ - + @@ -19120,7 +19120,7 @@ - + @@ -19129,7 +19129,7 @@ - + @@ -19312,7 +19312,7 @@ - + @@ -19321,7 +19321,7 @@ - + @@ -19447,7 +19447,7 @@ - + diff --git a/src/loc/lcl/esn/diagnosticMessages/diagnosticMessages.generated.json.lcl b/src/loc/lcl/esn/diagnosticMessages/diagnosticMessages.generated.json.lcl index 9b55a11f80d05..ca9378a05bc41 100644 --- a/src/loc/lcl/esn/diagnosticMessages/diagnosticMessages.generated.json.lcl +++ b/src/loc/lcl/esn/diagnosticMessages/diagnosticMessages.generated.json.lcl @@ -52,7 +52,7 @@ - + @@ -70,7 +70,7 @@ - + @@ -97,7 +97,7 @@ - + @@ -106,7 +106,7 @@ - + @@ -133,7 +133,7 @@ - + @@ -142,7 +142,7 @@ - + @@ -151,7 +151,7 @@ - + @@ -271,7 +271,7 @@ - + @@ -298,7 +298,7 @@ - + @@ -307,7 +307,7 @@ - + @@ -418,7 +418,7 @@ - + @@ -493,7 +493,7 @@ - + @@ -700,7 +700,7 @@ - + @@ -709,7 +709,7 @@ - + @@ -736,7 +736,7 @@ - + @@ -772,7 +772,7 @@ - + @@ -784,7 +784,7 @@ - + @@ -793,7 +793,7 @@ - + @@ -811,7 +811,7 @@ - + @@ -820,7 +820,7 @@ - + @@ -856,7 +856,7 @@ - + @@ -919,7 +919,7 @@ - + @@ -928,7 +928,7 @@ - + @@ -973,7 +973,7 @@ - + @@ -1054,7 +1054,7 @@ - + @@ -1063,7 +1063,7 @@ - + @@ -1135,7 +1135,7 @@ - + @@ -1858,7 +1858,7 @@ - + @@ -1906,7 +1906,7 @@ - + @@ -1951,7 +1951,7 @@ - + @@ -1969,7 +1969,7 @@ - + @@ -2077,7 +2077,7 @@ - + @@ -2095,7 +2095,7 @@ - + @@ -2242,7 +2242,7 @@ - + @@ -2260,7 +2260,7 @@ - + @@ -2452,7 +2452,7 @@ - + @@ -2461,7 +2461,7 @@ - + @@ -2479,7 +2479,7 @@ - + @@ -2533,7 +2533,7 @@ - + @@ -2578,7 +2578,7 @@ - + @@ -2668,7 +2668,7 @@ - + @@ -2695,7 +2695,7 @@ - + @@ -2707,7 +2707,7 @@ - + @@ -2734,7 +2734,7 @@ - + @@ -2953,7 +2953,7 @@ - + @@ -2962,7 +2962,7 @@ - + @@ -2989,7 +2989,7 @@ - + @@ -2998,7 +2998,7 @@ - + @@ -3046,7 +3046,7 @@ - + @@ -3244,7 +3244,7 @@ - + @@ -3793,7 +3793,7 @@ - + @@ -3802,7 +3802,7 @@ - + @@ -3829,7 +3829,7 @@ - + @@ -3919,7 +3919,7 @@ - + @@ -4030,7 +4030,7 @@ - + @@ -4039,7 +4039,7 @@ - + @@ -4078,7 +4078,7 @@ - + @@ -4087,7 +4087,7 @@ - + @@ -4099,7 +4099,7 @@ - + @@ -4144,7 +4144,7 @@ - + @@ -4216,7 +4216,7 @@ - + @@ -4303,7 +4303,7 @@ - + @@ -4393,7 +4393,7 @@ - + @@ -4411,7 +4411,7 @@ - + @@ -4420,7 +4420,7 @@ - + @@ -4447,7 +4447,7 @@ - + @@ -4483,7 +4483,7 @@ - + @@ -4528,7 +4528,7 @@ - + @@ -4960,7 +4960,7 @@ - + @@ -5017,7 +5017,7 @@ - + @@ -5044,7 +5044,7 @@ - + @@ -5053,7 +5053,7 @@ - + @@ -5062,7 +5062,7 @@ - + @@ -5071,7 +5071,7 @@ - + @@ -5248,7 +5248,7 @@ - + @@ -5644,7 +5644,7 @@ - + @@ -5728,7 +5728,7 @@ - + @@ -5788,7 +5788,7 @@ - + @@ -5869,7 +5869,7 @@ - + @@ -6043,7 +6043,7 @@ - + @@ -6064,7 +6064,7 @@ - + @@ -6268,7 +6268,7 @@ - + @@ -6628,7 +6628,7 @@ - + @@ -6673,7 +6673,7 @@ - + @@ -6748,7 +6748,7 @@ - + @@ -6757,7 +6757,7 @@ - + @@ -6766,7 +6766,7 @@ - + @@ -6775,7 +6775,7 @@ - + @@ -6784,7 +6784,7 @@ - + @@ -6793,7 +6793,7 @@ - + @@ -6847,7 +6847,7 @@ - + @@ -6919,7 +6919,7 @@ - + @@ -7111,7 +7111,7 @@ - + @@ -7327,7 +7327,7 @@ - + @@ -7543,7 +7543,7 @@ - + @@ -7561,7 +7561,7 @@ - + @@ -7612,7 +7612,7 @@ - + @@ -7819,7 +7819,7 @@ - + @@ -7828,7 +7828,7 @@ - + @@ -7864,7 +7864,7 @@ - + @@ -7873,7 +7873,7 @@ - + @@ -8008,7 +8008,7 @@ - + @@ -8017,7 +8017,7 @@ - + @@ -8053,7 +8053,7 @@ - + @@ -8071,7 +8071,7 @@ - + @@ -8206,7 +8206,7 @@ - + @@ -8227,7 +8227,7 @@ - + @@ -8326,7 +8326,7 @@ - + @@ -8380,7 +8380,7 @@ - + @@ -8464,7 +8464,7 @@ - + @@ -8548,7 +8548,7 @@ - + @@ -8566,7 +8566,7 @@ - + @@ -8620,7 +8620,7 @@ - + @@ -8665,7 +8665,7 @@ - + @@ -8803,7 +8803,7 @@ - + @@ -8866,7 +8866,7 @@ - + @@ -8887,7 +8887,7 @@ - + @@ -9217,7 +9217,7 @@ - + @@ -9265,7 +9265,7 @@ - + @@ -9301,7 +9301,7 @@ - + @@ -9346,7 +9346,7 @@ - + @@ -9688,7 +9688,7 @@ - + @@ -9697,7 +9697,7 @@ - + @@ -9919,7 +9919,7 @@ - + @@ -9964,7 +9964,7 @@ - + @@ -10018,7 +10018,7 @@ - + @@ -10027,7 +10027,7 @@ - + @@ -10045,7 +10045,7 @@ - + @@ -10099,7 +10099,7 @@ - + @@ -10108,7 +10108,7 @@ - + @@ -10372,7 +10372,7 @@ - + @@ -10480,7 +10480,7 @@ - + @@ -10507,7 +10507,7 @@ - + @@ -10516,7 +10516,7 @@ - + @@ -10543,7 +10543,7 @@ - + @@ -10552,7 +10552,7 @@ - + @@ -10561,7 +10561,7 @@ - + @@ -10669,7 +10669,7 @@ - + @@ -10726,7 +10726,7 @@ - + @@ -10825,7 +10825,7 @@ - + @@ -10834,7 +10834,7 @@ - + @@ -10861,7 +10861,7 @@ - + @@ -10870,7 +10870,7 @@ - + @@ -10879,7 +10879,7 @@ - + @@ -10888,7 +10888,7 @@ - + @@ -10897,7 +10897,7 @@ - + @@ -11311,7 +11311,7 @@ - + @@ -11833,7 +11833,7 @@ - + @@ -11986,7 +11986,7 @@ - + @@ -12076,7 +12076,7 @@ - + @@ -12241,7 +12241,7 @@ - + @@ -12250,7 +12250,7 @@ - + @@ -12259,7 +12259,7 @@ - + @@ -12295,7 +12295,7 @@ - + @@ -12304,7 +12304,7 @@ - + @@ -12313,7 +12313,7 @@ - + @@ -12322,7 +12322,7 @@ - + @@ -12331,7 +12331,7 @@ - + @@ -12376,7 +12376,7 @@ - + @@ -12502,7 +12502,7 @@ - + @@ -12646,7 +12646,7 @@ - + @@ -12859,7 +12859,7 @@ - + @@ -13225,7 +13225,7 @@ - + @@ -13234,7 +13234,7 @@ - + @@ -13297,7 +13297,7 @@ - + @@ -13306,7 +13306,7 @@ - + @@ -13513,7 +13513,7 @@ - + @@ -13522,7 +13522,7 @@ - + @@ -13540,7 +13540,7 @@ - + @@ -13951,7 +13951,7 @@ - + @@ -14095,7 +14095,7 @@ - + @@ -14134,7 +14134,7 @@ - + @@ -14143,7 +14143,7 @@ - + @@ -14170,7 +14170,7 @@ - + @@ -14179,7 +14179,7 @@ - + @@ -14263,7 +14263,7 @@ - + @@ -14290,7 +14290,7 @@ - + @@ -14299,7 +14299,7 @@ - + @@ -14335,7 +14335,7 @@ - + @@ -14344,7 +14344,7 @@ - + @@ -14389,7 +14389,7 @@ - + @@ -14398,7 +14398,7 @@ - + @@ -14407,7 +14407,7 @@ - + @@ -14443,7 +14443,7 @@ - + @@ -14506,7 +14506,7 @@ - + @@ -14542,7 +14542,7 @@ - + @@ -14593,7 +14593,7 @@ - + @@ -14602,7 +14602,7 @@ - + @@ -14611,7 +14611,7 @@ - + @@ -14629,7 +14629,7 @@ - + @@ -14638,7 +14638,7 @@ - + @@ -14647,7 +14647,7 @@ - + @@ -14701,7 +14701,7 @@ - + @@ -14710,7 +14710,7 @@ - + @@ -14719,7 +14719,7 @@ - + @@ -14737,7 +14737,7 @@ - + @@ -14746,7 +14746,7 @@ - + @@ -14755,7 +14755,7 @@ - + @@ -14773,7 +14773,7 @@ - + @@ -14782,7 +14782,7 @@ - + @@ -14791,7 +14791,7 @@ - + @@ -14800,7 +14800,7 @@ - + @@ -14809,7 +14809,7 @@ - + @@ -14818,7 +14818,7 @@ - + @@ -14836,7 +14836,7 @@ - + @@ -14866,7 +14866,7 @@ - + @@ -14875,7 +14875,7 @@ - + @@ -14887,7 +14887,7 @@ - + @@ -14899,7 +14899,7 @@ - + @@ -14908,7 +14908,7 @@ - + @@ -14917,7 +14917,7 @@ - + @@ -14962,7 +14962,7 @@ - + @@ -14971,7 +14971,7 @@ - + @@ -14980,7 +14980,7 @@ - + @@ -14989,7 +14989,7 @@ type.]]> - global.]]> + global.]]> @@ -14998,7 +14998,7 @@ type. Did you mean to write 'Promise<{0}>'?]]> - global. ¿Pretendía escribir "Promise<{0}>"?]]> + global. ¿Pretendía escribir "Promise<{0}>"?]]> @@ -15007,7 +15007,7 @@ - + @@ -15016,7 +15016,7 @@ - + @@ -15025,7 +15025,7 @@ - + @@ -15034,7 +15034,7 @@ - + @@ -15043,7 +15043,7 @@ - + @@ -15052,7 +15052,7 @@ - + @@ -15061,7 +15061,7 @@ - + @@ -15109,7 +15109,7 @@ - + @@ -15118,7 +15118,7 @@ - + @@ -15190,7 +15190,7 @@ - + @@ -15271,7 +15271,7 @@ - + @@ -15298,7 +15298,7 @@ - + @@ -15307,7 +15307,7 @@ - + @@ -15316,7 +15316,7 @@ - + @@ -15325,7 +15325,7 @@ - + @@ -15334,7 +15334,7 @@ - + @@ -15343,7 +15343,7 @@ - + @@ -15505,7 +15505,7 @@ - + @@ -15766,7 +15766,7 @@ - + @@ -15775,7 +15775,7 @@ - + @@ -15784,7 +15784,7 @@ - + @@ -15802,7 +15802,7 @@ - + @@ -15949,7 +15949,7 @@ - + @@ -16039,7 +16039,7 @@ - + @@ -16084,7 +16084,7 @@ - + @@ -16249,7 +16249,7 @@ - + @@ -16267,7 +16267,7 @@ - + @@ -16285,7 +16285,7 @@ - + @@ -16333,7 +16333,7 @@ - + @@ -16342,7 +16342,7 @@ - + @@ -16351,7 +16351,7 @@ - + @@ -16450,7 +16450,7 @@ - + @@ -16459,7 +16459,7 @@ - + @@ -16468,7 +16468,7 @@ - + @@ -16477,7 +16477,7 @@ - + @@ -16504,7 +16504,7 @@ - + @@ -16513,7 +16513,7 @@ - + @@ -16522,7 +16522,7 @@ - + @@ -16693,7 +16693,7 @@ - + @@ -16858,7 +16858,7 @@ - + @@ -17101,7 +17101,7 @@ - + @@ -17155,7 +17155,7 @@ - + @@ -17317,7 +17317,7 @@ - + @@ -17542,7 +17542,7 @@ - + @@ -17590,7 +17590,7 @@ - + @@ -17653,7 +17653,7 @@ - + @@ -17716,7 +17716,7 @@ - + @@ -17851,7 +17851,7 @@ - + @@ -17941,7 +17941,7 @@ - + @@ -17950,7 +17950,7 @@ - + @@ -17977,7 +17977,7 @@ - + @@ -18040,7 +18040,7 @@ - + @@ -18160,7 +18160,7 @@ - + @@ -18169,7 +18169,7 @@ - + @@ -18370,7 +18370,7 @@ - + @@ -18379,7 +18379,7 @@ - + @@ -18388,7 +18388,7 @@ - + @@ -18397,7 +18397,7 @@ - + @@ -18409,7 +18409,7 @@ - + @@ -18418,7 +18418,7 @@ - + @@ -18757,7 +18757,7 @@ - + @@ -18832,7 +18832,7 @@ - + @@ -19120,7 +19120,7 @@ - + @@ -19201,7 +19201,7 @@ - + @@ -19273,7 +19273,7 @@ - + @@ -19321,7 +19321,7 @@ - + @@ -19339,7 +19339,7 @@ - + @@ -19366,7 +19366,7 @@ - + @@ -19393,7 +19393,7 @@ - + @@ -19465,7 +19465,7 @@ - + diff --git a/src/loc/lcl/fra/diagnosticMessages/diagnosticMessages.generated.json.lcl b/src/loc/lcl/fra/diagnosticMessages/diagnosticMessages.generated.json.lcl index 4ee447a09d4c7..09d349b4893f1 100644 --- a/src/loc/lcl/fra/diagnosticMessages/diagnosticMessages.generated.json.lcl +++ b/src/loc/lcl/fra/diagnosticMessages/diagnosticMessages.generated.json.lcl @@ -133,7 +133,7 @@ - + @@ -199,7 +199,7 @@ - + @@ -448,7 +448,7 @@ - + @@ -457,7 +457,7 @@ - + @@ -466,7 +466,7 @@ - + @@ -586,7 +586,7 @@ - + @@ -598,7 +598,7 @@ - + @@ -610,7 +610,7 @@ - + @@ -619,7 +619,7 @@ - + @@ -628,7 +628,7 @@ - + @@ -646,7 +646,7 @@ - + @@ -655,7 +655,7 @@ - + @@ -838,7 +838,7 @@ - + @@ -847,7 +847,7 @@ - + @@ -856,7 +856,7 @@ - + @@ -1036,7 +1036,7 @@ - + @@ -1162,7 +1162,7 @@ - + @@ -1171,7 +1171,7 @@ - + @@ -1243,7 +1243,7 @@ - + @@ -1261,7 +1261,7 @@ - + @@ -1360,7 +1360,7 @@ - + @@ -1396,7 +1396,7 @@ - + @@ -1507,7 +1507,7 @@ - + @@ -1543,7 +1543,7 @@ - + @@ -1648,7 +1648,7 @@ - + @@ -1675,7 +1675,7 @@ - + @@ -1822,7 +1822,7 @@ - + @@ -1942,7 +1942,7 @@ - + @@ -1996,7 +1996,7 @@ - + @@ -2068,7 +2068,7 @@ - + @@ -2086,7 +2086,7 @@ - + @@ -2095,7 +2095,7 @@ - + @@ -2104,7 +2104,7 @@ - + @@ -2161,7 +2161,7 @@ - + @@ -2179,7 +2179,7 @@ - + @@ -2215,7 +2215,7 @@ - + @@ -2290,7 +2290,7 @@ - + @@ -2353,7 +2353,7 @@ - + @@ -2569,7 +2569,7 @@ - + @@ -2632,7 +2632,7 @@ - + @@ -2668,7 +2668,7 @@ - + @@ -2779,7 +2779,7 @@ - + @@ -2824,7 +2824,7 @@ - + @@ -2923,7 +2923,7 @@ - + @@ -2932,7 +2932,7 @@ - + @@ -2941,7 +2941,7 @@ - + @@ -2953,7 +2953,7 @@ - + @@ -2971,7 +2971,7 @@ - + @@ -3100,7 +3100,7 @@ - + @@ -3163,7 +3163,7 @@ - + @@ -3172,7 +3172,7 @@ - + @@ -3430,7 +3430,7 @@ - + @@ -3598,7 +3598,7 @@ - + @@ -3607,7 +3607,7 @@ - + @@ -3616,7 +3616,7 @@ - + @@ -3625,7 +3625,7 @@ - + @@ -3670,7 +3670,7 @@ - + @@ -3700,7 +3700,7 @@ - + @@ -3730,7 +3730,7 @@ - + @@ -3748,7 +3748,7 @@ - + @@ -3793,7 +3793,7 @@ - + @@ -3811,7 +3811,7 @@ - + @@ -3919,7 +3919,7 @@ - + @@ -3931,7 +3931,7 @@ - + @@ -3967,7 +3967,7 @@ - + @@ -3976,7 +3976,7 @@ - + @@ -3985,7 +3985,7 @@ - + @@ -4153,7 +4153,7 @@ - + @@ -4234,7 +4234,7 @@ - + @@ -4246,7 +4246,7 @@ - + @@ -4255,7 +4255,7 @@ - + @@ -4276,7 +4276,7 @@ - + @@ -4285,7 +4285,7 @@ - + @@ -4357,7 +4357,7 @@ - + @@ -4465,7 +4465,7 @@ - + @@ -4519,7 +4519,7 @@ - + @@ -4555,7 +4555,7 @@ - + @@ -4600,7 +4600,7 @@ - + @@ -4627,7 +4627,7 @@ - + @@ -4636,7 +4636,7 @@ - + @@ -4645,7 +4645,7 @@ - + @@ -4654,7 +4654,7 @@ - + @@ -4708,7 +4708,7 @@ - + @@ -4744,7 +4744,7 @@ - + @@ -4753,7 +4753,7 @@ - + @@ -4762,7 +4762,7 @@ - + @@ -4780,7 +4780,7 @@ - + @@ -4834,7 +4834,7 @@ - + @@ -4843,7 +4843,7 @@ - + @@ -4852,7 +4852,7 @@ - + @@ -4861,7 +4861,7 @@ - + @@ -4870,7 +4870,7 @@ - + @@ -5089,7 +5089,7 @@ - + @@ -5107,7 +5107,7 @@ - + @@ -5212,7 +5212,7 @@ - + @@ -5221,7 +5221,7 @@ - + @@ -5338,7 +5338,7 @@ - + @@ -5374,7 +5374,7 @@ - + @@ -5452,7 +5452,7 @@ {1}'?]]> - {1}' ?]]> + {1}' ?]]> @@ -5470,7 +5470,7 @@ - + @@ -5623,7 +5623,7 @@ - + @@ -5644,7 +5644,7 @@ - + @@ -5653,7 +5653,7 @@ - + @@ -5683,7 +5683,7 @@ - + @@ -5692,7 +5692,7 @@ - + @@ -5701,7 +5701,7 @@ - + @@ -5710,7 +5710,7 @@ - + @@ -5728,7 +5728,7 @@ - + @@ -5749,7 +5749,7 @@ - + @@ -5758,7 +5758,7 @@ 's from expanding the number of files TypeScript should add to a project.]]> - » d’étendre le nombre de fichiers que TypeScript doit ajouter à un projet.]]> + » d’étendre le nombre de fichiers que TypeScript doit ajouter à un project.]]> `s from expanding the number of files TypeScript should add to a project.]]> @@ -5851,7 +5851,7 @@ - + @@ -5896,7 +5896,7 @@ - + @@ -5914,7 +5914,7 @@ - + @@ -5941,7 +5941,7 @@ - + @@ -5959,7 +5959,7 @@ - + @@ -6103,7 +6103,7 @@ - + @@ -6298,7 +6298,7 @@ - + @@ -6307,7 +6307,7 @@ - + @@ -6397,7 +6397,7 @@ - + @@ -6406,7 +6406,7 @@ - + @@ -6415,7 +6415,7 @@ - + @@ -6424,7 +6424,7 @@ - + @@ -6529,7 +6529,7 @@ - + @@ -6619,7 +6619,7 @@ - + @@ -6655,7 +6655,7 @@ - + @@ -6712,7 +6712,7 @@ - + @@ -6730,7 +6730,7 @@ - + @@ -6946,7 +6946,7 @@ - + @@ -6958,7 +6958,7 @@ - + @@ -7165,7 +7165,7 @@ - + @@ -7354,7 +7354,7 @@ - + @@ -7543,7 +7543,7 @@ - + @@ -7552,7 +7552,7 @@ - + @@ -7561,7 +7561,7 @@ - + @@ -7666,7 +7666,7 @@ - + @@ -7774,7 +7774,7 @@ - + @@ -7783,7 +7783,7 @@ - + @@ -7792,7 +7792,7 @@ - + @@ -7801,7 +7801,7 @@ - + @@ -7810,7 +7810,7 @@ - + @@ -7819,7 +7819,7 @@ - + @@ -7828,7 +7828,7 @@ - + @@ -7837,7 +7837,7 @@ - + @@ -7846,7 +7846,7 @@ - + @@ -7855,7 +7855,7 @@ - + @@ -7864,7 +7864,7 @@ - + @@ -7873,7 +7873,7 @@ - + @@ -7882,7 +7882,7 @@ - + @@ -7891,7 +7891,7 @@ - + @@ -7900,7 +7900,7 @@ - + @@ -7909,7 +7909,7 @@ - + @@ -7918,7 +7918,7 @@ - + @@ -7936,7 +7936,7 @@ - + @@ -7954,7 +7954,7 @@ - + @@ -7972,7 +7972,7 @@ - + @@ -7981,7 +7981,7 @@ - + @@ -8080,7 +8080,7 @@ - + @@ -8101,7 +8101,7 @@ - + @@ -8110,7 +8110,7 @@ - + @@ -8122,7 +8122,7 @@ - + @@ -8131,7 +8131,7 @@ - + @@ -8140,7 +8140,7 @@ - + @@ -8299,7 +8299,7 @@ - + @@ -8308,7 +8308,7 @@ - + @@ -8362,7 +8362,7 @@ - + @@ -8389,7 +8389,7 @@ - + @@ -8398,7 +8398,7 @@ - + @@ -8407,7 +8407,7 @@ - + @@ -8425,7 +8425,7 @@ - + @@ -8437,7 +8437,7 @@ - + @@ -8512,7 +8512,7 @@ - + @@ -8539,7 +8539,7 @@ - + @@ -8548,7 +8548,7 @@ - + @@ -8629,7 +8629,7 @@ - + @@ -8683,7 +8683,7 @@ - + @@ -8785,7 +8785,7 @@ - + @@ -8896,7 +8896,7 @@ - + @@ -8905,7 +8905,7 @@ - + @@ -8914,7 +8914,7 @@ - + @@ -8923,7 +8923,7 @@ - + @@ -8932,7 +8932,7 @@ - + @@ -8941,7 +8941,7 @@ - + @@ -8950,7 +8950,7 @@ - + @@ -8959,7 +8959,7 @@ - + @@ -8968,7 +8968,7 @@ - + @@ -8977,7 +8977,7 @@ - + @@ -8986,7 +8986,7 @@ - + @@ -8995,7 +8995,7 @@ - + @@ -9004,7 +9004,7 @@ - + @@ -9013,7 +9013,7 @@ - + @@ -9031,7 +9031,7 @@ - + @@ -9040,7 +9040,7 @@ - + @@ -9049,7 +9049,7 @@ - + @@ -9058,7 +9058,7 @@ - + @@ -9157,7 +9157,7 @@ - + @@ -9175,7 +9175,7 @@ - + @@ -9217,7 +9217,7 @@ - + @@ -9283,7 +9283,7 @@ - + @@ -9319,7 +9319,7 @@ - + @@ -9391,7 +9391,7 @@ - + @@ -9400,7 +9400,7 @@ - + @@ -9421,7 +9421,7 @@ - + @@ -9430,7 +9430,7 @@ or -. For example '{0}' or '{1}'.]]> - ou -. Par exemple, '{0}' ou '{1}'.]]> + ou -. Par example, '{0}' ou '{1}'.]]> @@ -9451,7 +9451,7 @@ - + @@ -9484,7 +9484,7 @@ - + @@ -9523,7 +9523,7 @@ - + @@ -9532,7 +9532,7 @@ - + @@ -9568,7 +9568,7 @@ - + @@ -9586,7 +9586,7 @@ - + @@ -9817,7 +9817,7 @@ - + @@ -9946,7 +9946,7 @@ - + @@ -10027,7 +10027,7 @@ - + @@ -10054,7 +10054,7 @@ - + @@ -10063,7 +10063,7 @@ - + @@ -10099,7 +10099,7 @@ - + @@ -10108,7 +10108,7 @@ - + @@ -10237,7 +10237,7 @@ - + @@ -10246,7 +10246,7 @@ - + @@ -10345,7 +10345,7 @@ - + @@ -10354,7 +10354,7 @@ - + @@ -10372,7 +10372,7 @@ - + @@ -10381,7 +10381,7 @@ - + @@ -10390,7 +10390,7 @@ - + @@ -10426,7 +10426,7 @@ - + @@ -10480,7 +10480,7 @@ - + @@ -10516,7 +10516,7 @@ - + @@ -10798,7 +10798,7 @@ - + @@ -10825,7 +10825,7 @@ - + @@ -10834,7 +10834,7 @@ - + @@ -10843,7 +10843,7 @@ - + @@ -11041,7 +11041,7 @@ - + @@ -11050,7 +11050,7 @@ - + @@ -11059,7 +11059,7 @@ - + @@ -11503,7 +11503,7 @@ - + @@ -11512,7 +11512,7 @@ - + @@ -11521,7 +11521,7 @@ - + @@ -11530,7 +11530,7 @@ - + @@ -11539,7 +11539,7 @@ - + @@ -11548,7 +11548,7 @@ - + @@ -11557,7 +11557,7 @@ - + @@ -11566,7 +11566,7 @@ - + @@ -11575,7 +11575,7 @@ - + @@ -11584,7 +11584,7 @@ - + @@ -11593,7 +11593,7 @@ - + @@ -11602,7 +11602,7 @@ - + @@ -11611,7 +11611,7 @@ - + @@ -11620,7 +11620,7 @@ - + @@ -11629,7 +11629,7 @@ - + @@ -11647,7 +11647,7 @@ - + @@ -11656,7 +11656,7 @@ - + @@ -11665,7 +11665,7 @@ - + @@ -11674,7 +11674,7 @@ - + @@ -11758,7 +11758,7 @@ - + @@ -12211,7 +12211,7 @@ - + @@ -12259,7 +12259,7 @@ - + @@ -12286,7 +12286,7 @@ - + @@ -12295,7 +12295,7 @@ - + @@ -12304,7 +12304,7 @@ - + @@ -12394,7 +12394,7 @@ - + @@ -12403,7 +12403,7 @@ - + @@ -12412,7 +12412,7 @@ - + @@ -12457,7 +12457,7 @@ - + @@ -12601,7 +12601,7 @@ - + @@ -12700,7 +12700,7 @@ - + @@ -12709,7 +12709,7 @@ - + @@ -12868,7 +12868,7 @@ - + @@ -12925,7 +12925,7 @@ - + @@ -12934,7 +12934,7 @@ - + @@ -12943,7 +12943,7 @@ - + @@ -13270,7 +13270,7 @@ - + @@ -13333,7 +13333,7 @@ - + @@ -13342,7 +13342,7 @@ - + @@ -13405,7 +13405,7 @@ - + @@ -13414,7 +13414,7 @@ - + @@ -13450,7 +13450,7 @@ - + @@ -13486,7 +13486,7 @@ - + @@ -13495,7 +13495,7 @@ - + @@ -13504,7 +13504,7 @@ - + @@ -13513,7 +13513,7 @@ - + @@ -13522,7 +13522,7 @@ - + @@ -13549,7 +13549,7 @@ - + @@ -13558,7 +13558,7 @@ - + @@ -13606,7 +13606,7 @@ - + @@ -13633,7 +13633,7 @@ - + @@ -13663,7 +13663,7 @@ - + @@ -13717,7 +13717,7 @@ - + @@ -13795,7 +13795,7 @@ - + @@ -13804,7 +13804,7 @@ - + @@ -13813,7 +13813,7 @@ - + @@ -13825,7 +13825,7 @@ - + @@ -13882,7 +13882,7 @@ - + @@ -14059,7 +14059,7 @@ - + @@ -14197,7 +14197,7 @@ - + @@ -14215,7 +14215,7 @@ - + @@ -14254,7 +14254,7 @@ - + @@ -14371,7 +14371,7 @@ - + @@ -14380,7 +14380,7 @@ - + @@ -14398,7 +14398,7 @@ - + @@ -14416,7 +14416,7 @@ - + @@ -14425,7 +14425,7 @@ - + @@ -14629,7 +14629,7 @@ - + @@ -14638,7 +14638,7 @@ - + @@ -14647,7 +14647,7 @@ - + @@ -14656,7 +14656,7 @@ - + @@ -14665,7 +14665,7 @@ - + @@ -14845,7 +14845,7 @@ - + @@ -14935,7 +14935,7 @@ - + @@ -14944,7 +14944,7 @@ - + @@ -14962,7 +14962,7 @@ - + @@ -14971,7 +14971,7 @@ - + @@ -14980,7 +14980,7 @@ - + @@ -14989,7 +14989,7 @@ type.]]> - global.]]> + global.]]> @@ -14998,7 +14998,7 @@ type. Did you mean to write 'Promise<{0}>'?]]> - . Vouliez-vous vraiment écrire 'Promise<{0}>' ?]]> + . Vouliez-vous vraiment écrire 'Promise<{0}>' ?]]> @@ -15025,7 +15025,7 @@ - + @@ -15043,7 +15043,7 @@ - + @@ -15118,7 +15118,7 @@ - + @@ -15172,7 +15172,7 @@ - + @@ -15253,7 +15253,7 @@ - + @@ -15370,7 +15370,7 @@ - + @@ -15388,7 +15388,7 @@ - + @@ -15406,7 +15406,7 @@ - + @@ -15415,7 +15415,7 @@ - + @@ -15478,7 +15478,7 @@ - + @@ -15523,7 +15523,7 @@ - + @@ -15604,7 +15604,7 @@ - + @@ -15613,7 +15613,7 @@ - + @@ -15622,7 +15622,7 @@ - + @@ -15685,7 +15685,7 @@ - + @@ -15694,7 +15694,7 @@ - + @@ -15721,7 +15721,7 @@ - + @@ -15739,7 +15739,7 @@ - + @@ -15748,7 +15748,7 @@ - + @@ -15757,7 +15757,7 @@ - + @@ -15766,7 +15766,7 @@ - + @@ -15775,7 +15775,7 @@ - + @@ -15784,7 +15784,7 @@ - + @@ -15802,7 +15802,7 @@ - + @@ -15931,7 +15931,7 @@ - + @@ -16021,7 +16021,7 @@ - + @@ -16075,7 +16075,7 @@ - + @@ -16084,7 +16084,7 @@ - + @@ -16237,7 +16237,7 @@ - + @@ -16423,7 +16423,7 @@ - + @@ -16432,7 +16432,7 @@ - + @@ -16477,7 +16477,7 @@ - + @@ -16504,7 +16504,7 @@ - + @@ -16522,7 +16522,7 @@ - + @@ -16531,7 +16531,7 @@ - + @@ -16594,7 +16594,7 @@ - + @@ -16885,7 +16885,7 @@ - + @@ -17038,7 +17038,7 @@ - + @@ -17155,7 +17155,7 @@ - + @@ -17200,7 +17200,7 @@ - + @@ -17209,7 +17209,7 @@ - + @@ -17335,7 +17335,7 @@ - + @@ -17344,7 +17344,7 @@ - + @@ -17479,7 +17479,7 @@ - + @@ -17497,7 +17497,7 @@ - + @@ -17560,7 +17560,7 @@ - + @@ -17644,7 +17644,7 @@ - + @@ -17752,7 +17752,7 @@ - + @@ -17761,7 +17761,7 @@ - + @@ -17824,7 +17824,7 @@ - + @@ -17851,7 +17851,7 @@ - + @@ -17869,7 +17869,7 @@ - + @@ -17914,7 +17914,7 @@ - + @@ -17977,7 +17977,7 @@ - + @@ -18088,7 +18088,7 @@ - + @@ -18097,7 +18097,7 @@ - + @@ -18214,7 +18214,7 @@ - + @@ -18580,7 +18580,7 @@ - + @@ -18601,7 +18601,7 @@ - + @@ -18619,7 +18619,7 @@ - + @@ -18655,7 +18655,7 @@ - + @@ -18673,7 +18673,7 @@ - + @@ -18682,7 +18682,7 @@ - + @@ -18787,7 +18787,7 @@ - + @@ -18832,7 +18832,7 @@ - + @@ -18931,7 +18931,7 @@ - + @@ -18940,7 +18940,7 @@ - + @@ -19138,7 +19138,7 @@ - + @@ -19147,7 +19147,7 @@ - + @@ -19174,7 +19174,7 @@ - + @@ -19192,7 +19192,7 @@ - + @@ -19255,7 +19255,7 @@ - + @@ -19264,7 +19264,7 @@ - + @@ -19375,7 +19375,7 @@ - + @@ -19393,7 +19393,7 @@ - + @@ -19537,7 +19537,7 @@ - + @@ -19546,7 +19546,7 @@ - + diff --git a/src/loc/lcl/ita/diagnosticMessages/diagnosticMessages.generated.json.lcl b/src/loc/lcl/ita/diagnosticMessages/diagnosticMessages.generated.json.lcl index 06e92bffdac2b..592e874767928 100644 --- a/src/loc/lcl/ita/diagnosticMessages/diagnosticMessages.generated.json.lcl +++ b/src/loc/lcl/ita/diagnosticMessages/diagnosticMessages.generated.json.lcl @@ -34,7 +34,7 @@ - + @@ -70,7 +70,7 @@ - + @@ -142,7 +142,7 @@ - + @@ -178,7 +178,7 @@ - + @@ -199,7 +199,7 @@ - + @@ -208,7 +208,7 @@ - + @@ -217,7 +217,7 @@ - + @@ -226,7 +226,7 @@ - + @@ -235,7 +235,7 @@ - + @@ -244,7 +244,7 @@ - + @@ -253,7 +253,7 @@ - + @@ -262,7 +262,7 @@ - + @@ -280,7 +280,7 @@ - + @@ -337,7 +337,7 @@ - + @@ -346,7 +346,7 @@ - + @@ -373,7 +373,7 @@ - + @@ -484,7 +484,7 @@ - + @@ -511,7 +511,7 @@ - + @@ -520,7 +520,7 @@ - + @@ -655,7 +655,7 @@ - + @@ -673,7 +673,7 @@ - + @@ -709,7 +709,7 @@ - + @@ -736,7 +736,7 @@ - + @@ -745,7 +745,7 @@ - + @@ -838,7 +838,7 @@ - + @@ -847,7 +847,7 @@ - + @@ -928,7 +928,7 @@ - + @@ -946,7 +946,7 @@ - + @@ -1072,7 +1072,7 @@ - + @@ -1090,7 +1090,7 @@ - + @@ -1099,7 +1099,7 @@ - + @@ -1654,7 +1654,7 @@ - + @@ -1663,7 +1663,7 @@ - + @@ -1966,7 +1966,7 @@ - + @@ -1975,7 +1975,7 @@ - + @@ -1993,7 +1993,7 @@ - + @@ -2011,7 +2011,7 @@ - + @@ -2122,7 +2122,7 @@ - + @@ -2131,7 +2131,7 @@ - + @@ -2140,7 +2140,7 @@ - + @@ -2158,7 +2158,7 @@ - + @@ -2167,7 +2167,7 @@ - + @@ -2257,7 +2257,7 @@ - + @@ -2278,7 +2278,7 @@ - + @@ -2287,7 +2287,7 @@ - + @@ -2467,7 +2467,7 @@ - + @@ -2521,7 +2521,7 @@ - + @@ -2530,7 +2530,7 @@ - + @@ -2539,7 +2539,7 @@ - + @@ -2575,7 +2575,7 @@ - + @@ -2593,7 +2593,7 @@ - + @@ -2740,7 +2740,7 @@ - + @@ -2749,7 +2749,7 @@ - + @@ -2758,7 +2758,7 @@ - + @@ -2902,7 +2902,7 @@ - + @@ -2977,7 +2977,7 @@ - + @@ -3052,7 +3052,7 @@ - + @@ -3061,7 +3061,7 @@ - + @@ -3070,7 +3070,7 @@ - + @@ -3079,7 +3079,7 @@ - + @@ -3088,7 +3088,7 @@ - + @@ -3097,7 +3097,7 @@ - + @@ -3106,7 +3106,7 @@ - + @@ -3115,7 +3115,7 @@ - + @@ -3124,7 +3124,7 @@ - + @@ -3133,7 +3133,7 @@ - + @@ -3142,7 +3142,7 @@ - + @@ -3151,7 +3151,7 @@ - + @@ -3160,7 +3160,7 @@ - + @@ -3169,7 +3169,7 @@ - + @@ -3178,7 +3178,7 @@ - + @@ -3187,7 +3187,7 @@ - + @@ -3196,7 +3196,7 @@ - + @@ -3205,7 +3205,7 @@ - + @@ -3214,7 +3214,7 @@ - + @@ -3223,7 +3223,7 @@ - + @@ -3232,7 +3232,7 @@ - + @@ -3241,7 +3241,7 @@ - + @@ -3250,7 +3250,7 @@ - + @@ -3259,7 +3259,7 @@ - + @@ -3268,7 +3268,7 @@ - + @@ -3277,7 +3277,7 @@ - + @@ -3286,7 +3286,7 @@ - + @@ -3343,7 +3343,7 @@ - + @@ -3355,7 +3355,7 @@ - + @@ -3364,7 +3364,7 @@ - + @@ -3373,7 +3373,7 @@ - + @@ -3382,7 +3382,7 @@ - + @@ -3391,7 +3391,7 @@ - + @@ -3400,7 +3400,7 @@ - + @@ -3409,7 +3409,7 @@ - + @@ -3418,7 +3418,7 @@ - + @@ -3427,7 +3427,7 @@ - + @@ -3439,7 +3439,7 @@ - + @@ -3451,7 +3451,7 @@ - + @@ -3460,7 +3460,7 @@ - + @@ -3469,7 +3469,7 @@ - + @@ -3478,7 +3478,7 @@ - + @@ -3490,7 +3490,7 @@ - + @@ -3499,7 +3499,7 @@ - + @@ -3511,7 +3511,7 @@ - + @@ -3520,7 +3520,7 @@ - + @@ -3541,7 +3541,7 @@ - + @@ -3577,7 +3577,7 @@ - + @@ -3586,7 +3586,7 @@ - + @@ -3595,7 +3595,7 @@ - + @@ -3604,7 +3604,7 @@ - + @@ -3613,7 +3613,7 @@ - + @@ -3622,7 +3622,7 @@ - + @@ -3631,7 +3631,7 @@ - + @@ -3640,7 +3640,7 @@ - + @@ -3649,7 +3649,7 @@ - + @@ -3658,7 +3658,7 @@ - + @@ -3667,7 +3667,7 @@ - + @@ -3676,7 +3676,7 @@ - + @@ -3688,7 +3688,7 @@ - + @@ -3697,7 +3697,7 @@ - + @@ -3706,7 +3706,7 @@ - + @@ -3718,7 +3718,7 @@ - + @@ -3727,7 +3727,7 @@ - + @@ -3736,7 +3736,7 @@ - + @@ -3745,7 +3745,7 @@ - + @@ -3754,7 +3754,7 @@ - + @@ -3763,7 +3763,7 @@ - + @@ -3772,7 +3772,7 @@ - + @@ -3781,7 +3781,7 @@ - + @@ -3790,7 +3790,7 @@ - + @@ -3799,7 +3799,7 @@ - + @@ -3838,7 +3838,7 @@ - + @@ -4057,7 +4057,7 @@ - + @@ -4066,7 +4066,7 @@ - + @@ -4075,7 +4075,7 @@ - + @@ -4087,7 +4087,7 @@ - + @@ -4132,7 +4132,7 @@ - + @@ -4159,7 +4159,7 @@ - + @@ -4213,7 +4213,7 @@ - + @@ -4309,7 +4309,7 @@ - + @@ -4399,7 +4399,7 @@ - + @@ -4408,7 +4408,7 @@ - + @@ -4444,7 +4444,7 @@ - + @@ -4822,7 +4822,7 @@ - + @@ -4831,7 +4831,7 @@ - + @@ -4840,7 +4840,7 @@ - + @@ -4849,7 +4849,7 @@ - + @@ -4858,7 +4858,7 @@ - + @@ -4876,7 +4876,7 @@ - + @@ -4885,7 +4885,7 @@ - + @@ -4894,7 +4894,7 @@ - + @@ -4903,7 +4903,7 @@ - + @@ -4912,7 +4912,7 @@ - + @@ -4921,7 +4921,7 @@ - + @@ -4930,7 +4930,7 @@ - + @@ -4939,7 +4939,7 @@ - + @@ -4948,7 +4948,7 @@ - + @@ -4957,7 +4957,7 @@ - + @@ -5005,7 +5005,7 @@ - + @@ -5041,7 +5041,7 @@ - + @@ -5050,7 +5050,7 @@ - + @@ -5077,7 +5077,7 @@ - + @@ -5227,7 +5227,7 @@ - + @@ -5236,7 +5236,7 @@ - + @@ -5254,7 +5254,7 @@ - + @@ -5272,7 +5272,7 @@ - + @@ -5281,7 +5281,7 @@ - + @@ -5401,7 +5401,7 @@ - + @@ -5467,7 +5467,7 @@ - + @@ -5503,7 +5503,7 @@ - + @@ -5662,7 +5662,7 @@ - + @@ -5758,7 +5758,7 @@ - + @@ -5920,7 +5920,7 @@ - + @@ -5929,7 +5929,7 @@ - + @@ -5938,7 +5938,7 @@ - + @@ -5956,7 +5956,7 @@ - + @@ -6109,7 +6109,7 @@ - + @@ -6118,7 +6118,7 @@ - + @@ -6136,7 +6136,7 @@ - + @@ -6181,7 +6181,7 @@ - + @@ -6535,7 +6535,7 @@ - + @@ -6607,7 +6607,7 @@ - + @@ -6661,7 +6661,7 @@ - + @@ -6790,7 +6790,7 @@ - + @@ -6799,7 +6799,7 @@ - + @@ -6817,7 +6817,7 @@ - + @@ -6889,7 +6889,7 @@ - + @@ -6916,7 +6916,7 @@ - + @@ -6964,7 +6964,7 @@ - + @@ -6973,7 +6973,7 @@ - + @@ -6982,7 +6982,7 @@ - + @@ -6991,7 +6991,7 @@ - + @@ -7000,7 +7000,7 @@ - + @@ -7090,7 +7090,7 @@ - + @@ -7108,7 +7108,7 @@ - + @@ -7252,7 +7252,7 @@ - + @@ -7261,7 +7261,7 @@ - + @@ -7558,7 +7558,7 @@ - + @@ -7570,7 +7570,7 @@ - + @@ -7579,7 +7579,7 @@ - + @@ -7807,7 +7807,7 @@ - + @@ -7915,7 +7915,7 @@ - + @@ -7924,7 +7924,7 @@ - + @@ -8227,7 +8227,7 @@ - + @@ -8260,7 +8260,7 @@ - + @@ -8332,7 +8332,7 @@ - + @@ -8350,7 +8350,7 @@ - + @@ -8386,7 +8386,7 @@ - + @@ -8395,7 +8395,7 @@ - + @@ -8443,7 +8443,7 @@ - + @@ -8455,7 +8455,7 @@ - + @@ -8608,7 +8608,7 @@ - + @@ -8782,7 +8782,7 @@ - + @@ -8836,7 +8836,7 @@ - + @@ -8845,7 +8845,7 @@ - + @@ -8893,7 +8893,7 @@ - + @@ -8902,7 +8902,7 @@ - + @@ -8974,7 +8974,7 @@ - + @@ -8983,7 +8983,7 @@ - + @@ -9001,7 +9001,7 @@ - + @@ -9073,7 +9073,7 @@ - + @@ -9082,7 +9082,7 @@ - + @@ -9196,7 +9196,7 @@ - + @@ -9262,7 +9262,7 @@ - + @@ -9538,7 +9538,7 @@ - + @@ -9583,7 +9583,7 @@ - + @@ -9592,7 +9592,7 @@ - + @@ -9619,7 +9619,7 @@ - + @@ -9637,7 +9637,7 @@ - + @@ -9730,7 +9730,7 @@ - + @@ -9796,7 +9796,7 @@ - + @@ -9805,7 +9805,7 @@ - + @@ -9814,7 +9814,7 @@ - + @@ -9823,7 +9823,7 @@ - + @@ -9907,7 +9907,7 @@ - + @@ -9925,7 +9925,7 @@ - + @@ -9943,7 +9943,7 @@ - + @@ -9988,7 +9988,7 @@ - + @@ -10015,7 +10015,7 @@ - + @@ -10033,7 +10033,7 @@ - + @@ -10042,7 +10042,7 @@ - + @@ -10105,7 +10105,7 @@ - + @@ -10351,7 +10351,7 @@ - + @@ -10360,7 +10360,7 @@ - + @@ -10432,7 +10432,7 @@ - + @@ -10459,7 +10459,7 @@ - + @@ -10468,7 +10468,7 @@ - + @@ -10477,7 +10477,7 @@ - + @@ -10495,7 +10495,7 @@ - + @@ -10522,7 +10522,7 @@ - + @@ -10531,7 +10531,7 @@ - + @@ -10540,7 +10540,7 @@ - + @@ -10576,7 +10576,7 @@ - + @@ -10585,7 +10585,7 @@ - + @@ -10594,7 +10594,7 @@ - + @@ -10603,7 +10603,7 @@ - + @@ -10648,7 +10648,7 @@ - + @@ -10657,7 +10657,7 @@ - + @@ -10696,7 +10696,7 @@ - + @@ -10705,7 +10705,7 @@ - + @@ -10714,7 +10714,7 @@ - + @@ -10723,7 +10723,7 @@ - + @@ -10732,7 +10732,7 @@ - + @@ -10741,7 +10741,7 @@ - + @@ -10912,7 +10912,7 @@ - + @@ -10930,7 +10930,7 @@ - + @@ -10939,7 +10939,7 @@ - + @@ -10948,7 +10948,7 @@ - + @@ -10957,7 +10957,7 @@ - + @@ -10966,7 +10966,7 @@ - + @@ -10975,7 +10975,7 @@ - + @@ -10984,7 +10984,7 @@ - + @@ -10993,7 +10993,7 @@ - + @@ -11002,7 +11002,7 @@ - + @@ -11011,7 +11011,7 @@ - + @@ -11020,7 +11020,7 @@ - + @@ -11029,7 +11029,7 @@ - + @@ -11038,7 +11038,7 @@ - + @@ -11047,7 +11047,7 @@ - + @@ -11056,7 +11056,7 @@ - + @@ -11065,7 +11065,7 @@ - + @@ -11074,7 +11074,7 @@ - + @@ -11083,7 +11083,7 @@ - + @@ -11092,7 +11092,7 @@ - + @@ -11101,7 +11101,7 @@ - + @@ -11110,7 +11110,7 @@ - + @@ -11119,7 +11119,7 @@ - + @@ -11128,7 +11128,7 @@ - + @@ -11155,7 +11155,7 @@ - + @@ -11182,7 +11182,7 @@ - + @@ -11191,7 +11191,7 @@ - + @@ -11200,7 +11200,7 @@ - + @@ -11209,7 +11209,7 @@ - + @@ -11251,7 +11251,7 @@ - + @@ -11290,7 +11290,7 @@ - + @@ -11389,7 +11389,7 @@ - + @@ -11461,7 +11461,7 @@ - + @@ -11473,7 +11473,7 @@ - + @@ -11482,7 +11482,7 @@ - + @@ -11491,7 +11491,7 @@ - + @@ -11773,7 +11773,7 @@ - + @@ -11782,7 +11782,7 @@ - + @@ -11812,7 +11812,7 @@ - + @@ -11830,7 +11830,7 @@ - + @@ -11857,7 +11857,7 @@ - + @@ -11875,7 +11875,7 @@ - + @@ -11893,7 +11893,7 @@ - + @@ -11902,7 +11902,7 @@ - + @@ -11974,7 +11974,7 @@ - + @@ -11983,7 +11983,7 @@ - + @@ -12073,7 +12073,7 @@ - + @@ -12082,7 +12082,7 @@ - + @@ -12091,7 +12091,7 @@ - + @@ -12100,7 +12100,7 @@ - + @@ -12109,7 +12109,7 @@ - + @@ -12118,7 +12118,7 @@ - + @@ -12127,7 +12127,7 @@ - + @@ -12136,7 +12136,7 @@ - + @@ -12145,7 +12145,7 @@ - + @@ -12154,7 +12154,7 @@ - + @@ -12163,7 +12163,7 @@ - + @@ -12172,7 +12172,7 @@ - + @@ -12181,7 +12181,7 @@ - + @@ -12436,7 +12436,7 @@ - + @@ -12535,7 +12535,7 @@ - + @@ -12625,7 +12625,7 @@ - + @@ -12670,7 +12670,7 @@ - + @@ -12679,7 +12679,7 @@ - + @@ -12724,7 +12724,7 @@ - + @@ -12820,7 +12820,7 @@ - + @@ -12829,7 +12829,7 @@ - + @@ -12856,7 +12856,7 @@ - + @@ -12865,7 +12865,7 @@ - + @@ -12874,7 +12874,7 @@ - + @@ -12883,7 +12883,7 @@ - + @@ -12904,7 +12904,7 @@ - + @@ -12913,7 +12913,7 @@ - + @@ -12922,7 +12922,7 @@ - + @@ -12931,7 +12931,7 @@ - + @@ -12940,7 +12940,7 @@ - + @@ -12949,7 +12949,7 @@ - + @@ -12958,7 +12958,7 @@ - + @@ -12967,7 +12967,7 @@ - + @@ -12976,7 +12976,7 @@ - + @@ -12985,7 +12985,7 @@ - + @@ -12994,7 +12994,7 @@ - + @@ -13003,7 +13003,7 @@ - + @@ -13012,7 +13012,7 @@ - + @@ -13021,7 +13021,7 @@ - + @@ -13030,7 +13030,7 @@ - + @@ -13039,7 +13039,7 @@ - + @@ -13048,7 +13048,7 @@ - + @@ -13057,7 +13057,7 @@ - + @@ -13066,7 +13066,7 @@ - + @@ -13222,7 +13222,7 @@ - + @@ -13303,7 +13303,7 @@ - + @@ -13438,7 +13438,7 @@ - + @@ -13447,7 +13447,7 @@ - + @@ -13456,7 +13456,7 @@ - + @@ -13849,7 +13849,7 @@ - + @@ -13966,7 +13966,7 @@ - + @@ -13993,7 +13993,7 @@ - + @@ -14296,7 +14296,7 @@ - + @@ -14341,7 +14341,7 @@ - + @@ -14350,7 +14350,7 @@ - + @@ -14359,7 +14359,7 @@ - + @@ -14485,7 +14485,7 @@ - + @@ -14572,7 +14572,7 @@ - + @@ -14590,7 +14590,7 @@ - + @@ -14707,7 +14707,7 @@ - + @@ -14743,7 +14743,7 @@ - + @@ -14932,7 +14932,7 @@ - + @@ -15133,7 +15133,7 @@ - + @@ -15142,7 +15142,7 @@ - + @@ -15160,7 +15160,7 @@ - + @@ -15205,7 +15205,7 @@ - + @@ -15241,7 +15241,7 @@ - + @@ -15250,7 +15250,7 @@ - + @@ -15286,7 +15286,7 @@ - + @@ -15430,7 +15430,7 @@ - + @@ -15484,7 +15484,7 @@ - + @@ -15538,7 +15538,7 @@ - + @@ -15556,7 +15556,7 @@ - + @@ -15574,7 +15574,7 @@ - + @@ -15610,7 +15610,7 @@ - + @@ -15646,7 +15646,7 @@ - + @@ -15682,7 +15682,7 @@ - + @@ -15700,7 +15700,7 @@ - + @@ -15763,7 +15763,7 @@ - + @@ -15880,7 +15880,7 @@ - + @@ -15946,7 +15946,7 @@ - + @@ -15955,7 +15955,7 @@ - + @@ -16018,7 +16018,7 @@ - + @@ -16063,7 +16063,7 @@ - + @@ -16126,7 +16126,7 @@ - + @@ -16255,7 +16255,7 @@ - + @@ -16264,7 +16264,7 @@ - + @@ -16348,7 +16348,7 @@ - + @@ -16357,7 +16357,7 @@ - + @@ -16366,7 +16366,7 @@ - + @@ -16519,7 +16519,7 @@ - + @@ -16546,7 +16546,7 @@ - + @@ -16555,7 +16555,7 @@ - + @@ -16564,7 +16564,7 @@ - + @@ -16573,7 +16573,7 @@ - + @@ -16582,7 +16582,7 @@ - + @@ -16591,7 +16591,7 @@ - + @@ -16600,7 +16600,7 @@ - + @@ -16609,7 +16609,7 @@ - + @@ -16618,7 +16618,7 @@ - + @@ -16627,7 +16627,7 @@ - + @@ -16672,7 +16672,7 @@ - + @@ -16792,7 +16792,7 @@ - + @@ -16801,7 +16801,7 @@ - + @@ -16810,7 +16810,7 @@ - + @@ -16819,7 +16819,7 @@ - + @@ -16828,7 +16828,7 @@ - + @@ -16936,7 +16936,7 @@ - + @@ -16954,7 +16954,7 @@ - + @@ -16963,7 +16963,7 @@ - + @@ -17368,7 +17368,7 @@ - + @@ -17377,7 +17377,7 @@ - + @@ -17386,7 +17386,7 @@ - + @@ -17530,7 +17530,7 @@ - + @@ -17578,7 +17578,7 @@ - + @@ -17650,7 +17650,7 @@ - + @@ -17659,7 +17659,7 @@ - + @@ -17668,7 +17668,7 @@ - + @@ -17677,7 +17677,7 @@ - + @@ -17686,7 +17686,7 @@ - + @@ -17713,7 +17713,7 @@ - + @@ -17803,7 +17803,7 @@ - + @@ -17812,7 +17812,7 @@ - + @@ -17821,7 +17821,7 @@ - + @@ -17839,7 +17839,7 @@ - + @@ -17911,7 +17911,7 @@ - + @@ -17956,7 +17956,7 @@ - + @@ -17992,7 +17992,7 @@ - + @@ -18085,7 +18085,7 @@ - + @@ -18094,7 +18094,7 @@ - + @@ -18283,7 +18283,7 @@ - + @@ -18292,7 +18292,7 @@ - + @@ -18301,7 +18301,7 @@ - + @@ -18310,7 +18310,7 @@ - + @@ -18559,7 +18559,7 @@ - + @@ -18580,7 +18580,7 @@ - + @@ -18607,7 +18607,7 @@ - + @@ -18652,7 +18652,7 @@ - + @@ -18661,7 +18661,7 @@ - + @@ -18748,7 +18748,7 @@ - + @@ -18775,7 +18775,7 @@ - + @@ -18802,7 +18802,7 @@ - + @@ -18829,7 +18829,7 @@ - + @@ -18838,7 +18838,7 @@ - + @@ -18847,7 +18847,7 @@ - + @@ -18910,7 +18910,7 @@ - + @@ -18973,7 +18973,7 @@ - + @@ -18982,7 +18982,7 @@ - + @@ -19081,7 +19081,7 @@ - + @@ -19117,7 +19117,7 @@ - + @@ -19162,7 +19162,7 @@ - + @@ -19252,7 +19252,7 @@ - + @@ -19264,7 +19264,7 @@ - + @@ -19273,7 +19273,7 @@ - + @@ -19282,7 +19282,7 @@ - + @@ -19291,7 +19291,7 @@ - + @@ -19354,7 +19354,7 @@ - + @@ -19363,7 +19363,7 @@ - + @@ -19372,7 +19372,7 @@ - + @@ -19381,7 +19381,7 @@ - + @@ -19462,7 +19462,7 @@ - + @@ -19471,7 +19471,7 @@ - + @@ -19525,7 +19525,7 @@ - + diff --git a/src/loc/lcl/plk/diagnosticMessages/diagnosticMessages.generated.json.lcl b/src/loc/lcl/plk/diagnosticMessages/diagnosticMessages.generated.json.lcl index 1e2e76b7c3419..263228f6ca2fd 100644 --- a/src/loc/lcl/plk/diagnosticMessages/diagnosticMessages.generated.json.lcl +++ b/src/loc/lcl/plk/diagnosticMessages/diagnosticMessages.generated.json.lcl @@ -36,7 +36,7 @@ - + @@ -90,7 +90,7 @@ - + @@ -525,7 +525,7 @@ - + @@ -711,7 +711,7 @@ - + @@ -774,7 +774,7 @@ - + @@ -783,7 +783,7 @@ - + @@ -792,7 +792,7 @@ - + @@ -801,7 +801,7 @@ - + @@ -810,7 +810,7 @@ - + @@ -873,7 +873,7 @@ - + @@ -882,7 +882,7 @@ - + @@ -1017,7 +1017,7 @@ - + @@ -1551,7 +1551,7 @@ - + @@ -1608,7 +1608,7 @@ - + @@ -2385,7 +2385,7 @@ - + @@ -2394,7 +2394,7 @@ - + @@ -2403,7 +2403,7 @@ - + @@ -2412,7 +2412,7 @@ - + @@ -2421,7 +2421,7 @@ - + @@ -2439,7 +2439,7 @@ - + @@ -2511,7 +2511,7 @@ - + @@ -3897,7 +3897,7 @@ - + @@ -5226,7 +5226,7 @@ - + @@ -6495,7 +6495,7 @@ - + @@ -8526,7 +8526,7 @@ - + @@ -9081,7 +9081,7 @@ - + @@ -9960,7 +9960,7 @@ - + @@ -10005,7 +10005,7 @@ - + @@ -10197,7 +10197,7 @@ - + @@ -10512,7 +10512,7 @@ - + @@ -10557,7 +10557,7 @@ - + @@ -10620,7 +10620,7 @@ - + @@ -10713,7 +10713,7 @@ - + @@ -10722,7 +10722,7 @@ - + @@ -10731,7 +10731,7 @@ - + @@ -10884,7 +10884,7 @@ - + @@ -10893,7 +10893,7 @@ - + @@ -10911,7 +10911,7 @@ - + @@ -10920,7 +10920,7 @@ - + @@ -10929,7 +10929,7 @@ - + @@ -10938,7 +10938,7 @@ - + @@ -10947,7 +10947,7 @@ - + @@ -10956,7 +10956,7 @@ - + @@ -10965,7 +10965,7 @@ - + @@ -10974,7 +10974,7 @@ - + @@ -10983,7 +10983,7 @@ - + @@ -10992,7 +10992,7 @@ - + @@ -11001,7 +11001,7 @@ - + @@ -11010,7 +11010,7 @@ - + @@ -11019,7 +11019,7 @@ - + @@ -11028,7 +11028,7 @@ - + @@ -11037,7 +11037,7 @@ - + @@ -11046,7 +11046,7 @@ - + @@ -11055,7 +11055,7 @@ - + @@ -11064,7 +11064,7 @@ - + @@ -11073,7 +11073,7 @@ - + @@ -11082,7 +11082,7 @@ - + @@ -11091,7 +11091,7 @@ - + @@ -11100,7 +11100,7 @@ - + @@ -11109,7 +11109,7 @@ - + @@ -11118,7 +11118,7 @@ - + @@ -11127,7 +11127,7 @@ - + @@ -11136,7 +11136,7 @@ - + @@ -11154,7 +11154,7 @@ - + @@ -11172,7 +11172,7 @@ - + @@ -11724,7 +11724,7 @@ - + @@ -12186,7 +12186,7 @@ - + @@ -12684,7 +12684,7 @@ - + @@ -12816,7 +12816,7 @@ - + @@ -13827,7 +13827,7 @@ - + @@ -13836,7 +13836,7 @@ - + @@ -14982,7 +14982,7 @@ - + @@ -15228,7 +15228,7 @@ - + @@ -15309,7 +15309,7 @@ - + @@ -15318,7 +15318,7 @@ - + @@ -15651,7 +15651,7 @@ - + @@ -15768,7 +15768,7 @@ - + @@ -15933,7 +15933,7 @@ - + @@ -16524,7 +16524,7 @@ - + @@ -16533,7 +16533,7 @@ - + @@ -16542,7 +16542,7 @@ - + @@ -16551,7 +16551,7 @@ - + @@ -16560,7 +16560,7 @@ - + @@ -16569,7 +16569,7 @@ - + @@ -16578,7 +16578,7 @@ - + @@ -16587,7 +16587,7 @@ - + @@ -16596,7 +16596,7 @@ - + @@ -16605,7 +16605,7 @@ - + @@ -16614,7 +16614,7 @@ - + @@ -16623,7 +16623,7 @@ - + @@ -16668,7 +16668,7 @@ - + @@ -17826,7 +17826,7 @@ - + diff --git a/src/loc/lcl/ptb/diagnosticMessages/diagnosticMessages.generated.json.lcl b/src/loc/lcl/ptb/diagnosticMessages/diagnosticMessages.generated.json.lcl index aa3f50b65bc51..0e4b9d5ae85c1 100644 --- a/src/loc/lcl/ptb/diagnosticMessages/diagnosticMessages.generated.json.lcl +++ b/src/loc/lcl/ptb/diagnosticMessages/diagnosticMessages.generated.json.lcl @@ -27,7 +27,7 @@ - + @@ -36,7 +36,7 @@ - + @@ -63,7 +63,7 @@ - + @@ -81,7 +81,7 @@ - + @@ -90,7 +90,7 @@ - + @@ -99,7 +99,7 @@ - + @@ -117,7 +117,7 @@ - + @@ -126,7 +126,7 @@ - + @@ -135,7 +135,7 @@ - + @@ -171,7 +171,7 @@ - + @@ -192,7 +192,7 @@ - + @@ -201,7 +201,7 @@ - + @@ -210,7 +210,7 @@ - + @@ -219,7 +219,7 @@ - + @@ -228,7 +228,7 @@ - + @@ -237,7 +237,7 @@ - + @@ -246,7 +246,7 @@ - + @@ -255,7 +255,7 @@ - + @@ -264,7 +264,7 @@ - + @@ -273,7 +273,7 @@ - + @@ -282,7 +282,7 @@ - + @@ -291,7 +291,7 @@ - + @@ -303,7 +303,7 @@ - + @@ -312,7 +312,7 @@ - + @@ -330,7 +330,7 @@ - + @@ -339,7 +339,7 @@ - + @@ -366,7 +366,7 @@ - + @@ -402,7 +402,7 @@ - + @@ -477,7 +477,7 @@ - + @@ -504,7 +504,7 @@ - + @@ -513,7 +513,7 @@ - + @@ -543,7 +543,7 @@ - + @@ -552,7 +552,7 @@ - + @@ -603,7 +603,7 @@ - + @@ -639,7 +639,7 @@ - + @@ -648,7 +648,7 @@ - + @@ -657,7 +657,7 @@ - + @@ -666,7 +666,7 @@ - + @@ -684,7 +684,7 @@ - + @@ -693,7 +693,7 @@ - + @@ -738,7 +738,7 @@ - + @@ -756,7 +756,7 @@ - + @@ -765,7 +765,7 @@ - + @@ -774,7 +774,7 @@ - + @@ -792,7 +792,7 @@ - + @@ -801,7 +801,7 @@ - + @@ -819,7 +819,7 @@ - + @@ -891,7 +891,7 @@ - + @@ -900,7 +900,7 @@ - + @@ -909,7 +909,7 @@ - + @@ -936,7 +936,7 @@ - + @@ -954,7 +954,7 @@ - + @@ -963,7 +963,7 @@ - + @@ -1026,7 +1026,7 @@ - + @@ -1035,7 +1035,7 @@ - + @@ -1044,7 +1044,7 @@ - + @@ -1062,7 +1062,7 @@ - + @@ -1089,7 +1089,7 @@ - + @@ -1116,7 +1116,7 @@ - + @@ -1602,7 +1602,7 @@ - + @@ -1647,7 +1647,7 @@ - + @@ -1656,7 +1656,7 @@ - + @@ -1719,7 +1719,7 @@ - + @@ -1839,7 +1839,7 @@ - + @@ -1887,7 +1887,7 @@ - + @@ -1959,7 +1959,7 @@ - + @@ -1968,7 +1968,7 @@ - + @@ -1977,7 +1977,7 @@ - + @@ -1986,7 +1986,7 @@ - + @@ -2022,7 +2022,7 @@ - + @@ -2058,7 +2058,7 @@ - + @@ -2076,7 +2076,7 @@ - + @@ -2115,7 +2115,7 @@ - + @@ -2124,7 +2124,7 @@ - + @@ -2133,7 +2133,7 @@ - + @@ -2151,7 +2151,7 @@ - + @@ -2160,7 +2160,7 @@ - + @@ -2187,7 +2187,7 @@ - + @@ -2196,7 +2196,7 @@ - + @@ -2250,7 +2250,7 @@ - + @@ -2280,7 +2280,7 @@ - + @@ -2325,7 +2325,7 @@ - + @@ -2334,7 +2334,7 @@ - + @@ -2433,7 +2433,7 @@ - + @@ -2442,7 +2442,7 @@ - + @@ -2451,7 +2451,7 @@ - + @@ -2460,7 +2460,7 @@ - + @@ -2514,7 +2514,7 @@ - + @@ -2523,7 +2523,7 @@ - + @@ -2532,7 +2532,7 @@ - + @@ -2541,7 +2541,7 @@ - + @@ -2586,7 +2586,7 @@ - + @@ -2640,7 +2640,7 @@ - + @@ -2649,7 +2649,7 @@ - + @@ -2676,7 +2676,7 @@ - + @@ -2688,7 +2688,7 @@ - + @@ -2706,7 +2706,7 @@ - + @@ -2715,7 +2715,7 @@ - + @@ -2733,7 +2733,7 @@ - + @@ -2742,7 +2742,7 @@ - + @@ -2751,7 +2751,7 @@ - + @@ -2778,7 +2778,7 @@ - + @@ -2787,7 +2787,7 @@ - + @@ -2841,7 +2841,7 @@ - + @@ -2859,7 +2859,7 @@ - + @@ -2895,7 +2895,7 @@ - + @@ -2970,7 +2970,7 @@ - + @@ -2979,7 +2979,7 @@ - + @@ -3027,7 +3027,7 @@ - + @@ -3072,7 +3072,7 @@ - + @@ -3108,7 +3108,7 @@ - + @@ -3117,7 +3117,7 @@ - + @@ -3252,7 +3252,7 @@ - + @@ -3261,7 +3261,7 @@ - + @@ -3279,7 +3279,7 @@ - + @@ -3366,7 +3366,7 @@ - + @@ -3375,7 +3375,7 @@ - + @@ -3384,7 +3384,7 @@ - + @@ -3393,7 +3393,7 @@ - + @@ -3402,7 +3402,7 @@ - + @@ -3411,7 +3411,7 @@ - + @@ -3420,7 +3420,7 @@ - + @@ -3432,7 +3432,7 @@ - + @@ -3444,7 +3444,7 @@ - + @@ -3453,7 +3453,7 @@ - + @@ -3462,7 +3462,7 @@ - + @@ -3471,7 +3471,7 @@ - + @@ -3483,7 +3483,7 @@ - + @@ -3492,7 +3492,7 @@ - + @@ -3504,7 +3504,7 @@ - + @@ -3513,7 +3513,7 @@ - + @@ -3810,7 +3810,7 @@ - + @@ -3882,7 +3882,7 @@ - + @@ -3900,7 +3900,7 @@ - + @@ -4011,7 +4011,7 @@ - + @@ -4020,7 +4020,7 @@ - + @@ -4050,7 +4050,7 @@ - + @@ -4068,7 +4068,7 @@ - + @@ -4080,7 +4080,7 @@ - + @@ -4125,7 +4125,7 @@ - + @@ -4152,7 +4152,7 @@ - + @@ -4170,7 +4170,7 @@ - + @@ -4179,7 +4179,7 @@ - + @@ -4188,7 +4188,7 @@ - + @@ -4206,7 +4206,7 @@ - + @@ -4227,7 +4227,7 @@ - + @@ -4236,7 +4236,7 @@ - + @@ -4284,7 +4284,7 @@ - + @@ -4293,7 +4293,7 @@ - + @@ -4302,7 +4302,7 @@ - + @@ -4311,7 +4311,7 @@ - + @@ -4374,7 +4374,7 @@ - + @@ -4383,7 +4383,7 @@ - + @@ -4392,7 +4392,7 @@ - + @@ -4401,7 +4401,7 @@ - + @@ -4410,7 +4410,7 @@ - + @@ -4419,7 +4419,7 @@ - + @@ -4437,7 +4437,7 @@ - + @@ -4464,7 +4464,7 @@ - + @@ -4500,7 +4500,7 @@ - + @@ -4509,7 +4509,7 @@ - + @@ -4635,7 +4635,7 @@ - + @@ -4779,7 +4779,7 @@ - + @@ -4905,7 +4905,7 @@ - + @@ -4923,7 +4923,7 @@ - + @@ -4998,7 +4998,7 @@ - + @@ -5016,7 +5016,7 @@ - + @@ -5034,7 +5034,7 @@ - + @@ -5043,7 +5043,7 @@ - + @@ -5070,7 +5070,7 @@ - + @@ -5202,7 +5202,7 @@ - + @@ -5229,7 +5229,7 @@ - + @@ -5247,7 +5247,7 @@ - + @@ -5265,7 +5265,7 @@ - + @@ -5274,7 +5274,7 @@ - + @@ -5385,7 +5385,7 @@ - + @@ -5433,7 +5433,7 @@ {1}'?]]> - {1}'?]]> + {1}'?]]> @@ -5460,7 +5460,7 @@ - + @@ -5556,7 +5556,7 @@ - + @@ -5577,7 +5577,7 @@ - + @@ -5586,7 +5586,7 @@ - + @@ -5595,7 +5595,7 @@ - + @@ -5646,7 +5646,7 @@ - + @@ -5700,7 +5700,7 @@ - + @@ -5805,7 +5805,7 @@ - + @@ -5850,7 +5850,7 @@ - + @@ -5859,7 +5859,7 @@ - + @@ -5886,7 +5886,7 @@ - + @@ -5913,7 +5913,7 @@ - + @@ -5922,7 +5922,7 @@ - + @@ -5931,7 +5931,7 @@ - + @@ -5949,7 +5949,7 @@ - + @@ -6024,7 +6024,7 @@ - + @@ -6045,7 +6045,7 @@ - + @@ -6066,7 +6066,7 @@ - + @@ -6075,7 +6075,7 @@ - + @@ -6129,7 +6129,7 @@ - + @@ -6267,7 +6267,7 @@ - + @@ -6288,7 +6288,7 @@ - + @@ -6297,7 +6297,7 @@ - + @@ -6309,7 +6309,7 @@ - + @@ -6318,7 +6318,7 @@ - + @@ -6327,7 +6327,7 @@ - + @@ -6336,7 +6336,7 @@ - + @@ -6450,7 +6450,7 @@ - + @@ -6528,7 +6528,7 @@ - + @@ -6600,7 +6600,7 @@ - + @@ -6609,7 +6609,7 @@ - + @@ -6636,7 +6636,7 @@ - + @@ -6654,7 +6654,7 @@ - + @@ -6675,7 +6675,7 @@ - + @@ -6729,7 +6729,7 @@ - + @@ -6738,7 +6738,7 @@ - + @@ -6747,7 +6747,7 @@ - + @@ -6756,7 +6756,7 @@ - + @@ -6765,7 +6765,7 @@ - + @@ -6774,7 +6774,7 @@ - + @@ -6783,7 +6783,7 @@ - + @@ -6792,7 +6792,7 @@ - + @@ -6810,7 +6810,7 @@ - + @@ -6828,7 +6828,7 @@ - + @@ -6882,7 +6882,7 @@ - + @@ -6957,7 +6957,7 @@ - + @@ -6966,7 +6966,7 @@ - + @@ -6975,7 +6975,7 @@ - + @@ -6984,7 +6984,7 @@ - + @@ -6993,7 +6993,7 @@ - + @@ -7020,7 +7020,7 @@ - + @@ -7038,7 +7038,7 @@ - + @@ -7056,7 +7056,7 @@ - + @@ -7074,7 +7074,7 @@ - + @@ -7083,7 +7083,7 @@ - + @@ -7101,7 +7101,7 @@ - + @@ -7299,7 +7299,7 @@ - + @@ -7380,7 +7380,7 @@ - + @@ -7434,7 +7434,7 @@ - + @@ -7551,7 +7551,7 @@ - + @@ -7563,7 +7563,7 @@ - + @@ -7572,7 +7572,7 @@ - + @@ -7620,7 +7620,7 @@ - + @@ -7638,7 +7638,7 @@ - + @@ -7674,7 +7674,7 @@ - + @@ -7683,7 +7683,7 @@ - + @@ -7692,7 +7692,7 @@ - + @@ -7701,7 +7701,7 @@ - + @@ -7710,7 +7710,7 @@ - + @@ -7719,7 +7719,7 @@ - + @@ -7728,7 +7728,7 @@ - + @@ -7800,7 +7800,7 @@ - + @@ -7845,7 +7845,7 @@ - + @@ -7854,7 +7854,7 @@ - + @@ -7890,7 +7890,7 @@ - + @@ -7998,7 +7998,7 @@ - + @@ -8034,7 +8034,7 @@ - + @@ -8121,7 +8121,7 @@ - + @@ -8148,7 +8148,7 @@ - + @@ -8157,7 +8157,7 @@ - + @@ -8187,7 +8187,7 @@ - + @@ -8196,7 +8196,7 @@ - + @@ -8262,7 +8262,7 @@ - + @@ -8280,7 +8280,7 @@ - + @@ -8289,7 +8289,7 @@ - + @@ -8307,7 +8307,7 @@ - + @@ -8334,7 +8334,7 @@ - + @@ -8361,7 +8361,7 @@ - + @@ -8388,7 +8388,7 @@ - + @@ -8397,7 +8397,7 @@ - + @@ -8436,7 +8436,7 @@ - + @@ -8445,7 +8445,7 @@ - + @@ -8457,7 +8457,7 @@ - + @@ -8547,7 +8547,7 @@ - + @@ -8610,7 +8610,7 @@ - + @@ -8646,7 +8646,7 @@ - + @@ -8715,7 +8715,7 @@ - + @@ -8748,7 +8748,7 @@ - + @@ -8784,7 +8784,7 @@ - + @@ -8838,7 +8838,7 @@ - + @@ -8847,7 +8847,7 @@ - + @@ -8868,7 +8868,7 @@ - + @@ -8877,7 +8877,7 @@ - + @@ -8895,7 +8895,7 @@ - + @@ -8904,7 +8904,7 @@ - + @@ -8940,7 +8940,7 @@ - + @@ -8976,7 +8976,7 @@ - + @@ -8985,7 +8985,7 @@ - + @@ -9003,7 +9003,7 @@ - + @@ -9075,7 +9075,7 @@ - + @@ -9084,7 +9084,7 @@ - + @@ -9093,7 +9093,7 @@ - + @@ -9102,7 +9102,7 @@ - + @@ -9111,7 +9111,7 @@ - + @@ -9120,7 +9120,7 @@ - + @@ -9129,7 +9129,7 @@ - + @@ -9138,7 +9138,7 @@ - + @@ -9198,7 +9198,7 @@ - + @@ -9237,7 +9237,7 @@ - + @@ -9246,7 +9246,7 @@ - + @@ -9264,7 +9264,7 @@ - + @@ -9282,7 +9282,7 @@ - + @@ -9354,7 +9354,7 @@ - + @@ -9465,7 +9465,7 @@ - + @@ -9474,7 +9474,7 @@ - + @@ -9540,7 +9540,7 @@ - + @@ -9567,7 +9567,7 @@ - + @@ -9585,7 +9585,7 @@ - + @@ -9594,7 +9594,7 @@ - + @@ -9630,7 +9630,7 @@ - + @@ -9639,7 +9639,7 @@ - + @@ -9732,7 +9732,7 @@ - + @@ -9744,7 +9744,7 @@ - + @@ -9789,7 +9789,7 @@ - + @@ -9798,7 +9798,7 @@ - + @@ -9807,7 +9807,7 @@ - + @@ -9816,7 +9816,7 @@ - + @@ -9825,7 +9825,7 @@ - + @@ -9909,7 +9909,7 @@ - + @@ -9927,7 +9927,7 @@ - + @@ -9945,7 +9945,7 @@ - + @@ -9972,7 +9972,7 @@ - + @@ -9990,7 +9990,7 @@ - + @@ -9999,7 +9999,7 @@ - + @@ -10008,7 +10008,7 @@ - + @@ -10017,7 +10017,7 @@ - + @@ -10026,7 +10026,7 @@ - + @@ -10035,7 +10035,7 @@ - + @@ -10080,7 +10080,7 @@ - + @@ -10089,7 +10089,7 @@ - + @@ -10182,7 +10182,7 @@ - + @@ -10218,7 +10218,7 @@ - + @@ -10326,7 +10326,7 @@ - + @@ -10335,7 +10335,7 @@ - + @@ -10353,7 +10353,7 @@ - + @@ -10380,7 +10380,7 @@ - + @@ -10407,7 +10407,7 @@ - + @@ -10416,7 +10416,7 @@ - + @@ -10434,7 +10434,7 @@ - + @@ -10470,7 +10470,7 @@ - + @@ -10479,7 +10479,7 @@ - + @@ -10488,7 +10488,7 @@ - + @@ -10515,7 +10515,7 @@ - + @@ -10524,7 +10524,7 @@ - + @@ -10533,7 +10533,7 @@ - + @@ -10542,7 +10542,7 @@ - + @@ -10551,7 +10551,7 @@ - + @@ -10560,7 +10560,7 @@ - + @@ -10569,7 +10569,7 @@ - + @@ -10578,7 +10578,7 @@ - + @@ -10587,7 +10587,7 @@ - + @@ -10596,7 +10596,7 @@ - + @@ -10605,7 +10605,7 @@ - + @@ -10623,7 +10623,7 @@ - + @@ -10632,7 +10632,7 @@ - + @@ -10641,7 +10641,7 @@ - + @@ -10650,7 +10650,7 @@ - + @@ -10659,7 +10659,7 @@ - + @@ -10671,7 +10671,7 @@ - + @@ -10680,7 +10680,7 @@ - + @@ -10689,7 +10689,7 @@ - + @@ -10698,7 +10698,7 @@ - + @@ -10707,7 +10707,7 @@ - + @@ -10716,7 +10716,7 @@ - + @@ -10725,7 +10725,7 @@ - + @@ -10734,7 +10734,7 @@ - + @@ -10743,7 +10743,7 @@ - + @@ -10833,7 +10833,7 @@ - + @@ -10842,7 +10842,7 @@ - + @@ -10851,7 +10851,7 @@ - + @@ -10860,7 +10860,7 @@ - + @@ -10869,7 +10869,7 @@ - + @@ -10878,7 +10878,7 @@ - + @@ -10914,7 +10914,7 @@ - + @@ -10932,7 +10932,7 @@ - + @@ -10941,7 +10941,7 @@ - + @@ -10950,7 +10950,7 @@ - + @@ -10959,7 +10959,7 @@ - + @@ -10968,7 +10968,7 @@ - + @@ -10977,7 +10977,7 @@ - + @@ -10986,7 +10986,7 @@ - + @@ -10995,7 +10995,7 @@ - + @@ -11004,7 +11004,7 @@ - + @@ -11013,7 +11013,7 @@ - + @@ -11022,7 +11022,7 @@ - + @@ -11031,7 +11031,7 @@ - + @@ -11040,7 +11040,7 @@ - + @@ -11049,7 +11049,7 @@ - + @@ -11058,7 +11058,7 @@ - + @@ -11067,7 +11067,7 @@ - + @@ -11076,7 +11076,7 @@ - + @@ -11085,7 +11085,7 @@ - + @@ -11094,7 +11094,7 @@ - + @@ -11103,7 +11103,7 @@ - + @@ -11112,7 +11112,7 @@ - + @@ -11121,7 +11121,7 @@ - + @@ -11130,7 +11130,7 @@ - + @@ -11157,7 +11157,7 @@ - + @@ -11166,7 +11166,7 @@ - + @@ -11184,7 +11184,7 @@ - + @@ -11193,7 +11193,7 @@ - + @@ -11202,7 +11202,7 @@ - + @@ -11211,7 +11211,7 @@ - + @@ -11238,7 +11238,7 @@ - + @@ -11334,7 +11334,7 @@ - + @@ -11343,7 +11343,7 @@ - + @@ -11352,7 +11352,7 @@ - + @@ -11361,7 +11361,7 @@ - + @@ -11388,7 +11388,7 @@ - + @@ -11415,7 +11415,7 @@ - + @@ -11442,7 +11442,7 @@ - + @@ -11472,7 +11472,7 @@ - + @@ -11481,7 +11481,7 @@ - + @@ -11490,7 +11490,7 @@ - + @@ -11526,7 +11526,7 @@ - + @@ -11580,7 +11580,7 @@ - + @@ -11589,7 +11589,7 @@ - + @@ -11679,7 +11679,7 @@ - + @@ -11745,7 +11745,7 @@ - + @@ -11772,7 +11772,7 @@ - + @@ -11781,7 +11781,7 @@ - + @@ -11790,7 +11790,7 @@ - + @@ -11799,7 +11799,7 @@ - + @@ -11811,7 +11811,7 @@ - + @@ -11892,7 +11892,7 @@ - + @@ -11928,7 +11928,7 @@ - + @@ -11955,7 +11955,7 @@ - + @@ -11964,7 +11964,7 @@ - + @@ -11973,7 +11973,7 @@ - + @@ -11982,7 +11982,7 @@ - + @@ -11991,7 +11991,7 @@ - + @@ -12054,7 +12054,7 @@ - + @@ -12072,7 +12072,7 @@ - + @@ -12081,7 +12081,7 @@ - + @@ -12090,7 +12090,7 @@ - + @@ -12099,7 +12099,7 @@ - + @@ -12108,7 +12108,7 @@ - + @@ -12117,7 +12117,7 @@ - + @@ -12126,7 +12126,7 @@ - + @@ -12135,7 +12135,7 @@ - + @@ -12144,7 +12144,7 @@ - + @@ -12153,7 +12153,7 @@ - + @@ -12162,7 +12162,7 @@ - + @@ -12171,7 +12171,7 @@ - + @@ -12180,7 +12180,7 @@ - + @@ -12189,7 +12189,7 @@ - + @@ -12201,7 +12201,7 @@ - + @@ -12210,7 +12210,7 @@ - + @@ -12219,7 +12219,7 @@ - + @@ -12237,7 +12237,7 @@ - + @@ -12435,7 +12435,7 @@ - + @@ -12534,7 +12534,7 @@ - + @@ -12579,7 +12579,7 @@ - + @@ -12588,7 +12588,7 @@ - + @@ -12597,7 +12597,7 @@ - + @@ -12606,7 +12606,7 @@ - + @@ -12615,7 +12615,7 @@ - + @@ -12669,7 +12669,7 @@ - + @@ -12678,7 +12678,7 @@ - + @@ -12687,7 +12687,7 @@ - + @@ -12723,7 +12723,7 @@ - + @@ -12819,7 +12819,7 @@ - + @@ -12828,7 +12828,7 @@ - + @@ -12846,7 +12846,7 @@ - + @@ -12855,7 +12855,7 @@ - + @@ -12864,7 +12864,7 @@ - + @@ -12873,7 +12873,7 @@ - + @@ -12882,7 +12882,7 @@ - + @@ -12891,7 +12891,7 @@ - + @@ -12903,7 +12903,7 @@ - + @@ -12912,7 +12912,7 @@ - + @@ -12921,7 +12921,7 @@ - + @@ -12930,7 +12930,7 @@ - + @@ -12939,7 +12939,7 @@ - + @@ -12948,7 +12948,7 @@ - + @@ -12957,7 +12957,7 @@ - + @@ -12966,7 +12966,7 @@ - + @@ -12975,7 +12975,7 @@ - + @@ -12984,7 +12984,7 @@ - + @@ -12993,7 +12993,7 @@ - + @@ -13002,7 +13002,7 @@ - + @@ -13011,7 +13011,7 @@ - + @@ -13020,7 +13020,7 @@ - + @@ -13029,7 +13029,7 @@ - + @@ -13038,7 +13038,7 @@ - + @@ -13047,7 +13047,7 @@ - + @@ -13056,7 +13056,7 @@ - + @@ -13065,7 +13065,7 @@ - + @@ -13221,7 +13221,7 @@ - + @@ -13347,7 +13347,7 @@ - + @@ -13410,7 +13410,7 @@ - + @@ -13419,7 +13419,7 @@ - + @@ -13428,7 +13428,7 @@ - + @@ -13464,7 +13464,7 @@ - + @@ -13782,7 +13782,7 @@ - + @@ -13803,7 +13803,7 @@ - + @@ -13812,7 +13812,7 @@ - + @@ -13821,7 +13821,7 @@ - + @@ -13860,7 +13860,7 @@ - + @@ -13929,7 +13929,7 @@ - + @@ -13992,7 +13992,7 @@ - + @@ -14037,7 +14037,7 @@ - + @@ -14055,7 +14055,7 @@ - + @@ -14064,7 +14064,7 @@ - + @@ -14091,7 +14091,7 @@ - + @@ -14112,7 +14112,7 @@ - + @@ -14121,7 +14121,7 @@ - + @@ -14139,7 +14139,7 @@ - + @@ -14148,7 +14148,7 @@ - + @@ -14157,7 +14157,7 @@ - + @@ -14193,7 +14193,7 @@ - + @@ -14202,7 +14202,7 @@ - + @@ -14241,7 +14241,7 @@ - + @@ -14277,7 +14277,7 @@ - + @@ -14286,7 +14286,7 @@ - + @@ -14295,7 +14295,7 @@ - + @@ -14313,7 +14313,7 @@ - + @@ -14322,7 +14322,7 @@ - + @@ -14331,7 +14331,7 @@ - + @@ -14340,7 +14340,7 @@ - + @@ -14349,7 +14349,7 @@ - + @@ -14358,7 +14358,7 @@ - + @@ -14367,7 +14367,7 @@ - + @@ -14385,7 +14385,7 @@ - + @@ -14412,7 +14412,7 @@ - + @@ -14421,7 +14421,7 @@ - + @@ -14430,7 +14430,7 @@ - + @@ -14484,7 +14484,7 @@ - + @@ -14520,7 +14520,7 @@ - + @@ -14571,7 +14571,7 @@ - + @@ -14580,7 +14580,7 @@ - + @@ -14598,7 +14598,7 @@ - + @@ -14607,7 +14607,7 @@ - + @@ -14616,7 +14616,7 @@ - + @@ -14643,7 +14643,7 @@ - + @@ -14652,7 +14652,7 @@ - + @@ -14661,7 +14661,7 @@ - + @@ -14679,7 +14679,7 @@ - + @@ -14688,7 +14688,7 @@ - + @@ -14697,7 +14697,7 @@ - + @@ -14715,7 +14715,7 @@ - + @@ -14724,7 +14724,7 @@ - + @@ -14733,7 +14733,7 @@ - + @@ -14751,7 +14751,7 @@ - + @@ -14760,7 +14760,7 @@ - + @@ -14769,7 +14769,7 @@ - + @@ -14778,7 +14778,7 @@ - + @@ -14787,7 +14787,7 @@ - + @@ -14796,7 +14796,7 @@ - + @@ -14805,7 +14805,7 @@ - + @@ -14814,7 +14814,7 @@ - + @@ -14832,7 +14832,7 @@ - + @@ -14844,7 +14844,7 @@ - + @@ -14853,7 +14853,7 @@ - + @@ -14865,7 +14865,7 @@ - + @@ -14877,7 +14877,7 @@ - + @@ -14886,7 +14886,7 @@ - + @@ -14895,7 +14895,7 @@ - + @@ -14931,7 +14931,7 @@ - + @@ -14940,7 +14940,7 @@ - + @@ -14949,7 +14949,7 @@ - + @@ -14958,7 +14958,7 @@ - + @@ -14967,7 +14967,7 @@ type.]]> - Promessa global.]]> + Promessa global.]]> @@ -14976,7 +14976,7 @@ type. Did you mean to write 'Promise<{0}>'?]]> - global. Você quis escrever 'Promise<{0}>'?]]> + global. Você quis escrever 'Promise<{0}>'?]]> @@ -14985,7 +14985,7 @@ - + @@ -14994,7 +14994,7 @@ - + @@ -15003,7 +15003,7 @@ - + @@ -15012,7 +15012,7 @@ - + @@ -15021,7 +15021,7 @@ - + @@ -15030,7 +15030,7 @@ - + @@ -15039,7 +15039,7 @@ - + @@ -15087,7 +15087,7 @@ - + @@ -15096,7 +15096,7 @@ - + @@ -15123,7 +15123,7 @@ - + @@ -15132,7 +15132,7 @@ - + @@ -15141,7 +15141,7 @@ - + @@ -15159,7 +15159,7 @@ - + @@ -15168,7 +15168,7 @@ - + @@ -15204,7 +15204,7 @@ - + @@ -15240,7 +15240,7 @@ - + @@ -15249,7 +15249,7 @@ - + @@ -15339,7 +15339,7 @@ - + @@ -15348,7 +15348,7 @@ - + @@ -15393,7 +15393,7 @@ - + @@ -15420,7 +15420,7 @@ - + @@ -15429,7 +15429,7 @@ - + @@ -15438,7 +15438,7 @@ - + @@ -15501,7 +15501,7 @@ - + @@ -15537,7 +15537,7 @@ - + @@ -15573,7 +15573,7 @@ - + @@ -15609,7 +15609,7 @@ - + @@ -15618,7 +15618,7 @@ - + @@ -15627,7 +15627,7 @@ - + @@ -15681,7 +15681,7 @@ - + @@ -15699,7 +15699,7 @@ - + @@ -15744,7 +15744,7 @@ - + @@ -15753,7 +15753,7 @@ - + @@ -15762,7 +15762,7 @@ - + @@ -15780,7 +15780,7 @@ - + @@ -15927,7 +15927,7 @@ - + @@ -15936,7 +15936,7 @@ - + @@ -15945,7 +15945,7 @@ - + @@ -15954,7 +15954,7 @@ - + @@ -16017,7 +16017,7 @@ - + @@ -16026,7 +16026,7 @@ - + @@ -16053,7 +16053,7 @@ - + @@ -16062,7 +16062,7 @@ - + @@ -16080,7 +16080,7 @@ - + @@ -16107,7 +16107,7 @@ - + @@ -16116,7 +16116,7 @@ - + @@ -16125,7 +16125,7 @@ - + @@ -16152,7 +16152,7 @@ - + @@ -16161,7 +16161,7 @@ - + @@ -16170,7 +16170,7 @@ - + @@ -16254,7 +16254,7 @@ - + @@ -16263,7 +16263,7 @@ - + @@ -16275,7 +16275,7 @@ - + @@ -16284,7 +16284,7 @@ - + @@ -16293,7 +16293,7 @@ - + @@ -16311,7 +16311,7 @@ - + @@ -16320,7 +16320,7 @@ - + @@ -16329,7 +16329,7 @@ - + @@ -16338,7 +16338,7 @@ - + @@ -16365,7 +16365,7 @@ - + @@ -16455,7 +16455,7 @@ - + @@ -16464,7 +16464,7 @@ - + @@ -16473,7 +16473,7 @@ - + @@ -16482,7 +16482,7 @@ - + @@ -16500,7 +16500,7 @@ - + @@ -16518,7 +16518,7 @@ - + @@ -16545,7 +16545,7 @@ - + @@ -16554,7 +16554,7 @@ - + @@ -16563,7 +16563,7 @@ - + @@ -16572,7 +16572,7 @@ - + @@ -16581,7 +16581,7 @@ - + @@ -16590,7 +16590,7 @@ - + @@ -16599,7 +16599,7 @@ - + @@ -16608,7 +16608,7 @@ - + @@ -16617,7 +16617,7 @@ - + @@ -16626,7 +16626,7 @@ - + @@ -16644,7 +16644,7 @@ - + @@ -16671,7 +16671,7 @@ - + @@ -16683,7 +16683,7 @@ - + @@ -16692,7 +16692,7 @@ - + @@ -16701,7 +16701,7 @@ - + @@ -16737,7 +16737,7 @@ - + @@ -16836,7 +16836,7 @@ - + @@ -16881,7 +16881,7 @@ - + @@ -16890,7 +16890,7 @@ - + @@ -16953,7 +16953,7 @@ - + @@ -16962,7 +16962,7 @@ - + @@ -17097,7 +17097,7 @@ - + @@ -17115,7 +17115,7 @@ - + @@ -17133,7 +17133,7 @@ - + @@ -17304,7 +17304,7 @@ - + @@ -17349,7 +17349,7 @@ - + @@ -17367,7 +17367,7 @@ - + @@ -17376,7 +17376,7 @@ - + @@ -17385,7 +17385,7 @@ - + @@ -17394,7 +17394,7 @@ - + @@ -17439,7 +17439,7 @@ - + @@ -17568,7 +17568,7 @@ - + @@ -17622,7 +17622,7 @@ - + @@ -17631,7 +17631,7 @@ - + @@ -17694,7 +17694,7 @@ - + @@ -17712,7 +17712,7 @@ - + @@ -17748,7 +17748,7 @@ - + @@ -17757,7 +17757,7 @@ - + @@ -17766,7 +17766,7 @@ - + @@ -17775,7 +17775,7 @@ - + @@ -17784,7 +17784,7 @@ - + @@ -17793,7 +17793,7 @@ - + @@ -17802,7 +17802,7 @@ - + @@ -17811,7 +17811,7 @@ - + @@ -17820,7 +17820,7 @@ - + @@ -17829,7 +17829,7 @@ - + @@ -17838,7 +17838,7 @@ - + @@ -17847,7 +17847,7 @@ - + @@ -17856,7 +17856,7 @@ - + @@ -17874,7 +17874,7 @@ - + @@ -17892,7 +17892,7 @@ - + @@ -17910,7 +17910,7 @@ - + @@ -17946,7 +17946,7 @@ - + @@ -17964,7 +17964,7 @@ - + @@ -17973,7 +17973,7 @@ - + @@ -18084,7 +18084,7 @@ - + @@ -18093,7 +18093,7 @@ - + @@ -18201,7 +18201,7 @@ - + @@ -18282,7 +18282,7 @@ - + @@ -18291,7 +18291,7 @@ - + @@ -18300,7 +18300,7 @@ - + @@ -18309,7 +18309,7 @@ - + @@ -18330,7 +18330,7 @@ - + @@ -18357,7 +18357,7 @@ - + @@ -18387,7 +18387,7 @@ - + @@ -18405,7 +18405,7 @@ - + @@ -18414,7 +18414,7 @@ - + @@ -18423,7 +18423,7 @@ - + @@ -18432,7 +18432,7 @@ - + @@ -18441,7 +18441,7 @@ - + @@ -18450,7 +18450,7 @@ - + @@ -18459,7 +18459,7 @@ - + @@ -18558,7 +18558,7 @@ - + @@ -18579,7 +18579,7 @@ - + @@ -18606,7 +18606,7 @@ - + @@ -18660,7 +18660,7 @@ - + @@ -18669,7 +18669,7 @@ - + @@ -18681,7 +18681,7 @@ - + @@ -18690,7 +18690,7 @@ - + @@ -18735,7 +18735,7 @@ - + @@ -18744,7 +18744,7 @@ - + @@ -18756,7 +18756,7 @@ - + @@ -18783,7 +18783,7 @@ - + @@ -18801,7 +18801,7 @@ - + @@ -18810,7 +18810,7 @@ - + @@ -18837,7 +18837,7 @@ - + @@ -18846,7 +18846,7 @@ - + @@ -18855,7 +18855,7 @@ - + @@ -18918,7 +18918,7 @@ - + @@ -18954,7 +18954,7 @@ - + @@ -18963,7 +18963,7 @@ - + @@ -18981,7 +18981,7 @@ - + @@ -18990,7 +18990,7 @@ - + @@ -19125,7 +19125,7 @@ - + @@ -19170,7 +19170,7 @@ - + @@ -19179,7 +19179,7 @@ - + @@ -19188,7 +19188,7 @@ - + @@ -19215,7 +19215,7 @@ - + @@ -19224,7 +19224,7 @@ - + @@ -19251,7 +19251,7 @@ - + @@ -19260,7 +19260,7 @@ - + @@ -19272,7 +19272,7 @@ - + @@ -19281,7 +19281,7 @@ - + @@ -19290,7 +19290,7 @@ - + @@ -19299,7 +19299,7 @@ - + @@ -19317,7 +19317,7 @@ - + @@ -19326,7 +19326,7 @@ - + @@ -19335,7 +19335,7 @@ - + @@ -19344,7 +19344,7 @@ - + @@ -19353,7 +19353,7 @@ - + @@ -19362,7 +19362,7 @@ - + @@ -19371,7 +19371,7 @@ - + @@ -19380,7 +19380,7 @@ - + @@ -19389,7 +19389,7 @@ - + @@ -19443,7 +19443,7 @@ - + @@ -19479,7 +19479,7 @@ - + @@ -19488,7 +19488,7 @@ - + @@ -19551,7 +19551,7 @@ - + diff --git a/src/loc/lcl/trk/diagnosticMessages/diagnosticMessages.generated.json.lcl b/src/loc/lcl/trk/diagnosticMessages/diagnosticMessages.generated.json.lcl index be02d3039c136..bde5cb956012c 100644 --- a/src/loc/lcl/trk/diagnosticMessages/diagnosticMessages.generated.json.lcl +++ b/src/loc/lcl/trk/diagnosticMessages/diagnosticMessages.generated.json.lcl @@ -36,7 +36,7 @@ - + @@ -639,7 +639,7 @@ - + @@ -648,7 +648,7 @@ - + @@ -657,7 +657,7 @@ - + @@ -666,7 +666,7 @@ - + @@ -711,7 +711,7 @@ - + @@ -795,7 +795,7 @@ - + @@ -903,7 +903,7 @@ - + @@ -912,7 +912,7 @@ - + @@ -921,7 +921,7 @@ - + @@ -1611,7 +1611,7 @@ - + @@ -1647,7 +1647,7 @@ - + @@ -2433,7 +2433,7 @@ - + @@ -2442,7 +2442,7 @@ - + @@ -5052,7 +5052,7 @@ - + @@ -6564,7 +6564,7 @@ - + @@ -6582,7 +6582,7 @@ - + @@ -8043,7 +8043,7 @@ - + @@ -8502,7 +8502,7 @@ - + @@ -8511,7 +8511,7 @@ - + @@ -8520,7 +8520,7 @@ - + @@ -8673,7 +8673,7 @@ - + @@ -9075,7 +9075,7 @@ - + @@ -9084,7 +9084,7 @@ - + @@ -9825,7 +9825,7 @@ - + @@ -10200,7 +10200,7 @@ - + @@ -11139,7 +11139,7 @@ - + @@ -11148,7 +11148,7 @@ - + @@ -11166,7 +11166,7 @@ - + @@ -11184,7 +11184,7 @@ - + @@ -11193,7 +11193,7 @@ - + @@ -11202,7 +11202,7 @@ - + @@ -11211,7 +11211,7 @@ - + @@ -11262,7 +11262,7 @@ - + @@ -11463,7 +11463,7 @@ - + @@ -11766,7 +11766,7 @@ - + @@ -13095,7 +13095,7 @@ - + @@ -13122,7 +13122,7 @@ - + @@ -13149,7 +13149,7 @@ - + @@ -13176,7 +13176,7 @@ - + @@ -13269,7 +13269,7 @@ - + @@ -13596,7 +13596,7 @@ - + @@ -14085,7 +14085,7 @@ - + @@ -14352,7 +14352,7 @@ - + @@ -14361,7 +14361,7 @@ - + @@ -14943,7 +14943,7 @@ - + @@ -15288,7 +15288,7 @@ - + @@ -15666,7 +15666,7 @@ - + @@ -15675,7 +15675,7 @@ - + @@ -16449,7 +16449,7 @@ - + @@ -16731,7 +16731,7 @@ - + @@ -16776,7 +16776,7 @@ - + @@ -16821,7 +16821,7 @@ - + @@ -17262,7 +17262,7 @@ - + @@ -17532,7 +17532,7 @@ - + @@ -17679,7 +17679,7 @@ - + @@ -18087,7 +18087,7 @@ - + @@ -18609,7 +18609,7 @@ - + @@ -18759,7 +18759,7 @@ - + @@ -19491,7 +19491,7 @@ - + @@ -19554,7 +19554,7 @@ - + diff --git a/src/server/editorServices.ts b/src/server/editorServices.ts index aa578c7ed0815..97acaf5d5e6a2 100644 --- a/src/server/editorServices.ts +++ b/src/server/editorServices.ts @@ -599,7 +599,7 @@ export interface ConfigFileExistenceInfo { * It is true if there is configured project open for this file. * It can be either true or false if this is the config file that is being watched by inferred project * to decide when to update the structure so that it knows about updating the project for its files - * (config file may include the inferred project files after the change and hence may be wont need to be in inferred project) + * (config file may include the inferred project files after the change and hence may be won't need to be in inferred project) */ exists: boolean; /** @@ -875,14 +875,14 @@ function forEachResolvedProjectReferenceProjectLoad( configFileExistenceInfo!.config!.parsedCommandLine : undefined : project.getParsedCommandLine(childConfigName); if (childConfig && loadKind !== kind && loadKind > ConfiguredProjectLoadKind.CreateReplayOptimized) { - // If this was found using find: ensure this is uptodate if looking for creating or reloading + // If this was found using find: ensure this is up-to-date if looking for creating or reloading childConfig = project.getParsedCommandLine(childConfigName); } if (!childConfig) return undefined; // Find the project const childProject = project.projectService.findConfiguredProjectByProjectName(childConfigName, allowDeferredClosed); - // Ignore if we couldnt find child project or config file existence info + // Ignore if we couldn't find child project or config file existence info if ( loadKind === ConfiguredProjectLoadKind.CreateReplayOptimized && !configFileExistenceInfo && @@ -1607,7 +1607,7 @@ export class ProjectService { ); return; case ActionInvalidate: - // Do not clear resolution cache, there was changes detected in typings, so enque typing request and let it get us correct results + // Do not clear resolution cache, there was changes detected in typings, so enqueue typing request and let it get us correct results project.enqueueInstallTypingsForProject(/*forceRefresh*/ true); return; } @@ -2142,7 +2142,7 @@ export class ProjectService { const wasDefferedClose = project?.deferredClose; if (eventKind === FileWatcherEventKind.Deleted) { // Update the cached status - // We arent updating or removing the cached config file presence info as that will be taken care of by + // We aren't updating or removing the cached config file presence info as that will be taken care of by // releaseParsedConfig when the project is closed or doesnt need this config any more (depending on tracking open files) configFileExistenceInfo.exists = false; @@ -2368,9 +2368,9 @@ export class ProjectService { this.assignOrphanScriptInfosToInferredProject(); } - // Cleanup script infos that arent part of any project (eg. those could be closed script infos not referenced by any project) + // Cleanup script infos that aren't part of any project (eg. those could be closed script infos not referenced by any project) // is postponed to next file open so that if file from same project is opened, - // we wont end up creating same script infos + // we won't end up creating same script infos // If the current info is being just closed - add the watcher file to track changes // But if file was deleted, handle that part @@ -2412,7 +2412,7 @@ export class ProjectService { // In practice there will be very few scenarios where the config file gets added // somewhere inside the another config file directory. // And technically we could handle that case in configFile's directory watcher in some cases - // But given that its a rare scenario it seems like too much overhead. (we werent watching those directories earlier either) + // But given that its a rare scenario it seems like too much overhead. (we weren't watching those directories earlier either) // So what we are now watching is: configFile if the configured project corresponding to it is open // Or the whole chain of config files for the roots of the inferred projects @@ -2473,7 +2473,7 @@ export class ProjectService { } } else { - // There is not a single file open thats tracking the status of this config file. Remove from cache + // There is not a single file open that's tracking the status of this config file. Remove from cache configFileExistenceInfo.watcher!.close(); this.configFileExistenceInfoCache.delete(canonicalConfigFilePath); } @@ -2504,7 +2504,7 @@ export class ProjectService { } // If the script info was not root of inferred project, - // there wont be config file watch open because of this script info + // there won't be config file watch open because of this script info if (isRootOfInferredProject) { // But if it is a root, it could be the last script info that is root of inferred project // and hence we would need to close the config file watcher @@ -2683,7 +2683,7 @@ export class ProjectService { // Need to set value for ancestor in ConfigFileMapForOpenFile let configFileForOpenFile = this.configFileForOpenFiles.get(info.path)!; if (!configFileForOpenFile || isString(configFileForOpenFile)) { - // We have value for open script info in cache, make a map with that as false key and set new vlaue + // We have value for open script info in cache, make a map with that as false key and set new value this.configFileForOpenFiles.set( info.path, configFileForOpenFile = new Map().set(false, configFileForOpenFile), @@ -2962,7 +2962,7 @@ export class ProjectService { } } - // Dont update if file isnt on the disk + // Dont update if file isn't on the disk if (!configFileExistenceInfo.exists && configFileExistenceInfo.config) { configFileExistenceInfo.config.updateLevel = undefined; this.ensureConfigFileWatcherForProject(configFileExistenceInfo, forProject); @@ -3681,7 +3681,7 @@ export class ProjectService { return info; } - // This means triple slash references wont be resolved in dynamic and unsaved files + // This means triple slash references won't be resolved in dynamic and unsaved files // which is intentional since we dont know what it means to be relative to non disk files return undefined; } @@ -3774,7 +3774,7 @@ export class ProjectService { /** @internal */ getDocumentPositionMapper(project: Project, generatedFileName: string, sourceFileName?: string): DocumentPositionMapper | undefined { - // Since declaration info and map file watches arent updating project's directory structure host (which can cache file structure) use host + // Since declaration info and map file watches aren't updating project's directory structure host (which can cache file structure) use host const declarationInfo = this.getOrCreateScriptInfoNotOpenedByClient( generatedFileName, project.currentDirectory, @@ -3926,7 +3926,7 @@ export class ProjectService { if (!info.sourceFileLike) { info.sourceFileLike = { get text() { - Debug.fail("shouldnt need text"); + Debug.fail("shouldn't need text"); return ""; }, getLineAndCharacterOfPosition: pos => { @@ -4066,7 +4066,7 @@ export class ProjectService { reloadProjects(): void { this.logger.info("reload projects."); // If we want this to also reload open files from disk, we could do that, - // but then we need to make sure we arent calling this function + // but then we need to make sure we aren't calling this function // (and would separate out below reloading of projects to be called when immediate reload is needed) // as there is no need to load contents of the files from the disk @@ -4160,7 +4160,7 @@ export class ProjectService { // a.ts is added as root to inferred project. // Now at time of opening c.ts, c.ts is also not aprt of any existing project, // so it will be added to inferred project as a root. (for sake of this example assume single inferred project is false) - // So at this poing a.ts is part of first inferred project and second inferred project (of which c.ts is root) + // So at this point a.ts is part of first inferred project and second inferred project (of which c.ts is root) // And hence it needs to be removed from the first inferred project. Debug.assert(info.containingProjects.length > 0); const firstProject = info.containingProjects[0]; @@ -4350,7 +4350,7 @@ export class ProjectService { // - external project search, which updates the project before checking if info is present in it // - configured project - either created or updated to ensure we know correct status of info - // At this point we need to ensure that containing projects of the info are uptodate + // At this point we need to ensure that containing projects of the info are up-to-date // This will ensure that later question of info.isOrphan() will return correct answer // and we correctly create inferred project for the info info.containingProjects.forEach(updateProjectIfDirty); @@ -4602,7 +4602,7 @@ export class ProjectService { return; } - // Ensure the project is uptodate and created since the file may belong to this project + // Ensure the project is up-to-date and created since the file may belong to this project const result = project ? updateProjectFoundUsingFind( project, @@ -4620,7 +4620,7 @@ export class ProjectService { reloadedProjects, ); if (!result) { - // Did no find existing project but thats ok, we will give information based on what we find + // Did no find existing project but that's ok, we will give information based on what we find Debug.assert(kind === ConfiguredProjectLoadKind.CreateReplay); return undefined; } @@ -4821,7 +4821,7 @@ export class ProjectService { ); // Remove orphan inferred projects now that we have reused projects - // We need to create a duplicate because we cant guarantee order after removal + // We need to create a duplicate because we can't guarantee order after removal for (const inferredProject of this.inferredProjects.slice()) { if (inferredProject.isOrphan()) { this.removeProject(inferredProject); @@ -5395,7 +5395,7 @@ export class ProjectService { } existingExternalProject.setProjectErrors(watchOptionsAndErrors?.errors); // external project already exists and not config files were added - update the project and return; - // The graph update here isnt postponed since any file open operation needs all updated external projects + // The graph update here isn't postponed since any file open operation needs all updated external projects this.updateRootAndOptionsOfNonInferredProject(existingExternalProject, rootFiles, externalFilePropertyReader, compilerOptions, typeAcquisition, proj.options.compileOnSave, watchOptionsAndErrors?.watchOptions); existingExternalProject.updateGraph(); } diff --git a/src/server/project.ts b/src/server/project.ts index 88fa23c1bc263..37b6095ca0427 100644 --- a/src/server/project.ts +++ b/src/server/project.ts @@ -424,7 +424,7 @@ export abstract class Project implements LanguageServiceHost, ModuleResolutionHo */ private lastReportedVersion = 0; /** - * Current project's program version. (incremented everytime new program is created that is not complete reuse from the old one) + * Current project's program version. (incremented every time new program is created that is not complete reuse from the old one) * This property is changed in 'updateGraph' based on the set of files in program * @internal */ @@ -1123,7 +1123,7 @@ export abstract class Project implements LanguageServiceHost, ModuleResolutionHo if (this.typingsCache) this.projectService.typingsInstaller.onProjectClosed(this); this.typingsCache = undefined; this.closeWatchingTypingLocations(); - // if we have a program - release all files that are enlisted in program but arent root + // if we have a program - release all files that are enlisted in program but aren't root // The releasing of the roots happens later // The project could have pending update remaining and hence the info could be in the files but not in program graph this.cleanupProgram(); @@ -2449,7 +2449,7 @@ export class InferredProject extends Project { readonly projectRootPath: string | undefined; /** - * stored only if their is no projectRootPath and this isnt single inferred project + * stored only if their is no projectRootPath and this isn't single inferred project * * @internal */ @@ -3035,7 +3035,7 @@ export class ConfiguredProject extends Project { this.triggerFileForConfigFileDiag = undefined; } else if (!this.triggerFileForConfigFileDiag) { - // If we arent tracking to send configFileDiag, send event if diagnostics presence has changed + // If we aren't tracking to send configFileDiag, send event if diagnostics presence has changed this.projectService.sendConfigFileDiagEvent(this, /*triggerFile*/ undefined, /*force*/ false); } return result; diff --git a/src/server/protocol.ts b/src/server/protocol.ts index dbcbfb3e17169..2c87c0e0f7f2a 100644 --- a/src/server/protocol.ts +++ b/src/server/protocol.ts @@ -1174,7 +1174,7 @@ export interface HighlightSpan extends TextSpanWithContext { } /** - * Represents a set of highligh spans for a give name + * Represents a set of highlight spans for a give name */ export interface DocumentHighlightsItem { /** @@ -1497,7 +1497,7 @@ export interface ProjectChanges { */ export interface ProjectFiles { /** - * Information about project verison + * Information about project version */ info?: ProjectVersionInfo; /** @@ -2434,7 +2434,7 @@ export interface SemanticDiagnosticsSyncRequestArgs extends FileRequestArgs { } /** - * Response object for synchronous sematic diagnostics request. + * Response object for synchronous semantic diagnostics request. */ export interface SemanticDiagnosticsSyncResponse extends Response { body?: Diagnostic[] | DiagnosticWithLinePosition[]; @@ -2669,7 +2669,7 @@ export interface DiagnosticEvent extends Event { export interface ConfigFileDiagnosticEventBody { /** - * The file which trigged the searching and error-checking of the config file + * The file which triggered the searching and error-checking of the config file */ triggerFile: string; diff --git a/src/server/scriptInfo.ts b/src/server/scriptInfo.ts index 8635d543cdb06..b59d339851a1b 100644 --- a/src/server/scriptInfo.ts +++ b/src/server/scriptInfo.ts @@ -84,7 +84,7 @@ export class TextStorage { private fileSize: number | undefined; /** - * True if the text is for the file thats open in the editor + * True if the text is for the file that's open in the editor */ public isOpen = false; /** @@ -162,7 +162,7 @@ export class TextStorage { if (this.text !== newText) { // Update the text this.useText(newText); - // We cant guarantee new text is own file text + // We can't guarantee new text is own file text this.ownFileText = false; return true; } @@ -546,7 +546,7 @@ export class ScriptInfo { } break; default: - // We use first configured project as default so we shouldnt change the order of the containing projects + // We use first configured project as default so we shouldn't change the order of the containing projects if (orderedRemoveItem(this.containingProjects, project)) { project.onFileAddedOrRemoved(this.isSymlink()); } @@ -596,7 +596,7 @@ export class ScriptInfo { if (isConfiguredProject(project)) { if (project.deferredClose) continue; if (!project.isSourceOfProjectReferenceRedirect(this.fileName)) { - // If we havent found default configuredProject and + // If we haven't found default configuredProject and // its not the last one, find it and use that one if there if ( defaultConfiguredProject === undefined && diff --git a/src/services/codefixes/convertToEsModule.ts b/src/services/codefixes/convertToEsModule.ts index 02d1a5f930114..7458c383fe9c9 100644 --- a/src/services/codefixes/convertToEsModule.ts +++ b/src/services/codefixes/convertToEsModule.ts @@ -467,7 +467,7 @@ function replaceImportUseSites(nodeOrNodes: T | NodeArray, us : getSynthesizedDeepCloneWithReplacements(nodeOrNodes, /*includeTrivia*/ true, replaceNode); function replaceNode(original: Node) { - // We are replacing `mod.SomeExport` wih `SomeExport`, so we only need to look at PropertyAccessExpressions + // We are replacing `mod.SomeExport` with `SomeExport`, so we only need to look at PropertyAccessExpressions if (original.kind === SyntaxKind.PropertyAccessExpression) { const replacement = useSitesToUnqualify!.get(original); // Remove entry from `useSitesToUnqualify` so the refactor knows it's taken care of by the parent statement we're replacing diff --git a/src/services/codefixes/fixSpelling.ts b/src/services/codefixes/fixSpelling.ts index 21a32bd00c411..816373bd34d1b 100644 --- a/src/services/codefixes/fixSpelling.ts +++ b/src/services/codefixes/fixSpelling.ts @@ -82,7 +82,7 @@ registerCodeFix({ function getInfo(sourceFile: SourceFile, pos: number, context: CodeFixContextBase, errorCode: number): { node: Node; suggestedSymbol: Symbol; } | undefined { // This is the identifier of the misspelled word. eg: - // this.speling = 1; + // this.spelling = 1; // ^^^^^^^ const node = getTokenAtPosition(sourceFile, pos); const parent = node.parent; diff --git a/src/services/codefixes/importFixes.ts b/src/services/codefixes/importFixes.ts index 6034c9dfc3de1..8ca8329d1fc2d 100644 --- a/src/services/codefixes/importFixes.ts +++ b/src/services/codefixes/importFixes.ts @@ -500,12 +500,12 @@ function createImportAdderWorker(sourceFile: SourceFile | FutureSourceFile, prog entry.namedImports.set(symbolName, [reduceAddAsTypeOnlyValues(prevValue, addAsTypeOnly), propertyName]); } else { - Debug.assert(entry.namespaceLikeImport === undefined || entry.namespaceLikeImport.name === symbolName, "Namespacelike import shoudl be missing or match symbolName"); + Debug.assert(entry.namespaceLikeImport === undefined || entry.namespaceLikeImport.name === symbolName, "Namespacelike import should be missing or match symbolName"); entry.namespaceLikeImport = { importKind, name: symbolName, addAsTypeOnly }; } break; case ImportKind.Namespace: - Debug.assert(entry.namespaceLikeImport === undefined || entry.namespaceLikeImport.name === symbolName, "Namespacelike import shoudl be missing or match symbolName"); + Debug.assert(entry.namespaceLikeImport === undefined || entry.namespaceLikeImport.name === symbolName, "Namespacelike import should be missing or match symbolName"); entry.namespaceLikeImport = { importKind, name: symbolName, addAsTypeOnly }; break; } diff --git a/src/services/completions.ts b/src/services/completions.ts index 28d29136dab89..0702fc06cddac 100644 --- a/src/services/completions.ts +++ b/src/services/completions.ts @@ -640,7 +640,7 @@ function resolvingModuleSpecifiers( // Import statement completions always need specifier resolution because the module specifier is // part of their `insertText`, not the `codeActions` creating edits away from the cursor. // Finally, `autoImportSpecifierExcludeRegexes` necessitates eagerly resolving module specifiers - // because completion items are being explcitly filtered out by module specifier. + // because completion items are being explicitly filtered out by module specifier. const needsFullResolution = isForImportStatementCompletion || getResolvePackageJsonExports(program.getCompilerOptions()) || preferences.autoImportSpecifierExcludeRegexes?.length; @@ -3566,7 +3566,7 @@ function getCompletionData( case SyntaxKind.Identifier: isJsxIdentifierExpected = true; // For `
` we don't want to treat this as a jsx inializer, instead it's the attribute name. + // Note for `
` we don't want to treat this as a jsx initializer, instead it's the attribute name. if ( parent !== previousToken.parent && !(parent as JsxAttribute).initializer && @@ -3742,7 +3742,7 @@ function getCompletionData( } } - // If the module is merged with a value, we must get the type of the class and add its propertes (for inherited static methods). + // If the module is merged with a value, we must get the type of the class and add its properties (for inherited static methods). if ( !isTypeLocation && !insideJsDocTagTypeExpression && @@ -5023,7 +5023,7 @@ function getCompletionData( // constructor parameter completion is available only if // - its modifier of the constructor parameter or // - its name of the parameter and not being edited - // eg. constructor(a |<- this shouldnt show completion + // eg. constructor(a |<- this shouldn't show completion if ( !isIdentifier(contextToken) || isParameterPropertyModifier(keywordForNode(contextToken)) || @@ -5236,7 +5236,7 @@ function getCompletionData( /** * Filters out completion suggestions for class elements. * - * @returns Symbols to be suggested in an class element depending on existing memebers and symbol flags + * @returns Symbols to be suggested in an class element depending on existing members and symbol flags */ function filterClassMembersList(baseSymbols: readonly Symbol[], existingMembers: readonly ClassElement[], currentClassElementModifierFlags: ModifierFlags): Symbol[] { const existingMemberNames = new Set<__String>(); diff --git a/src/services/findAllReferences.ts b/src/services/findAllReferences.ts index a2ed0feb795a7..a60515bd329ab 100644 --- a/src/services/findAllReferences.ts +++ b/src/services/findAllReferences.ts @@ -2540,7 +2540,7 @@ export namespace Core { isForRenamePopulateSearchSymbolSet: boolean, onlyIncludeBindingElementAtReferenceLocation: boolean, /** - * @param baseSymbol This symbol means one property/mehtod from base class or interface when it is not null or undefined, + * @param baseSymbol This symbol means one property/method from base class or interface when it is not null or undefined, */ cbSymbol: (symbol: Symbol, rootSymbol?: Symbol, baseSymbol?: Symbol, kind?: NodeEntryKind) => T | undefined, allowBaseTypes: (rootSymbol: Symbol) => boolean, diff --git a/src/services/formatting/formatting.ts b/src/services/formatting/formatting.ts index e641b0f2b0434..c49391eb89fd3 100644 --- a/src/services/formatting/formatting.ts +++ b/src/services/formatting/formatting.ts @@ -138,7 +138,7 @@ interface DynamicIndentation { */ getIndentation(): number; /** - * Prefered relative indentation for child nodes. + * Preferred relative indentation for child nodes. * Delta is used to carry the indentation info * foo(bar({ * $ @@ -1272,9 +1272,9 @@ function formatSpanWorker( * Trimming will be done for lines after the previous range. * Exclude comments as they had been previously processed. */ - function trimTrailingWhitespacesForRemainingRange(trivias: TextRangeWithKind[]) { + function trimTrailingWhitespacesForRemainingRange(trivia: TextRangeWithKind[]) { let startPos = previousRange ? previousRange.end : originalRange.pos; - for (const trivia of trivias) { + for (const trivia of trivia) { if (isComment(trivia.kind)) { if (startPos < trivia.pos) { trimTrailingWitespacesForPositions(startPos, trivia.pos - 1, previousRange); diff --git a/src/services/getEditsForFileRename.ts b/src/services/getEditsForFileRename.ts index cffc15aeeabb3..374e79f60626c 100644 --- a/src/services/getEditsForFileRename.ts +++ b/src/services/getEditsForFileRename.ts @@ -271,7 +271,7 @@ function getSourceFileToImportFromResolved(importLiteral: StringLiteralLike, res || pathIsRelative(importLiteral.text) && forEach(resolved.failedLookupLocations, tryChangeWithIgnoringPackageJson); if (result) return result; - // If nothing changed, then result is resolved module file thats not updated + // If nothing changed, then result is resolved module file that's not updated return resolved.resolvedModule && { newFileName: resolved.resolvedModule.resolvedFileName, updated: false }; function tryChangeWithIgnoringPackageJsonExisting(oldFileName: string) { diff --git a/src/services/goToDefinition.ts b/src/services/goToDefinition.ts index 0a45cc3e3e9a0..3e0b7336a0a91 100644 --- a/src/services/goToDefinition.ts +++ b/src/services/goToDefinition.ts @@ -147,7 +147,7 @@ export function getDefinitionAtPosition(program: Program, sourceFile: SourceFile return label ? [createDefinitionInfoFromName(typeChecker, label, ScriptElementKind.label, node.text, /*containerName*/ undefined!)] : undefined; // TODO: GH#18217 } - // for switch statments + // for switch statements switch (node.kind) { case SyntaxKind.DefaultKeyword: if (!isDefaultClause(node.parent)) { diff --git a/src/services/refactors/convertOverloadListToSingleSignature.ts b/src/services/refactors/convertOverloadListToSingleSignature.ts index c9fd31f1b4e70..f108effdddf6f 100644 --- a/src/services/refactors/convertOverloadListToSingleSignature.ts +++ b/src/services/refactors/convertOverloadListToSingleSignature.ts @@ -161,7 +161,7 @@ function getRefactorEditsToConvertOverloadsToOneSignature(context: RefactorConte function getNewParametersForCombinedSignature(signatureDeclarations: (MethodSignature | MethodDeclaration | CallSignatureDeclaration | ConstructorDeclaration | ConstructSignatureDeclaration | FunctionDeclaration)[]): NodeArray { const lastSig = signatureDeclarations[signatureDeclarations.length - 1]; if (isFunctionLikeDeclaration(lastSig) && lastSig.body) { - // Trim away implementation signature arguments (they should already be compatible with overloads, but are likely less precise to guarantee compatability with the overloads) + // Trim away implementation signature arguments (they should already be compatible with overloads, but are likely less precise to guarantee compatibility with the overloads) signatureDeclarations = signatureDeclarations.slice(0, signatureDeclarations.length - 1); } return factory.createNodeArray([ diff --git a/src/services/services.ts b/src/services/services.ts index 9885093ed6180..4af9015add1b2 100644 --- a/src/services/services.ts +++ b/src/services/services.ts @@ -1946,7 +1946,7 @@ export function createLanguageService( return documentRegistry.updateDocumentWithKey(fileName, path, host, documentRegistryBucketKey, scriptSnapshot, scriptVersion, scriptKind, languageVersionOrOptions); } else { - // Release old source file and fall through to aquire new file with new script kind + // Release old source file and fall through to acquire new file with new script kind documentRegistry.releaseDocumentWithKey(oldSourceFile.resolvedPath, documentRegistry.getKeyForCompilationSettings(program.getCompilerOptions()), oldSourceFile.scriptKind, oldSourceFile.impliedNodeFormat); releasedScriptKinds!.add(oldSourceFile.resolvedPath); } @@ -2532,7 +2532,7 @@ export function createLanguageService( case SyntaxKind.Identifier: break; - // Cant create the text span + // Can't create the text span default: return undefined; } diff --git a/src/services/stringCompletions.ts b/src/services/stringCompletions.ts index 42c72bd4ca998..ea812f844a312 100644 --- a/src/services/stringCompletions.ts +++ b/src/services/stringCompletions.ts @@ -988,7 +988,7 @@ function addCompletionEntriesFromPathsOrExportsOrImports( /** * Check all of the declared modules and those in node modules. Possible sources of modules: * Modules that are found by the type checker - * Modules found relative to "baseUrl" compliler options (including patterns from "paths" compiler option) + * Modules found relative to "baseUrl" compiler options (including patterns from "paths" compiler option) * Modules from node_modules (i.e. those listed in package.json) * This includes all files that are found in node_modules/moduleName/ with acceptable file extensions */ diff --git a/src/services/textChanges.ts b/src/services/textChanges.ts index cca568d1c872b..a8136649ca898 100644 --- a/src/services/textChanges.ts +++ b/src/services/textChanges.ts @@ -267,7 +267,7 @@ function hasCommentsBeforeLineBreak(text: string, start: number) { * Usually leading trivia of the variable declaration 'y' should not include trailing trivia (whitespace, comment 'this is x' and newline) from the preceding * variable declaration and trailing trivia for 'y' should include (whitespace, comment 'this is y', newline). * By default when removing nodes we adjust start and end positions to respect specification of the trivia above. - * If pos\end should be interpreted literally (that is, withouth including leading and trailing trivia), `leadingTriviaOption` should be set to `LeadingTriviaOption.Exclude` + * If pos\end should be interpreted literally (that is, without including leading and trailing trivia), `leadingTriviaOption` should be set to `LeadingTriviaOption.Exclude` * and `trailingTriviaOption` to `TrailingTriviaOption.Exclude`. * * @internal @@ -417,7 +417,7 @@ function getEndPositionOfMultilineTrailingComment(sourceFile: SourceFile, node: const nodeEndLine = getLineOfLocalPosition(sourceFile, node.end); for (const comment of comments) { // Single line can break the loop as trivia will only be this line. - // Comments on subsequest lines are also ignored. + // Comments on subsequent lines are also ignored. if (comment.kind === SyntaxKind.SingleLineCommentTrivia || getLineOfLocalPosition(sourceFile, comment.pos) > nodeEndLine) { break; } diff --git a/src/services/transpile.ts b/src/services/transpile.ts index dfc94a0cce202..5ac64de8cd485 100644 --- a/src/services/transpile.ts +++ b/src/services/transpile.ts @@ -151,7 +151,7 @@ function transpileWorker(input: string, transpileOptions: TranspileOptions, decl options.declarationMap = false; } - // When transpiling declartions, we need libs. + // When transpiling declarations, we need libs. // getDefaultLibFileName will cause barebonesLib to be used. options.noLib = !declaration; diff --git a/src/services/types.ts b/src/services/types.ts index 5329fe901b240..8554cd014b077 100644 --- a/src/services/types.ts +++ b/src/services/types.ts @@ -464,7 +464,7 @@ export interface LanguageService { /** * Gets errors indicating invalid syntax in a file. * - * In English, "this cdeo have, erorrs" is syntactically invalid because it has typos, + * In English, "this cdeo have, errors" is syntactically invalid because it has typos, * grammatical errors, and misplaced punctuation. Likewise, examples of syntax * errors in TypeScript are missing parentheses in an `if` statement, mismatched * curly braces, and using a reserved keyword as a variable name. @@ -1342,7 +1342,7 @@ export interface RenameInfoSuccess { displayName: string; /** * Full display name of item to be renamed. - * If item to be renamed is a file, then this is the original text of the module specifer + * If item to be renamed is a file, then this is the original text of the module specifier */ fullDisplayName: string; kind: ScriptElementKind; @@ -1509,7 +1509,7 @@ export interface CompletionEntry { */ replacementSpan?: TextSpan; /** - * Indicates whether commiting this completion entry will require additional code actions to be + * Indicates whether committing this completion entry will require additional code actions to be * made to avoid errors. The CompletionEntryDetails will have these actions. */ hasAction?: true; diff --git a/src/testRunner/parallel/shared.ts b/src/testRunner/parallel/shared.ts index e0adb6db04163..03e32aceb7a9b 100644 --- a/src/testRunner/parallel/shared.ts +++ b/src/testRunner/parallel/shared.ts @@ -81,7 +81,7 @@ export function shimNoopTestInterface(global: Mocha.MochaGlobals): void { global.beforeEach = ts.noop; global.afterEach = ts.noop; global.describe = global.context = ((_: any, __: any) => {/*empty*/}) as Mocha.SuiteFunction; - global.describe.skip = global.xdescribe = global.xcontext = ts.noop as Mocha.PendingSuiteFunction; + global.describe.skip = global.describe = global.xcontext = ts.noop as Mocha.PendingSuiteFunction; global.describe.only = ts.noop as Mocha.ExclusiveSuiteFunction; global.it = global.specify = ((_: any, __: any) => {/*empty*/}) as Mocha.TestFunction; global.it.skip = global.xit = global.xspecify = ts.noop as Mocha.PendingTestFunction; diff --git a/src/testRunner/parallel/worker.ts b/src/testRunner/parallel/worker.ts index 0dde6ae90cab3..8d926f73f924f 100644 --- a/src/testRunner/parallel/worker.ts +++ b/src/testRunner/parallel/worker.ts @@ -117,11 +117,11 @@ export function start(importTests: () => Promise): void { function shimTestInterface(rootSuite: Mocha.Suite, context: Mocha.MochaGlobals) { const suites = [rootSuite]; context.before = (title: string | Mocha.Func | Mocha.AsyncFunc, fn?: Mocha.Func | Mocha.AsyncFunc) => suites[0].beforeAll(title as string, fn); - context.after = (title: string | Mocha.Func | Mocha.AsyncFunc, fn?: Mocha.Func | Mocha.AsyncFunc) => suites[0].afterAll(title as string, fn); + context.after = (title: string | Mocha.Func | Mocha.AsyncFunc, fn?: Mocha.Func | Mocha.AsyncFunc) => suites[0].after all(title as string, fn); context.beforeEach = (title: string | Mocha.Func | Mocha.AsyncFunc, fn?: Mocha.Func | Mocha.AsyncFunc) => suites[0].beforeEach(title as string, fn); context.afterEach = (title: string | Mocha.Func | Mocha.AsyncFunc, fn?: Mocha.Func | Mocha.AsyncFunc) => suites[0].afterEach(title as string, fn); context.describe = context.context = ((title: string, fn: (this: Mocha.Suite) => void) => addSuite(title, fn)) as Mocha.SuiteFunction; - context.describe.skip = context.xdescribe = context.xcontext = (title: string) => addSuite(title, /*fn*/ undefined); + context.describe.skip = context.describe = context.xcontext = (title: string) => addSuite(title, /*fn*/ undefined); context.describe.only = (title: string, fn?: (this: Mocha.Suite) => void) => addSuite(title, fn); context.it = context.specify = ((title: string | Mocha.Func | Mocha.AsyncFunc, fn?: Mocha.Func | Mocha.AsyncFunc) => addTest(title, fn)) as Mocha.TestFunction; context.it.skip = context.xit = context.xspecify = (title: string | Mocha.Func | Mocha.AsyncFunc) => addTest(typeof title === "function" ? title.name : title, /*fn*/ undefined); diff --git a/src/testRunner/tests.ts b/src/testRunner/tests.ts index 6d164855b4f22..c0ad672e698bd 100644 --- a/src/testRunner/tests.ts +++ b/src/testRunner/tests.ts @@ -194,7 +194,7 @@ export * from "./unittests/tsserver/metadataInResponse.js"; export * from "./unittests/tsserver/moduleResolution.js"; export * from "./unittests/tsserver/moduleSpecifierCache.js"; export * from "./unittests/tsserver/navTo.js"; -export * from "./unittests/tsserver/occurences.js"; +export * from "./unittests/tsserver/occurrences.js"; export * from "./unittests/tsserver/openFile.js"; export * from "./unittests/tsserver/packageJsonInfo.js"; export * from "./unittests/tsserver/partialSemanticServer.js"; diff --git a/src/testRunner/unittests/canWatch.ts b/src/testRunner/unittests/canWatch.ts index 36b4e5a07cb3a..46ddcabeec682 100644 --- a/src/testRunner/unittests/canWatch.ts +++ b/src/testRunner/unittests/canWatch.ts @@ -20,7 +20,7 @@ describe("unittests:: canWatch::", () => { baselineCanWatch( "canWatchAtTypes", - () => `Determines if given node_modules/@types can be watched.\r\nThese are the typeRoots calculated because user didnt specify typeRoots in compierOptions`, + () => `Determines if given node_modules/@types can be watched.\r\nThese are the typeRoots calculated because user didn't specify typeRoots in compierOptions`, (paths, longestPathLength, baseline) => { const testType = "canWatchAtTypes"; const maxLengths = [longestPathLength + "/node_modules/@types".length, testType.length] as const; @@ -59,7 +59,7 @@ describe("unittests:: canWatch::", () => { ["file", "dir", "subDir"].forEach(type => { baselineCanWatch( `${scenario}In${type}${preferNonRecursiveWatch ? "NonRecursive" : ""}`, - () => `Determines whether to watch given failed lookup location (file that didnt exist) when resolving module.\r\nIt also determines the directory to watch and whether to watch it recursively or not.`, + () => `Determines whether to watch given failed lookup location (file that didn't exist) when resolving module.\r\nIt also determines the directory to watch and whether to watch it recursively or not.`, (paths, longestPathLength, baseline) => { const recursive = "Recursive"; const maxLength = longestPathLength + ts.combinePaths(forPath, "dir/subdir/somefile.d.ts").length; diff --git a/src/testRunner/unittests/config/tsconfigParsing.ts b/src/testRunner/unittests/config/tsconfigParsing.ts index c3893dde6eb59..3ff346f7f301f 100644 --- a/src/testRunner/unittests/config/tsconfigParsing.ts +++ b/src/testRunner/unittests/config/tsconfigParsing.ts @@ -419,7 +419,7 @@ describe("unittests:: config:: tsconfigParsing:: parseConfigFileTextToJson", () basePath: "/foo.bar", }]); - baselineWildcards("correctly parses wild card directories from implicit glob when two keys differ only in directory seperator", () => [{ + baselineWildcards("correctly parses wild card directories from implicit glob when two keys differ only in directory separator", () => [{ configFileName: "/foo.bar/tsconfig.json", jsonText: jsonToReadableText({ include: ["./", "./**/*.json"], diff --git a/src/testRunner/unittests/convertToBase64.ts b/src/testRunner/unittests/convertToBase64.ts index a3465854d7853..a09e3565ac656 100644 --- a/src/testRunner/unittests/convertToBase64.ts +++ b/src/testRunner/unittests/convertToBase64.ts @@ -8,7 +8,7 @@ describe("unittests:: convertToBase64", () => { } if (Buffer) { - it("Converts ASCII charaters correctly", () => { + it("Converts ASCII characters correctly", () => { runTest(" !\"#$ %&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~"); }); diff --git a/src/testRunner/unittests/helpers/baseline.ts b/src/testRunner/unittests/helpers/baseline.ts index 97146d59b03cb..37cddeed7b4bf 100644 --- a/src/testRunner/unittests/helpers/baseline.ts +++ b/src/testRunner/unittests/helpers/baseline.ts @@ -119,8 +119,8 @@ function baselineProgram(baseline: string[], [program, builderProgram]: CommandL baseline.push("Dependencies for::"); for (const file of builderProgram.getSourceFiles()) { baseline.push(`${file.fileName}:`); - for (const depenedency of builderProgram.getAllDependencies(file)) { - baseline.push(` ${depenedency}`); + for (const dependency of builderProgram.getAllDependencies(file)) { + baseline.push(` ${dependency}`); } } } diff --git a/src/testRunner/unittests/helpers/noCheck.ts b/src/testRunner/unittests/helpers/noCheck.ts index 94220091a09fc..30fd1c6354398 100644 --- a/src/testRunner/unittests/helpers/noCheck.ts +++ b/src/testRunner/unittests/helpers/noCheck.ts @@ -32,8 +32,8 @@ export function forEachTscScenarioWithNoCheck(buildType: "-b" | "-p"): void { const noChangeRunWithCheckPendingDiscrepancy: TestTscEdit = { ...noChangeRun, discrepancyExplanation: () => [ - "Clean build will have check pending since it didnt type check", - "Incremental build has typechecked before this so wont have checkPending", + "Clean build will have check pending since it didn't type check", + "Incremental build has typechecked before this so won't have checkPending", ], }; diff --git a/src/testRunner/unittests/helpers/tsc.ts b/src/testRunner/unittests/helpers/tsc.ts index 85cc75125190c..ce355b51d2a9c 100644 --- a/src/testRunner/unittests/helpers/tsc.ts +++ b/src/testRunner/unittests/helpers/tsc.ts @@ -200,7 +200,7 @@ function verifyTscEditDiscrepancies( const { buildInfo: cleanBuildInfo, readableBuildInfo: cleanReadableBuildInfo } = getBuildInfoForIncrementalCorrectnessCheck(cleanBuildText); const dtsSignatures = result.dtsSignatures?.get(outputFile); verifyTextEqual(incrementalBuildInfo, cleanBuildInfo, `TsBuild info text without affectedFilesPendingEmit:: ${outputFile}::`); - // Verify file info sigantures + // Verify file info signatures verifyMapLike( (incrementalReadableBuildInfo as ReadableIncrementalMultiFileEmitBuildInfo)?.fileInfos, (cleanReadableBuildInfo as ReadableIncrementalMultiFileEmitBuildInfo)?.fileInfos, @@ -344,7 +344,7 @@ function verifyTscEditDiscrepancies( }); } } - if (!headerAdded && input.edits![index].discrepancyExplanation) addBaseline("*** Supplied discrepancy explanation but didnt find any difference"); + if (!headerAdded && input.edits![index].discrepancyExplanation) addBaseline("*** Supplied discrepancy explanation but didn't find any difference"); return baselines; function verifyTextEqual(incrementalText: string | undefined, cleanText: string | undefined, message: string) { @@ -426,7 +426,7 @@ function getBuildInfoForIncrementalCorrectnessCheck(text: string | undefined): { fileNames: undefined, fileIdsList: undefined, fileInfos: sanitizedFileInfos, - // Ignore noEmit since that shouldnt be reason to emit the tsbuild info and presence of it in the buildinfo file does not matter + // Ignore noEmit since that shouldn't be reason to emit the tsbuild info and presence of it in the buildinfo file does not matter options: readableBuildInfo.options && { ...readableBuildInfo.options, noEmit: undefined, diff --git a/src/testRunner/unittests/helpers/typingsInstaller.ts b/src/testRunner/unittests/helpers/typingsInstaller.ts index 8f5b3a699e740..f6dac40a3c63d 100644 --- a/src/testRunner/unittests/helpers/typingsInstaller.ts +++ b/src/testRunner/unittests/helpers/typingsInstaller.ts @@ -184,7 +184,7 @@ export class TestTypingsInstallerAdapter extends ts.server.TypingsInstallerAdapt options.host, options.host.globalTypingsCacheLocation, (...args) => this.session.event(...args), - // Some large number so requests arent throttled + // Some large number so requests aren't throttled options.throttledRequests === undefined ? 10 : options.throttledRequests, ); this.throttleLimit = options.throttleLimit || 5; diff --git a/src/testRunner/unittests/helpers/virtualFileSystemWithWatch.ts b/src/testRunner/unittests/helpers/virtualFileSystemWithWatch.ts index 67347d3965f66..af5fe61933aae 100644 --- a/src/testRunner/unittests/helpers/virtualFileSystemWithWatch.ts +++ b/src/testRunner/unittests/helpers/virtualFileSystemWithWatch.ts @@ -1099,7 +1099,7 @@ export class TestServerHost implements server.ServerHost, FormatDiagnosticsHost, return sys.createSHA256Hash!(s); } - // TOOD: record and invoke callbacks to simulate timer events + // TODO: record and invoke callbacks to simulate timer events setTimeout(callback: TimeOutCallback, ms: number, ...args: any[]): number { return this.timeoutCallbacks.register(callback, args, ms); } diff --git a/src/testRunner/unittests/incrementalParser.ts b/src/testRunner/unittests/incrementalParser.ts index ae464630afc0a..07586b3551e69 100644 --- a/src/testRunner/unittests/incrementalParser.ts +++ b/src/testRunner/unittests/incrementalParser.ts @@ -56,7 +56,7 @@ function compareTrees(oldText: ts.IScriptSnapshot, newText: ts.IScriptSnapshot, const incrementalNewTree = ts.updateLanguageServiceSourceFile(oldTree, newText, oldTree.version + ".", textChangeRange); Utils.assertInvariants(incrementalNewTree, /*parent:*/ undefined); - // We should get the same tree when doign a full or incremental parse. + // We should get the same tree when doing a full or incremental parse. Utils.assertStructuralEquals(newTree, incrementalNewTree); // We should also get the exact same set of diagnostics. @@ -497,7 +497,7 @@ describe("unittests:: incrementalParser::", () => { }); it("Yield context 1", () => { - // We're changing from a non-generator to a genarator. We can't reuse statement nodes. + // We're changing from a non-generator to a generator. We can't reuse statement nodes. const source = "function foo() {\r\nyield(foo1);\r\n}"; const oldText = ts.ScriptSnapshot.fromString(source); diff --git a/src/testRunner/unittests/moduleResolution.ts b/src/testRunner/unittests/moduleResolution.ts index 4cc25806235dd..68540ae86a0c8 100644 --- a/src/testRunner/unittests/moduleResolution.ts +++ b/src/testRunner/unittests/moduleResolution.ts @@ -70,7 +70,7 @@ describe("unittests:: moduleResolution:: Node module resolution - relative paths const baselines: string[] = []; testLoadAsFile("load as file with relative name in current directory", "/foo/bar/baz.ts", "/foo/bar/foo", "./foo"); testLoadAsFile("load as file with relative name in parent directory", "/foo/bar/baz.ts", "/foo/foo", "../foo"); - testLoadAsFile("load as file with name starting with directory seperator", "/foo/bar/baz.ts", "/foo", "/foo"); + testLoadAsFile("load as file with name starting with directory separator", "/foo/bar/baz.ts", "/foo", "/foo"); testLoadAsFile("load as file with name starting with window root", "c:/foo/bar/baz.ts", "c:/foo", "c:/foo"); runBaseline("relative module name as file", baselines); function testLoadAsFile(scenario: string, containingFileName: string, moduleFileNameNoExt: string, moduleName: string): void { diff --git a/src/testRunner/unittests/printer.ts b/src/testRunner/unittests/printer.ts index eac7ed1cdac4f..b6b3bc7b3508a 100644 --- a/src/testRunner/unittests/printer.ts +++ b/src/testRunner/unittests/printer.ts @@ -113,7 +113,7 @@ describe("unittests:: PrinterAPI", () => { }); }); - describe("No duplicate ref directives when emiting .d.ts->.d.ts", () => { + describe("No duplicate ref directives when emitting .d.ts->.d.ts", () => { it("without statements", () => { const host = new fakes.CompilerHost( new vfs.FileSystem(/*ignoreCase*/ true, { diff --git a/src/testRunner/unittests/reuseProgramStructure.ts b/src/testRunner/unittests/reuseProgramStructure.ts index 2e148439626f6..4a56eec75b2dd 100644 --- a/src/testRunner/unittests/reuseProgramStructure.ts +++ b/src/testRunner/unittests/reuseProgramStructure.ts @@ -270,7 +270,7 @@ describe("unittests:: reuseProgramStructure:: General", () => { runBaseline("resolution cache follows imports", baselines); }); - it("set the resolvedImports after re-using an ambient external module declaration", () => { + it("set the resolvedImports after reusing an ambient external module declaration", () => { const files = [ { name: "/home/src/workspaces/project/a.ts", text: SourceText.New("", "", 'import * as a from "a";') }, { name: "/home/src/workspaces/project/types/zzz/index.d.ts", text: SourceText.New("", "", 'declare module "a" { }') }, @@ -283,7 +283,7 @@ describe("unittests:: reuseProgramStructure:: General", () => { files[0].text = files[0].text.updateProgram('import * as aa from "a";'); }); baselineProgram(baselines, program2); - runBaseline("resolvedImports after re-using an ambient external module declaration", baselines); + runBaseline("resolvedImports after reusing an ambient external module declaration", baselines); }); it("works with updated SourceFiles", () => { @@ -568,7 +568,7 @@ describe("unittests:: reuseProgramStructure:: General", () => { }); }); - it("forceConsistentCasingInFileNames:: handles file preprocessing dignostics", () => { + it("forceConsistentCasingInFileNames:: handles file preprocessing diagnostics", () => { const files = [ { name: "/home/src/workspaces/project/src/project/src/struct.d.ts", @@ -650,10 +650,10 @@ describe("unittests:: reuseProgramStructure:: General", () => { /*useCaseSensitiveFileNames*/ false, ); baselineProgram(baselines, program3); - runBaseline("handles file preprocessing dignostics", baselines); + runBaseline("handles file preprocessing diagnostics", baselines); }); - it("forceConsistentCasingInFileNames:: handles file preprocessing dignostics when diagnostics are not queried", () => { + it("forceConsistentCasingInFileNames:: handles file preprocessing diagnostics when diagnostics are not queried", () => { const files = [ { name: "/home/src/workspaces/project/src/project/src/struct.d.ts", @@ -767,7 +767,7 @@ describe("unittests:: reuseProgramStructure:: General", () => { ); baselineProgram(baselines, program5); baselineDiagnostics(baselines, program4); - runBaseline("handles file preprocessing dignostics when diagnostics are not queried", baselines); + runBaseline("handles file preprocessing diagnostics when diagnostics are not queried", baselines); }); it("isSourceFileDefaultLibrary is preserved after program reuse", () => { diff --git a/src/testRunner/unittests/services/languageService.ts b/src/testRunner/unittests/services/languageService.ts index d663d5602ca8f..a719eb6ee136a 100644 --- a/src/testRunner/unittests/services/languageService.ts +++ b/src/testRunner/unittests/services/languageService.ts @@ -51,8 +51,8 @@ export function Component(x: Config): any;`, }); } // Regression test for GH #18245 - bug in single line comment writer caused a debug assertion when attempting - // to write an alias to a module's default export was referrenced across files and had no default export - it("should be able to create a language service which can respond to deinition requests without throwing", () => { + // to write an alias to a module's default export was referenced across files and had no default export + it("should be able to create a language service which can respond to definition requests without throwing", () => { const languageService = createLanguageService(); const definitions = languageService.getDefinitionAtPosition("foo.ts", 160); // 160 is the latter `vueTemplateHtml` position expect(definitions).to.exist; // eslint-disable-line @typescript-eslint/no-unused-expressions diff --git a/src/testRunner/unittests/tsbuild/amdModulesWithOut.ts b/src/testRunner/unittests/tsbuild/amdModulesWithOut.ts index a9e914798bbf2..0205c5ac0cdfb 100644 --- a/src/testRunner/unittests/tsbuild/amdModulesWithOut.ts +++ b/src/testRunner/unittests/tsbuild/amdModulesWithOut.ts @@ -6,12 +6,12 @@ import { TestServerHost } from "../helpers/virtualFileSystemWithWatch.js"; describe("unittests:: tsbuild:: outFile:: amdModulesWithOut:: on amd modules with --out", () => { function outFileSys(prepend?: boolean) { return TestServerHost.createWatchedSystem({ - "/home/src/workspaces/soltion/app/file3.ts": dedent` + "/home/src/workspaces/solution/app/file3.ts": dedent` export const z = 30; import { x } from "file1"; `, - "/home/src/workspaces/soltion/app/file4.ts": `const myVar = 30;`, - "/home/src/workspaces/soltion/app/tsconfig.json": jsonToReadableText({ + "/home/src/workspaces/solution/app/file4.ts": `const myVar = 30;`, + "/home/src/workspaces/solution/app/tsconfig.json": jsonToReadableText({ compilerOptions: { target: "es5", module: "amd", @@ -26,11 +26,11 @@ describe("unittests:: tsbuild:: outFile:: amdModulesWithOut:: on amd modules wit { path: "../lib", prepend }, ], }), - "/home/src/workspaces/soltion/lib/file0.ts": `const myGlob = 20;`, - "/home/src/workspaces/soltion/lib/file1.ts": `export const x = 10;`, - "/home/src/workspaces/soltion/lib/file2.ts": `export const y = 20;`, - "/home/src/workspaces/soltion/lib/global.ts": `const globalConst = 10;`, - "/home/src/workspaces/soltion/lib/tsconfig.json": jsonToReadableText({ + "/home/src/workspaces/solution/lib/file0.ts": `const myGlob = 20;`, + "/home/src/workspaces/solution/lib/file1.ts": `export const x = 10;`, + "/home/src/workspaces/solution/lib/file2.ts": `export const y = 20;`, + "/home/src/workspaces/solution/lib/global.ts": `const globalConst = 10;`, + "/home/src/workspaces/solution/lib/tsconfig.json": jsonToReadableText({ compilerOptions: { target: "es5", module: "amd", @@ -42,7 +42,7 @@ describe("unittests:: tsbuild:: outFile:: amdModulesWithOut:: on amd modules wit }, exclude: ["module.d.ts"], }), - }, { currentDirectory: "/home/src/workspaces/soltion" }); + }, { currentDirectory: "/home/src/workspaces/solution" }); } verifyTsc({ @@ -53,7 +53,7 @@ describe("unittests:: tsbuild:: outFile:: amdModulesWithOut:: on amd modules wit baselineSourceMap: true, edits: [{ caption: "incremental-declaration-doesnt-change", - edit: sys => sys.appendFile("/home/src/workspaces/soltion/lib/file1.ts", "console.log(x);"), + edit: sys => sys.appendFile("/home/src/workspaces/solution/lib/file1.ts", "console.log(x);"), }], }); @@ -65,7 +65,7 @@ describe("unittests:: tsbuild:: outFile:: amdModulesWithOut:: on amd modules wit baselineSourceMap: true, edits: [{ caption: "incremental-declaration-doesnt-change", - edit: sys => sys.appendFile("/home/src/workspaces/soltion/lib/file1.ts", "console.log(x);"), + edit: sys => sys.appendFile("/home/src/workspaces/solution/lib/file1.ts", "console.log(x);"), }], }); @@ -77,9 +77,9 @@ describe("unittests:: tsbuild:: outFile:: amdModulesWithOut:: on amd modules wit commandLineArgs: ["-b", "app", "--verbose"], modifySystem: sys => { // Make lib to output to parent dir - sys.replaceFileText("/home/src/workspaces/soltion/lib/tsconfig.json", `"outFile": "module.js"`, `"outFile": "../module.js", "rootDir": "../"`); + sys.replaceFileText("/home/src/workspaces/solution/lib/tsconfig.json", `"outFile": "module.js"`, `"outFile": "../module.js", "rootDir": "../"`); // Change reference to file1 module to resolve to lib/file1 - sys.replaceFileText("/home/src/workspaces/soltion/app/file3.ts", "file1", "lib/file1"); + sys.replaceFileText("/home/src/workspaces/solution/app/file3.ts", "file1", "lib/file1"); }, baselineSourceMap: true, }); diff --git a/src/testRunner/unittests/tsbuildWatch/programUpdates.ts b/src/testRunner/unittests/tsbuildWatch/programUpdates.ts index b1cf3a8f9826e..965172b01497b 100644 --- a/src/testRunner/unittests/tsbuildWatch/programUpdates.ts +++ b/src/testRunner/unittests/tsbuildWatch/programUpdates.ts @@ -674,7 +674,7 @@ createSomeObject().message;`, timeouts: sys => sys.runQueuedTimeoutCallbacks(), // Build project2 }, { - caption: "update aplha config", + caption: "update alpha config", edit: sys => sys.writeFile("/user/username/projects/project/alpha.tsconfig.json", "{}"), timeouts: sys => sys.runQueuedTimeoutCallbacks(), // build project1 }, diff --git a/src/testRunner/unittests/tsc/noEmitOnError.ts b/src/testRunner/unittests/tsc/noEmitOnError.ts index 09959e154ea90..2851a8e1f02d1 100644 --- a/src/testRunner/unittests/tsc/noEmitOnError.ts +++ b/src/testRunner/unittests/tsc/noEmitOnError.ts @@ -30,7 +30,7 @@ describe("unittests:: tsc:: noEmitOnError::", () => { commandLineArgs: ["--declarationMap"], discrepancyExplanation: () => [ `Clean build does not emit any file so will have emitSignatures with all files since they are not emitted`, - `Incremental build has emitSignatures from before, so it will have a.ts with signature since file.version isnt same`, + `Incremental build has emitSignatures from before, so it will have a.ts with signature since file.version isn't same`, `Incremental build will also have emitSignatureDtsMapDiffers for both files since the emitSignatures were without declarationMap but currentOptions have declrationMap`, ], }, diff --git a/src/testRunner/unittests/tscWatch/libraryResolution.ts b/src/testRunner/unittests/tscWatch/libraryResolution.ts index e54ab5e2d8ee7..48cf45219f0d4 100644 --- a/src/testRunner/unittests/tscWatch/libraryResolution.ts +++ b/src/testRunner/unittests/tscWatch/libraryResolution.ts @@ -29,7 +29,7 @@ describe("unittests:: tscWatch:: libraryResolution::", () => { verifyTscWatch({ scenario: "libraryResolution", - subScenario: "unknwon lib", + subScenario: "unknown lib", sys: getSysForLibResolutionUnknown, commandLineArgs: commandLineArgs(/*withoutConfig*/ undefined), edits: [ diff --git a/src/testRunner/unittests/tscWatch/programUpdates.ts b/src/testRunner/unittests/tscWatch/programUpdates.ts index fed193fbe900c..00492030c8f26 100644 --- a/src/testRunner/unittests/tscWatch/programUpdates.ts +++ b/src/testRunner/unittests/tscWatch/programUpdates.ts @@ -256,7 +256,7 @@ describe("unittests:: tscWatch:: programUpdates::", () => { verifyTscWatch({ scenario, - subScenario: "works correctly when config file is changed but its content havent", + subScenario: "works correctly when config file is changed but its content haven't", commandLineArgs: ["-w"], sys: () => { const configFile: File = { @@ -684,14 +684,14 @@ export class A { path: "/user/username/workspace/solution/projects/project/f1.ts", content: ` export * from "../projectc/f2"; - export * from "../projectd/f3";`, + export * from "../projected/f3";`, }; const file2 = { path: "/user/username/workspace/solution/projects/projectc/f2.ts", content: "export let x = 1;", }; const file3 = { - path: "/user/username/workspace/solution/projects/projectd/f3.ts", + path: "/user/username/workspace/solution/projects/projected/f3.ts", content: "export let y = 1;", }; const { sys, baseline, cb, getPrograms } = createBaseline(TestServerHost.createWatchedSystem( @@ -715,7 +715,7 @@ export class A { }); const { cb: cb2, getPrograms: getPrograms2 } = commandLineCallbacks(sys); - baseline.push("createing separate watcher"); + baseline.push("creating separate watcher"); ts.createWatchProgram(createWatchCompilerHostOfFilesAndCompilerOptionsForBaseline({ rootFiles: [file1.path], system: sys, @@ -791,7 +791,7 @@ export class A { verifyTscWatch({ scenario, - subScenario: "correctly parses wild card directories from implicit glob when two keys differ only in directory seperator", + subScenario: "correctly parses wild card directories from implicit glob when two keys differ only in directory separator", commandLineArgs: ["-w", "--extendedDiagnostics"], sys: () => { const file1 = { @@ -1465,7 +1465,7 @@ declare const eval: any`, verifyTscWatch({ scenario, - subScenario: "shouldnt report error about unused function incorrectly when file changes from global to module", + subScenario: "shouldn't report error about unused function incorrectly when file changes from global to module", commandLineArgs: ["-w", "/user/username/workspace/solution/projects/project/file.ts", "--noUnusedLocals"], sys: () => { const file: File = { @@ -2414,11 +2414,11 @@ import { x } from "../b";`, sys: () => { const module1: File = { path: `/user/username/projects/myproject/a.js`, - content: `export const aNumber: number = "string"`, + content: `export const a number: number = "string"`, }; const module2: File = { path: `/user/username/projects/myproject/b.ts`, - content: `import { aNumber } from "./a.js";`, + content: `import { a number } from "./a.js";`, }; const config: File = { path: `/user/username/projects/myproject/tsconfig.json`, diff --git a/src/testRunner/unittests/tscWatch/projectsWithReferences.ts b/src/testRunner/unittests/tscWatch/projectsWithReferences.ts index e100508c8777c..cf0d93de60843 100644 --- a/src/testRunner/unittests/tscWatch/projectsWithReferences.ts +++ b/src/testRunner/unittests/tscWatch/projectsWithReferences.ts @@ -394,7 +394,7 @@ X;`, commandLineArgs: ["-w", "-p", "logic", "--traceResolution", "--explainFiles"], edits: [ { - caption: "change declration map in core", + caption: "change declaration map in core", edit: sys => { sys.replaceFileText("/user/username/projects/sample1/core/tsconfig.json", `"declarationMap": true,`, `"declarationMap": false,`); const solutionBuilder = createSolutionBuilder(sys, ["core"]); diff --git a/src/testRunner/unittests/tscWatch/watchApi.ts b/src/testRunner/unittests/tscWatch/watchApi.ts index e0f877db4f68c..c7dc12ea1d1a1 100644 --- a/src/testRunner/unittests/tscWatch/watchApi.ts +++ b/src/testRunner/unittests/tscWatch/watchApi.ts @@ -679,7 +679,7 @@ describe("unittests:: tscWatch:: watchAPI:: when builder emit occurs with emitOn timeouts: sys => sys.runQueuedTimeoutCallbacks(), }, { - caption: "Emit with emitOnlyDts shouldnt emit anything", + caption: "Emit with emitOnlyDts shouldn't emit anything", edit: () => { const program = watch.getCurrentProgram(); program.emit(/*targetSourceFile*/ undefined, /*writeFile*/ undefined, /*cancellationToken*/ undefined, /*emitOnlyDtsFiles*/ true); @@ -697,7 +697,7 @@ describe("unittests:: tscWatch:: watchAPI:: when builder emit occurs with emitOn timeouts: ts.noop, }, { - caption: "Emit with emitOnlyDts shouldnt emit anything", + caption: "Emit with emitOnlyDts shouldn't emit anything", edit: () => { const program = watch.getCurrentProgram(); program.emit(/*targetSourceFile*/ undefined, /*writeFile*/ undefined, /*cancellationToken*/ undefined, /*emitOnlyDtsFiles*/ true); diff --git a/src/testRunner/unittests/tscWatch/watchEnvironment.ts b/src/testRunner/unittests/tscWatch/watchEnvironment.ts index 5611a24a12008..0c2c21236bb60 100644 --- a/src/testRunner/unittests/tscWatch/watchEnvironment.ts +++ b/src/testRunner/unittests/tscWatch/watchEnvironment.ts @@ -660,7 +660,7 @@ describe("unittests:: tscWatch:: watchEnvironment:: tsc-watch with different pol verifyTscWatch({ scenario, - subScenario: `fsWatch/when using file watching thats when rename occurs when file is still on the disk`, + subScenario: `fsWatch/when using file watching that's when rename occurs when file is still on the disk`, commandLineArgs: ["-w", "--extendedDiagnostics"], sys: () => TestServerHost.createWatchedSystem( @@ -697,7 +697,7 @@ describe("unittests:: tscWatch:: watchEnvironment:: tsc-watch with different pol describe("with fsWatch on inodes", () => { verifyTscWatch({ scenario, - subScenario: `fsWatch/when using file watching thats on inode`, + subScenario: `fsWatch/when using file watching that's on inode`, commandLineArgs: ["-w", "--extendedDiagnostics"], sys: () => TestServerHost.createWatchedSystem( @@ -727,7 +727,7 @@ describe("unittests:: tscWatch:: watchEnvironment:: tsc-watch with different pol verifyTscWatch({ scenario, - subScenario: `fsWatch/when using file watching thats on inode when rename event ends with tilde`, + subScenario: `fsWatch/when using file watching that's on inode when rename event ends with tilde`, commandLineArgs: ["-w", "--extendedDiagnostics"], sys: () => TestServerHost.createWatchedSystem( @@ -757,7 +757,7 @@ describe("unittests:: tscWatch:: watchEnvironment:: tsc-watch with different pol verifyTscWatch({ scenario, - subScenario: `fsWatch/when using file watching thats on inode when rename occurs when file is still on the disk`, + subScenario: `fsWatch/when using file watching that's on inode when rename occurs when file is still on the disk`, commandLineArgs: ["-w", "--extendedDiagnostics"], sys: () => TestServerHost.createWatchedSystem( diff --git a/src/testRunner/unittests/tsserver/autoImportProvider.ts b/src/testRunner/unittests/tsserver/autoImportProvider.ts index 870102e1edb99..ee60122313aae 100644 --- a/src/testRunner/unittests/tsserver/autoImportProvider.ts +++ b/src/testRunner/unittests/tsserver/autoImportProvider.ts @@ -255,7 +255,7 @@ describe("unittests:: tsserver:: autoImportProvider::", () => { baselineTsserverLogs("autoImportProvider", "Responds to manual changes in node_modules", session); }); - it("Recovers from an unparseable package.json", () => { + it("Recovers from an unparsable package.json", () => { const { session, host } = setup([ angularFormsDts, angularFormsPackageJson, @@ -272,7 +272,7 @@ describe("unittests:: tsserver:: autoImportProvider::", () => { session.host.baselineHost("Before getAutoImportProvider"); assert.ok(session.getProjectService().configuredProjects.get(tsconfig.path)!.getLanguageService().getAutoImportProvider()); session.host.baselineHost("After getAutoImportProvider"); - baselineTsserverLogs("autoImportProvider", "Recovers from an unparseable package_json", session); + baselineTsserverLogs("autoImportProvider", "Recovers from an unparsable package_json", session); }); it("Does not create an auto import provider if there are too many dependencies", () => { diff --git a/src/testRunner/unittests/tsserver/auxiliaryProject.ts b/src/testRunner/unittests/tsserver/auxiliaryProject.ts index 94dd588333ba0..8ce6355d3cbad 100644 --- a/src/testRunner/unittests/tsserver/auxiliaryProject.ts +++ b/src/testRunner/unittests/tsserver/auxiliaryProject.ts @@ -13,7 +13,7 @@ import { } from "../helpers/virtualFileSystemWithWatch.js"; describe("unittests:: tsserver:: auxiliaryProject::", () => { - it("AuxiliaryProject does not remove scrips from InferredProject", () => { + it("AuxiliaryProject does not remove scripts from InferredProject", () => { const aTs: File = { path: "/user/username/projects/project/a.ts", content: `import { B } from "./b";`, @@ -56,7 +56,7 @@ describe("unittests:: tsserver:: auxiliaryProject::", () => { assert(!bJsScriptInfo.isOrphan()); assert(ts.server.scriptInfoIsContainedByBackgroundProject(bJsScriptInfo)); assert.equal(bJsScriptInfo.getDefaultProject().projectKind, ts.server.ProjectKind.Inferred); - baselineTsserverLogs("auxiliaryProject", "does not remove scrips from InferredProject", session); + baselineTsserverLogs("auxiliaryProject", "does not remove scripts from InferredProject", session); }); it("file is added later through finding definition", () => { @@ -91,7 +91,7 @@ describe("unittests:: tsserver:: auxiliaryProject::", () => { export class Yargs { positional() { } } `, "/user/users/projects/myproject/node_modules/yargs/index.js": dedent` - // Specifically didnt have ./callback import to ensure that resolving module sepcifier adds the file to project at later stage + // Specifically didn't have ./callback import to ensure that resolving module specifier adds the file to project at later stage export function command(cmd, cb) { cb(Yargs) } `, [indexFile.path]: indexFile.content, @@ -146,7 +146,7 @@ describe("unittests:: tsserver:: auxiliaryProject::", () => { export class Yargs { positional() { } } `, "/user/users/projects/myproject/node_modules/yargs/index.js": dedent` - // Specifically didnt have ./callback import to ensure that resolving module sepcifier adds the file to project at later stage + // Specifically didn't have ./callback import to ensure that resolving module specifier adds the file to project at later stage export function command(cmd, cb) { cb(Yargs) } `, "/user/users/projects/myproject/folder/random.ts": dedent` diff --git a/src/testRunner/unittests/tsserver/cachingFileSystemInformation.ts b/src/testRunner/unittests/tsserver/cachingFileSystemInformation.ts index 8a5b3e060423d..ac83fdb035970 100644 --- a/src/testRunner/unittests/tsserver/cachingFileSystemInformation.ts +++ b/src/testRunner/unittests/tsserver/cachingFileSystemInformation.ts @@ -243,7 +243,7 @@ describe("unittests:: tsserver:: cachingFileSystemInformation:: tsserverProjectS openFilesForSession([clientFile], session); const logCacheAndClear = createLoggerTrackingHostCalls(host); - // Get definitions shouldnt make host requests + // Get definitions shouldn't make host requests session.executeCommandSeq({ command: ts.server.protocol.CommandTypes.Definition, arguments: { diff --git a/src/testRunner/unittests/tsserver/compileOnSave.ts b/src/testRunner/unittests/tsserver/compileOnSave.ts index aed628fe8bdeb..e51bd408f0181 100644 --- a/src/testRunner/unittests/tsserver/compileOnSave.ts +++ b/src/testRunner/unittests/tsserver/compileOnSave.ts @@ -171,7 +171,7 @@ describe("unittests:: tsserver:: compileOnSave:: affected list", () => { command: ts.server.protocol.CommandTypes.CompileOnSaveAffectedFileList, arguments: { file: moduleFile1.path, projectFileName: configFile.path }, }); - baselineTsserverLogs("compileOnSave", "configProjects uptodate with reference map changes", session); + baselineTsserverLogs("compileOnSave", "configProjects up-to-date with reference map changes", session); }); it("should be up-to-date with changes made in non-open files", () => { @@ -204,7 +204,7 @@ describe("unittests:: tsserver:: compileOnSave:: affected list", () => { command: ts.server.protocol.CommandTypes.CompileOnSaveAffectedFileList, arguments: { file: moduleFile1.path, projectFileName: configFile.path }, }); - baselineTsserverLogs("compileOnSave", "configProjects uptodate with changes in non open files", session); + baselineTsserverLogs("compileOnSave", "configProjects up-to-date with changes in non open files", session); }); it("should be up-to-date with deleted files", () => { @@ -235,7 +235,7 @@ describe("unittests:: tsserver:: compileOnSave:: affected list", () => { command: ts.server.protocol.CommandTypes.CompileOnSaveAffectedFileList, arguments: { file: moduleFile1.path, projectFileName: configFile.path }, }); - baselineTsserverLogs("compileOnSave", "configProjects uptodate with deleted files", session); + baselineTsserverLogs("compileOnSave", "configProjects up-to-date with deleted files", session); }); it("should be up-to-date with newly created files", () => { @@ -270,7 +270,7 @@ describe("unittests:: tsserver:: compileOnSave:: affected list", () => { command: ts.server.protocol.CommandTypes.CompileOnSaveAffectedFileList, arguments: { file: moduleFile1.path, projectFileName: configFile.path }, }); - baselineTsserverLogs("compileOnSave", "configProjects uptodate with new files", session); + baselineTsserverLogs("compileOnSave", "configProjects up-to-date with new files", session); }); it("should detect changes in non-root files", () => { @@ -784,7 +784,7 @@ describe("unittests:: tsserver:: compileOnSave:: EmitFile test", () => { baselineTsserverLogs("compileOnSave", "emit specified file", session); }); - it("shoud not emit js files in external projects", () => { + it("should not emit js files in external projects", () => { const file1 = { path: "/home/src/workspace/projects/b/file1.ts", content: "consonle.log('file1');", @@ -851,7 +851,7 @@ describe("unittests:: tsserver:: compileOnSave:: EmitFile test", () => { it("with rich Response set to false", () => { verify(/*richResponse*/ false); }); - it("with rich Repsonse", () => { + it("with rich Response", () => { verify(/*richResponse*/ true); }); diff --git a/src/testRunner/unittests/tsserver/findAllReferences.ts b/src/testRunner/unittests/tsserver/findAllReferences.ts index 8fae4d0f40f9f..e569de35f905e 100644 --- a/src/testRunner/unittests/tsserver/findAllReferences.ts +++ b/src/testRunner/unittests/tsserver/findAllReferences.ts @@ -128,7 +128,7 @@ const bar: Bar = { // so `babel-loader` is still a containing project of `loading-indicator` file. assert(loadingIndicatorScriptInfo.containingProjects.find(p => p.projectName === "/home/src/projects/project/packages/babel-loader/tsconfig.json")); // When calling find all references, - // we shouldn't crash due to using outdated information on a file's containig projects. + // we shouldn't crash due to using outdated information on a file's containing projects. session.executeCommandSeq({ command: protocol.CommandTypes.References, arguments: { diff --git a/src/testRunner/unittests/tsserver/getEditsForFileRename.ts b/src/testRunner/unittests/tsserver/getEditsForFileRename.ts index e1363baf1dd48..a7311197006fa 100644 --- a/src/testRunner/unittests/tsserver/getEditsForFileRename.ts +++ b/src/testRunner/unittests/tsserver/getEditsForFileRename.ts @@ -118,7 +118,7 @@ describe("unittests:: tsserver:: getEditsForFileRename::", () => { [true, false].forEach(openedBeforeChange => { [true, false].forEach(closedBeforeChange => { if (closedBeforeChange && !openedBeforeChange) return; - it(`works with when file is opened ${openedBeforeChange ? "before" : "after"} seeing file existance on the disk${closedBeforeChange ? " closed before change" : ""}${withUpdateOpen ? " with updateOpen" : ""}`, () => { + it(`works with when file is opened ${openedBeforeChange ? "before" : "after"} seeing file existence on the disk${closedBeforeChange ? " closed before change" : ""}${withUpdateOpen ? " with updateOpen" : ""}`, () => { const oldFilePath = "/home/src/projects/myproject/src/old.ts"; const host = TestServerHost.createServerHost({ "/home/src/projects/myproject/src/index.ts": `import {} from '@/old';`, @@ -202,7 +202,7 @@ describe("unittests:: tsserver:: getEditsForFileRename::", () => { session, files: ["/home/src/projects/myproject/src/index.ts"], }); - baselineTsserverLogs("getEditsForFileRename", `works with when file is opened ${openedBeforeChange ? "before" : "after"} seeing file existance on the disk${closedBeforeChange ? " closed before change" : ""}${withUpdateOpen ? " with updateOpen" : ""}`, session); + baselineTsserverLogs("getEditsForFileRename", `works with when file is opened ${openedBeforeChange ? "before" : "after"} seeing file existence on the disk${closedBeforeChange ? " closed before change" : ""}${withUpdateOpen ? " with updateOpen" : ""}`, session); }); }); }) diff --git a/src/testRunner/unittests/tsserver/importHelpers.ts b/src/testRunner/unittests/tsserver/importHelpers.ts index 456172213cc5c..1aec59d928d61 100644 --- a/src/testRunner/unittests/tsserver/importHelpers.ts +++ b/src/testRunner/unittests/tsserver/importHelpers.ts @@ -29,7 +29,7 @@ describe("unittests:: tsserver:: importHelpers::", () => { baselineTsserverLogs("importHelpers", "should not crash in tsserver", session); }); - it("import helpers sucessfully", () => { + it("import helpers successfully", () => { const type1 = { path: "/user/username/workspace/projects/project/type.ts", content: ` diff --git a/src/testRunner/unittests/tsserver/occurences.ts b/src/testRunner/unittests/tsserver/occurences.ts index c3b0606b1548d..6a7085f7ee7ef 100644 --- a/src/testRunner/unittests/tsserver/occurences.ts +++ b/src/testRunner/unittests/tsserver/occurences.ts @@ -9,7 +9,7 @@ import { TestServerHost, } from "../helpers/virtualFileSystemWithWatch.js"; -describe("unittests:: tsserver:: occurences:: highlight on string", () => { +describe("unittests:: tsserver:: occurrences:: highlight on string", () => { it("should be marked if only on string values", () => { const file1: File = { path: "/home/src/projects/project/a/b/file1.ts", @@ -33,6 +33,6 @@ describe("unittests:: tsserver:: occurences:: highlight on string", () => { command: ts.server.protocol.CommandTypes.DocumentHighlights, arguments: { file: file1.path, line: 4, offset: 14, filesToSearch: [file1.path] }, }); - baselineTsserverLogs("occurences", "should be marked if only on string values", session); + baselineTsserverLogs("occurrences", "should be marked if only on string values", session); }); }); diff --git a/src/testRunner/unittests/tsserver/projectReferenceCompileOnSave.ts b/src/testRunner/unittests/tsserver/projectReferenceCompileOnSave.ts index 0d04f6af541b1..6c63b62c2ae02 100644 --- a/src/testRunner/unittests/tsserver/projectReferenceCompileOnSave.ts +++ b/src/testRunner/unittests/tsserver/projectReferenceCompileOnSave.ts @@ -269,7 +269,7 @@ fn2(); command: ts.server.protocol.CommandTypes.EmitOutput, arguments: { file: usageTs.path }, }); - baselineTsserverLogs("projectReferenceCompileOnSave", "when dependency project is not open and save on usage and change to depenedency", session); + baselineTsserverLogs("projectReferenceCompileOnSave", "when dependency project is not open and save on usage and change to dependency", session); }); it("with change to dependency, with specifying project file", () => { const host = TestServerHost.createServerHost([dependencyTs, dependencyConfig, usageTs, usageConfig]); @@ -299,7 +299,7 @@ fn2(); command: ts.server.protocol.CommandTypes.EmitOutput, arguments: { file: usageTs.path, projectFileName: usageConfig.path }, }); - baselineTsserverLogs("projectReferenceCompileOnSave", "when dependency project is not open and save on usage with project and change to depenedency", session); + baselineTsserverLogs("projectReferenceCompileOnSave", "when dependency project is not open and save on usage with project and change to dependency", session); }); it("with change to usage, without specifying project file", () => { const host = TestServerHost.createServerHost([dependencyTs, dependencyConfig, usageTs, usageConfig]); @@ -721,7 +721,7 @@ fn2(); }); }); - describe("when the depedency file is open", () => { + describe("when the dependency file is open", () => { describe("Of usageTs", () => { it("with initial file open, without specifying project file", () => { const host = TestServerHost.createServerHost([dependencyTs, dependencyConfig, usageTs, usageConfig]); diff --git a/src/testRunner/unittests/tsserver/projectReferenceErrors.ts b/src/testRunner/unittests/tsserver/projectReferenceErrors.ts index 910498d1e8f03..a5d1f4e6e07e5 100644 --- a/src/testRunner/unittests/tsserver/projectReferenceErrors.ts +++ b/src/testRunner/unittests/tsserver/projectReferenceErrors.ts @@ -51,10 +51,10 @@ describe("unittests:: tsserver:: projectReferenceErrors:: with project reference }); }); - describe("when the depedency file is open", () => { + describe("when the dependency file is open", () => { verifyGetErrScenario({ scenario: "projectReferenceErrors", - subScenario: `${scenario} when the depedency file is open`, + subScenario: `${scenario} when the dependency file is open`, allFiles: () => [dependencyTs, dependencyConfig, usageTs, usageConfig], openFiles: () => [usageTs, dependencyTs], getErrRequest: () => [usageTs, dependencyTs], diff --git a/src/testRunner/unittests/tsserver/projectReferences.ts b/src/testRunner/unittests/tsserver/projectReferences.ts index 65228e4f13d3c..0eb70064046ae 100644 --- a/src/testRunner/unittests/tsserver/projectReferences.ts +++ b/src/testRunner/unittests/tsserver/projectReferences.ts @@ -650,7 +650,7 @@ testCompositeFunction('why hello there', 42);`, openFilesForSession([programFile], session); // Find all references for getSourceFile - // Shouldnt load more projects + // Shouldn't load more projects session.executeCommandSeq({ command: ts.server.protocol.CommandTypes.References, arguments: protocolFileLocationFromSubstring(programFile, "getSourceFile", { index: 1 }), diff --git a/src/testRunner/unittests/tsserver/projectReferencesSourcemap.ts b/src/testRunner/unittests/tsserver/projectReferencesSourcemap.ts index 5423b784a39bd..69dc4c4dd7dcd 100644 --- a/src/testRunner/unittests/tsserver/projectReferencesSourcemap.ts +++ b/src/testRunner/unittests/tsserver/projectReferencesSourcemap.ts @@ -483,7 +483,7 @@ fn5(); }); }); - describe("when opening depedency and usage project: goToDef and rename", () => { + describe("when opening dependency and usage project: goToDef and rename", () => { verifyScenario({ scenarioLocation: "dependencyAndUsage", scenario: "goToDef and rename locations", diff --git a/src/testRunner/unittests/tsserver/projects.ts b/src/testRunner/unittests/tsserver/projects.ts index e3c975ed6c2ca..bfcdc673f6631 100644 --- a/src/testRunner/unittests/tsserver/projects.ts +++ b/src/testRunner/unittests/tsserver/projects.ts @@ -697,14 +697,14 @@ describe("unittests:: tsserver:: projects::", () => { // Specify .html extension as mixed content in a configure host request const extraFileExtensions = [{ extension: ".html", scriptKind: ts.ScriptKind.JS, isMixedContent: true }]; - verfiy(config1, TestServerHost.createServerHost([file1, file2, config1])); + verify(config1, TestServerHost.createServerHost([file1, file2, config1])); // #2. Ensure no errors when allowJs is false const config2 = { path: "/user/username/projects/project/tsconfig.json", content: jsonToReadableText({ compilerOptions: { allowJs: false } }), }; - verfiy(config2, TestServerHost.createServerHost([file1, file2, config2])); + verify(config2, TestServerHost.createServerHost([file1, file2, config2])); // #3. Ensure no errors when compiler options aren't specified const config3 = { @@ -712,7 +712,7 @@ describe("unittests:: tsserver:: projects::", () => { content: jsonToReadableText({}), }; - verfiy(config3, TestServerHost.createServerHost([file1, file2, config3])); + verify(config3, TestServerHost.createServerHost([file1, file2, config3])); // #4. Ensure no errors when files are explicitly specified in tsconfig const config4 = { @@ -720,7 +720,7 @@ describe("unittests:: tsserver:: projects::", () => { content: jsonToReadableText({ compilerOptions: { allowJs: true }, files: [file1.path, file2.path] }), }; - verfiy(config4, TestServerHost.createServerHost([file1, file2, config4])); + verify(config4, TestServerHost.createServerHost([file1, file2, config4])); // #4. Ensure no errors when files are explicitly excluded in tsconfig const config5 = { @@ -728,10 +728,10 @@ describe("unittests:: tsserver:: projects::", () => { content: jsonToReadableText({ compilerOptions: { allowJs: true }, exclude: [file2.path] }), }; - const session = verfiy(config5, TestServerHost.createServerHost([file1, file2, config5])); + const session = verify(config5, TestServerHost.createServerHost([file1, file2, config5])); baselineTsserverLogs("projects", "no tsconfig script block diagnostic errors", session); - function verfiy(config: File, host: TestServerHost) { + function verify(config: File, host: TestServerHost) { logger.host = host; const session = new TestSession({ host, logger }); session.executeCommandSeq({ diff --git a/src/testRunner/unittests/tsserver/session.ts b/src/testRunner/unittests/tsserver/session.ts index acd2344b4f154..a631401d2beab 100644 --- a/src/testRunner/unittests/tsserver/session.ts +++ b/src/testRunner/unittests/tsserver/session.ts @@ -275,7 +275,7 @@ describe("unittests:: tsserver:: Session:: General functionality", () => { }); describe("send", () => { - it("is an overrideable handle which sends protocol messages over the wire", () => { + it("is an overridable handle which sends protocol messages over the wire", () => { const msg: ts.server.protocol.Request = { seq: 0, type: "request", command: "" }; const strmsg = JSON.stringify(msg); const len = 1 + Buffer.byteLength(strmsg, "utf8"); diff --git a/tests/baselines/reference/api/typescript.d.ts b/tests/baselines/reference/api/typescript.d.ts index 0f39eae746a04..0c6f78e23bd29 100644 --- a/tests/baselines/reference/api/typescript.d.ts +++ b/tests/baselines/reference/api/typescript.d.ts @@ -890,7 +890,7 @@ declare namespace ts { kind: HighlightSpanKind; } /** - * Represents a set of highligh spans for a give name + * Represents a set of highlight spans for a give name */ export interface DocumentHighlightsItem { /** @@ -1852,7 +1852,7 @@ declare namespace ts { includeLinePosition?: boolean; } /** - * Response object for synchronous sematic diagnostics request. + * Response object for synchronous semantic diagnostics request. */ export interface SemanticDiagnosticsSyncResponse extends Response { body?: Diagnostic[] | DiagnosticWithLinePosition[]; @@ -2051,7 +2051,7 @@ declare namespace ts { } export interface ConfigFileDiagnosticEventBody { /** - * The file which trigged the searching and error-checking of the config file + * The file which triggered the searching and error-checking of the config file */ triggerFile: string; /** @@ -5945,7 +5945,7 @@ declare namespace ts { * * Note that this field is only set by the module resolution process when * `moduleResolution` is `Node16` or `NodeNext`, which is implied by the `module` setting - * of `Node16` or `NodeNext`, respectively, but may be overriden (eg, by a `moduleResolution` + * of `Node16` or `NodeNext`, respectively, but may be overridden (eg, by a `moduleResolution` * of `node`). If so, this field will be unset and source files will be considered to be * CommonJS-output-format by the node module transformer and type checker, regardless of extension or context. */ @@ -9659,7 +9659,7 @@ declare namespace ts { function createEmitAndSemanticDiagnosticsBuilderProgram(newProgram: Program, host: BuilderProgramHost, oldProgram?: EmitAndSemanticDiagnosticsBuilderProgram, configFileParsingDiagnostics?: readonly Diagnostic[]): EmitAndSemanticDiagnosticsBuilderProgram; function createEmitAndSemanticDiagnosticsBuilderProgram(rootNames: readonly string[] | undefined, options: CompilerOptions | undefined, host?: CompilerHost, oldProgram?: EmitAndSemanticDiagnosticsBuilderProgram, configFileParsingDiagnostics?: readonly Diagnostic[], projectReferences?: readonly ProjectReference[]): EmitAndSemanticDiagnosticsBuilderProgram; /** - * Creates a builder thats just abstraction over program and can be used with watch + * Creates a builder that's just abstraction over program and can be used with watch */ function createAbstractBuilder(newProgram: Program, host: BuilderProgramHost, oldProgram?: BuilderProgram, configFileParsingDiagnostics?: readonly Diagnostic[]): BuilderProgram; function createAbstractBuilder(rootNames: readonly string[] | undefined, options: CompilerOptions | undefined, host?: CompilerHost, oldProgram?: BuilderProgram, configFileParsingDiagnostics?: readonly Diagnostic[], projectReferences?: readonly ProjectReference[]): BuilderProgram; @@ -9829,12 +9829,12 @@ declare namespace ts { createHash?(data: string): string; /** * Use to check file presence for source files and - * if resolveModuleNames is not provided (complier is in charge of module resolution) then module files as well + * if resolveModuleNames is not provided (compiler is in charge of module resolution) then module files as well */ fileExists(path: string): boolean; /** * Use to read file text for source files and - * if resolveModuleNames is not provided (complier is in charge of module resolution) then module files as well + * if resolveModuleNames is not provided (compiler is in charge of module resolution) then module files as well */ readFile(path: string, encoding?: string): string | undefined; /** If provided, used for module resolution as well as to handle directory structure */ @@ -9903,7 +9903,7 @@ declare namespace ts { extraFileExtensions?: readonly FileExtensionInfo[]; /** * Used to generate source file names from the config file and its include, exclude, files rules - * and also to cache the directory stucture + * and also to cache the directory structure */ readDirectory(path: string, extensions?: readonly string[], exclude?: readonly string[], include?: readonly string[], depth?: number): string[]; } @@ -9926,7 +9926,7 @@ declare namespace ts { updateRootFileNames(fileNames: string[]): void; } /** - * Create a function that reports watch status by writing to the system and handles the formating of the diagnostic + * Create a function that reports watch status by writing to the system and handles the formatting of the diagnostic */ function createBuilderStatusReporter(system: System, pretty?: boolean): DiagnosticReporter; function createSolutionBuilderHost(system?: System, createProgram?: CreateProgram, reportDiagnostic?: DiagnosticReporter, reportSolutionBuilderStatus?: DiagnosticReporter, reportErrorSummary?: ReportEmitErrorSummary): SolutionBuilderHost; @@ -10015,7 +10015,7 @@ declare namespace ts { emit(targetSourceFile?: SourceFile, writeFile?: WriteFileCallback, cancellationToken?: CancellationToken, emitOnlyDtsFiles?: boolean, customTransformers?: CustomTransformers): EmitResult | undefined; } type InvalidatedProject = UpdateOutputFileStampsProject | BuildInvalidedProject; - /** Returns true if commandline is --build and needs to be parsed useing parseBuildCommand */ + /** Returns true if commandline is --build and needs to be parsed using parseBuildCommand */ function isBuildCommand(commandLineArgs: readonly string[]): boolean; function getDefaultFormatCodeSettings(newLineCharacter?: string): FormatCodeSettings; /** @@ -10125,7 +10125,7 @@ declare namespace ts { /** * Gets errors indicating invalid syntax in a file. * - * In English, "this cdeo have, erorrs" is syntactically invalid because it has typos, + * In English, "this cdeo have, errors" is syntactically invalid because it has typos, * grammatical errors, and misplaced punctuation. Likewise, examples of syntax * errors in TypeScript are missing parentheses in an `if` statement, mismatched * curly braces, and using a reserved keyword as a variable name. @@ -10818,7 +10818,7 @@ declare namespace ts { displayName: string; /** * Full display name of item to be renamed. - * If item to be renamed is a file, then this is the original text of the module specifer + * If item to be renamed is a file, then this is the original text of the module specifier */ fullDisplayName: string; kind: ScriptElementKind; @@ -10969,7 +10969,7 @@ declare namespace ts { */ replacementSpan?: TextSpan; /** - * Indicates whether commiting this completion entry will require additional code actions to be + * Indicates whether committing this completion entry will require additional code actions to be * made to avoid errors. The CompletionEntryDetails will have these actions. */ hasAction?: true; diff --git a/tests/baselines/reference/argumentsBindsToFunctionScopeArgumentList(alwaysstrict=false).errors.txt b/tests/baselines/reference/argumentsBindsToFunctionScopeArgumentList(alwaysstrict=false).errors.txt index 6f0eacb5dff5a..6498d94dae1d1 100644 --- a/tests/baselines/reference/argumentsBindsToFunctionScopeArgumentList(alwaysstrict=false).errors.txt +++ b/tests/baselines/reference/argumentsBindsToFunctionScopeArgumentList(alwaysstrict=false).errors.txt @@ -4,7 +4,7 @@ argumentsBindsToFunctionScopeArgumentList.ts(3,5): error TS2322: Type 'number' i ==== argumentsBindsToFunctionScopeArgumentList.ts (1 errors) ==== var arguments = 10; function foo(a) { - arguments = 10; /// This shouldnt be of type number and result in error. + arguments = 10; /// This shouldn't be of type number and result in error. ~~~~~~~~~ !!! error TS2322: Type 'number' is not assignable to type 'IArguments'. } \ No newline at end of file diff --git a/tests/baselines/reference/argumentsBindsToFunctionScopeArgumentList(alwaysstrict=false).js b/tests/baselines/reference/argumentsBindsToFunctionScopeArgumentList(alwaysstrict=false).js index b18f1cc7d05f8..cdada20ee71e0 100644 --- a/tests/baselines/reference/argumentsBindsToFunctionScopeArgumentList(alwaysstrict=false).js +++ b/tests/baselines/reference/argumentsBindsToFunctionScopeArgumentList(alwaysstrict=false).js @@ -3,11 +3,11 @@ //// [argumentsBindsToFunctionScopeArgumentList.ts] var arguments = 10; function foo(a) { - arguments = 10; /// This shouldnt be of type number and result in error. + arguments = 10; /// This shouldn't be of type number and result in error. } //// [argumentsBindsToFunctionScopeArgumentList.js] var arguments = 10; function foo(a) { - arguments = 10; /// This shouldnt be of type number and result in error. + arguments = 10; /// This shouldn't be of type number and result in error. } diff --git a/tests/baselines/reference/argumentsBindsToFunctionScopeArgumentList(alwaysstrict=false).symbols b/tests/baselines/reference/argumentsBindsToFunctionScopeArgumentList(alwaysstrict=false).symbols index a7c67c1447cce..288e3b58477e2 100644 --- a/tests/baselines/reference/argumentsBindsToFunctionScopeArgumentList(alwaysstrict=false).symbols +++ b/tests/baselines/reference/argumentsBindsToFunctionScopeArgumentList(alwaysstrict=false).symbols @@ -8,6 +8,6 @@ function foo(a) { >foo : Symbol(foo, Decl(argumentsBindsToFunctionScopeArgumentList.ts, 0, 19)) >a : Symbol(a, Decl(argumentsBindsToFunctionScopeArgumentList.ts, 1, 13)) - arguments = 10; /// This shouldnt be of type number and result in error. + arguments = 10; /// This shouldn't be of type number and result in error. >arguments : Symbol(arguments) } diff --git a/tests/baselines/reference/argumentsBindsToFunctionScopeArgumentList(alwaysstrict=false).types b/tests/baselines/reference/argumentsBindsToFunctionScopeArgumentList(alwaysstrict=false).types index e85419e2d06be..4043ac651c090 100644 --- a/tests/baselines/reference/argumentsBindsToFunctionScopeArgumentList(alwaysstrict=false).types +++ b/tests/baselines/reference/argumentsBindsToFunctionScopeArgumentList(alwaysstrict=false).types @@ -13,7 +13,7 @@ function foo(a) { >a : any > : ^^^ - arguments = 10; /// This shouldnt be of type number and result in error. + arguments = 10; /// This shouldn't be of type number and result in error. >arguments = 10 : 10 > : ^^ >arguments : IArguments diff --git a/tests/baselines/reference/argumentsBindsToFunctionScopeArgumentList(alwaysstrict=true).errors.txt b/tests/baselines/reference/argumentsBindsToFunctionScopeArgumentList(alwaysstrict=true).errors.txt index e603cc83c1632..e655522e7fc80 100644 --- a/tests/baselines/reference/argumentsBindsToFunctionScopeArgumentList(alwaysstrict=true).errors.txt +++ b/tests/baselines/reference/argumentsBindsToFunctionScopeArgumentList(alwaysstrict=true).errors.txt @@ -8,7 +8,7 @@ argumentsBindsToFunctionScopeArgumentList.ts(3,5): error TS2322: Type 'number' i ~~~~~~~~~ !!! error TS1100: Invalid use of 'arguments' in strict mode. function foo(a) { - arguments = 10; /// This shouldnt be of type number and result in error. + arguments = 10; /// This shouldn't be of type number and result in error. ~~~~~~~~~ !!! error TS1100: Invalid use of 'arguments' in strict mode. ~~~~~~~~~ diff --git a/tests/baselines/reference/argumentsBindsToFunctionScopeArgumentList(alwaysstrict=true).js b/tests/baselines/reference/argumentsBindsToFunctionScopeArgumentList(alwaysstrict=true).js index 8cd10362943b0..e0a674e1da096 100644 --- a/tests/baselines/reference/argumentsBindsToFunctionScopeArgumentList(alwaysstrict=true).js +++ b/tests/baselines/reference/argumentsBindsToFunctionScopeArgumentList(alwaysstrict=true).js @@ -3,12 +3,12 @@ //// [argumentsBindsToFunctionScopeArgumentList.ts] var arguments = 10; function foo(a) { - arguments = 10; /// This shouldnt be of type number and result in error. + arguments = 10; /// This shouldn't be of type number and result in error. } //// [argumentsBindsToFunctionScopeArgumentList.js] "use strict"; var arguments = 10; function foo(a) { - arguments = 10; /// This shouldnt be of type number and result in error. + arguments = 10; /// This shouldn't be of type number and result in error. } diff --git a/tests/baselines/reference/argumentsBindsToFunctionScopeArgumentList(alwaysstrict=true).symbols b/tests/baselines/reference/argumentsBindsToFunctionScopeArgumentList(alwaysstrict=true).symbols index a7c67c1447cce..288e3b58477e2 100644 --- a/tests/baselines/reference/argumentsBindsToFunctionScopeArgumentList(alwaysstrict=true).symbols +++ b/tests/baselines/reference/argumentsBindsToFunctionScopeArgumentList(alwaysstrict=true).symbols @@ -8,6 +8,6 @@ function foo(a) { >foo : Symbol(foo, Decl(argumentsBindsToFunctionScopeArgumentList.ts, 0, 19)) >a : Symbol(a, Decl(argumentsBindsToFunctionScopeArgumentList.ts, 1, 13)) - arguments = 10; /// This shouldnt be of type number and result in error. + arguments = 10; /// This shouldn't be of type number and result in error. >arguments : Symbol(arguments) } diff --git a/tests/baselines/reference/argumentsBindsToFunctionScopeArgumentList(alwaysstrict=true).types b/tests/baselines/reference/argumentsBindsToFunctionScopeArgumentList(alwaysstrict=true).types index e85419e2d06be..4043ac651c090 100644 --- a/tests/baselines/reference/argumentsBindsToFunctionScopeArgumentList(alwaysstrict=true).types +++ b/tests/baselines/reference/argumentsBindsToFunctionScopeArgumentList(alwaysstrict=true).types @@ -13,7 +13,7 @@ function foo(a) { >a : any > : ^^^ - arguments = 10; /// This shouldnt be of type number and result in error. + arguments = 10; /// This shouldn't be of type number and result in error. >arguments = 10 : 10 > : ^^ >arguments : IArguments diff --git a/tests/baselines/reference/arrayAssignmentTest4.errors.txt b/tests/baselines/reference/arrayAssignmentTest4.errors.txt index cbec464a41701..295dfdd540ced 100644 --- a/tests/baselines/reference/arrayAssignmentTest4.errors.txt +++ b/tests/baselines/reference/arrayAssignmentTest4.errors.txt @@ -10,7 +10,7 @@ arrayAssignmentTest4.ts(23,1): error TS2740: Type 'C3' is missing the following /* - This behaves unexpectedly with teh following types: + This behaves unexpectedly with the following types: Type 1 of any[]: diff --git a/tests/baselines/reference/arrayAssignmentTest4.js b/tests/baselines/reference/arrayAssignmentTest4.js index 81defbd34cb08..845f9d33a45c4 100644 --- a/tests/baselines/reference/arrayAssignmentTest4.js +++ b/tests/baselines/reference/arrayAssignmentTest4.js @@ -8,7 +8,7 @@ class C3 { /* -This behaves unexpectedly with teh following types: +This behaves unexpectedly with the following types: Type 1 of any[]: @@ -33,7 +33,7 @@ class C3 { } /* -This behaves unexpectedly with teh following types: +This behaves unexpectedly with the following types: Type 1 of any[]: diff --git a/tests/baselines/reference/arrayAssignmentTest4.symbols b/tests/baselines/reference/arrayAssignmentTest4.symbols index 775e8ce8cca52..a0dae01afff8d 100644 --- a/tests/baselines/reference/arrayAssignmentTest4.symbols +++ b/tests/baselines/reference/arrayAssignmentTest4.symbols @@ -11,7 +11,7 @@ class C3 { /* -This behaves unexpectedly with teh following types: +This behaves unexpectedly with the following types: Type 1 of any[]: diff --git a/tests/baselines/reference/arrayAssignmentTest4.types b/tests/baselines/reference/arrayAssignmentTest4.types index 580591e39cf6f..292ea4f0872f7 100644 --- a/tests/baselines/reference/arrayAssignmentTest4.types +++ b/tests/baselines/reference/arrayAssignmentTest4.types @@ -15,7 +15,7 @@ class C3 { /* -This behaves unexpectedly with teh following types: +This behaves unexpectedly with the following types: Type 1 of any[]: diff --git a/tests/baselines/reference/arrayIterationLibES5TargetDifferent(nolib=false,target=es2015).errors.txt b/tests/baselines/reference/arrayIterationLibES5TargetDifferent(nolib=false,target=es2015).errors.txt index ce984d1c13283..ce3818b24b2e8 100644 --- a/tests/baselines/reference/arrayIterationLibES5TargetDifferent(nolib=false,target=es2015).errors.txt +++ b/tests/baselines/reference/arrayIterationLibES5TargetDifferent(nolib=false,target=es2015).errors.txt @@ -15,9 +15,9 @@ arrayIterationLibES5TargetDifferent.ts(21,17): error TS2495: Type '{ foo: string log(x); } - declare const aNumber: number; + declare const a number: number; - for (const x of aNumber) { + for (const x of a number) { ~~~~~~~ !!! error TS2495: Type 'number' is not an array type or a string type. log(x); diff --git a/tests/baselines/reference/arrayIterationLibES5TargetDifferent(nolib=false,target=es2015).js b/tests/baselines/reference/arrayIterationLibES5TargetDifferent(nolib=false,target=es2015).js index 4fae88f865ff2..cef1a3c0e364e 100644 --- a/tests/baselines/reference/arrayIterationLibES5TargetDifferent(nolib=false,target=es2015).js +++ b/tests/baselines/reference/arrayIterationLibES5TargetDifferent(nolib=false,target=es2015).js @@ -13,9 +13,9 @@ for (const x of aString) { log(x); } -declare const aNumber: number; +declare const a number: number; -for (const x of aNumber) { +for (const x of a number) { log(x); } @@ -33,7 +33,7 @@ for (const x of [1, 2, 3]) { for (const x of aString) { log(x); } -for (const x of aNumber) { +for (const x of a number) { log(x); } for (const x of anObject) { diff --git a/tests/baselines/reference/arrayIterationLibES5TargetDifferent(nolib=false,target=es2015).symbols b/tests/baselines/reference/arrayIterationLibES5TargetDifferent(nolib=false,target=es2015).symbols index 6fba112cb1b2c..667f740285e3f 100644 --- a/tests/baselines/reference/arrayIterationLibES5TargetDifferent(nolib=false,target=es2015).symbols +++ b/tests/baselines/reference/arrayIterationLibES5TargetDifferent(nolib=false,target=es2015).symbols @@ -25,12 +25,12 @@ for (const x of aString) { >x : Symbol(x, Decl(arrayIterationLibES5TargetDifferent.ts, 8, 10)) } -declare const aNumber: number; ->aNumber : Symbol(aNumber, Decl(arrayIterationLibES5TargetDifferent.ts, 12, 13)) +declare const a number: number; +>a number : Symbol(a number, Decl(arrayIterationLibES5TargetDifferent.ts, 12, 13)) -for (const x of aNumber) { +for (const x of a number) { >x : Symbol(x, Decl(arrayIterationLibES5TargetDifferent.ts, 14, 10)) ->aNumber : Symbol(aNumber, Decl(arrayIterationLibES5TargetDifferent.ts, 12, 13)) +>a number : Symbol(a number, Decl(arrayIterationLibES5TargetDifferent.ts, 12, 13)) log(x); >log : Symbol(log, Decl(arrayIterationLibES5TargetDifferent.ts, 0, 0)) diff --git a/tests/baselines/reference/arrayIterationLibES5TargetDifferent(nolib=false,target=es2015).types b/tests/baselines/reference/arrayIterationLibES5TargetDifferent(nolib=false,target=es2015).types index d8aebdc010118..e923a58604b77 100644 --- a/tests/baselines/reference/arrayIterationLibES5TargetDifferent(nolib=false,target=es2015).types +++ b/tests/baselines/reference/arrayIterationLibES5TargetDifferent(nolib=false,target=es2015).types @@ -47,14 +47,14 @@ for (const x of aString) { > : ^^^^^^ } -declare const aNumber: number; ->aNumber : number +declare const a number: number; +>a number : number > : ^^^^^^ -for (const x of aNumber) { +for (const x of a number) { >x : any > : ^^^ ->aNumber : number +>a number : number > : ^^^^^^ log(x); diff --git a/tests/baselines/reference/arrayIterationLibES5TargetDifferent(nolib=false,target=es5).errors.txt b/tests/baselines/reference/arrayIterationLibES5TargetDifferent(nolib=false,target=es5).errors.txt index 56c2273be917b..092ee7baaf6e7 100644 --- a/tests/baselines/reference/arrayIterationLibES5TargetDifferent(nolib=false,target=es5).errors.txt +++ b/tests/baselines/reference/arrayIterationLibES5TargetDifferent(nolib=false,target=es5).errors.txt @@ -17,9 +17,9 @@ arrayIterationLibES5TargetDifferent.ts(21,17): error TS2495: Type '{ foo: string log(x); } - declare const aNumber: number; + declare const a number: number; - for (const x of aNumber) { + for (const x of a number) { ~~~~~~~ !!! error TS2495: Type 'number' is not an array type or a string type. log(x); diff --git a/tests/baselines/reference/arrayIterationLibES5TargetDifferent(nolib=false,target=es5).js b/tests/baselines/reference/arrayIterationLibES5TargetDifferent(nolib=false,target=es5).js index 2511293911245..5a814d19a0b2d 100644 --- a/tests/baselines/reference/arrayIterationLibES5TargetDifferent(nolib=false,target=es5).js +++ b/tests/baselines/reference/arrayIterationLibES5TargetDifferent(nolib=false,target=es5).js @@ -13,9 +13,9 @@ for (const x of aString) { log(x); } -declare const aNumber: number; +declare const a number: number; -for (const x of aNumber) { +for (const x of a number) { log(x); } @@ -35,7 +35,7 @@ for (var _b = 0, aString_1 = aString; _b < aString_1.length; _b++) { var x = aString_1[_b]; log(x); } -for (var _c = 0, aNumber_1 = aNumber; _c < aNumber_1.length; _c++) { +for (var _c = 0, aNumber_1 = a number; _c < aNumber_1.length; _c++) { var x = aNumber_1[_c]; log(x); } diff --git a/tests/baselines/reference/arrayIterationLibES5TargetDifferent(nolib=false,target=es5).symbols b/tests/baselines/reference/arrayIterationLibES5TargetDifferent(nolib=false,target=es5).symbols index 6fba112cb1b2c..667f740285e3f 100644 --- a/tests/baselines/reference/arrayIterationLibES5TargetDifferent(nolib=false,target=es5).symbols +++ b/tests/baselines/reference/arrayIterationLibES5TargetDifferent(nolib=false,target=es5).symbols @@ -25,12 +25,12 @@ for (const x of aString) { >x : Symbol(x, Decl(arrayIterationLibES5TargetDifferent.ts, 8, 10)) } -declare const aNumber: number; ->aNumber : Symbol(aNumber, Decl(arrayIterationLibES5TargetDifferent.ts, 12, 13)) +declare const a number: number; +>a number : Symbol(a number, Decl(arrayIterationLibES5TargetDifferent.ts, 12, 13)) -for (const x of aNumber) { +for (const x of a number) { >x : Symbol(x, Decl(arrayIterationLibES5TargetDifferent.ts, 14, 10)) ->aNumber : Symbol(aNumber, Decl(arrayIterationLibES5TargetDifferent.ts, 12, 13)) +>a number : Symbol(a number, Decl(arrayIterationLibES5TargetDifferent.ts, 12, 13)) log(x); >log : Symbol(log, Decl(arrayIterationLibES5TargetDifferent.ts, 0, 0)) diff --git a/tests/baselines/reference/arrayIterationLibES5TargetDifferent(nolib=false,target=es5).types b/tests/baselines/reference/arrayIterationLibES5TargetDifferent(nolib=false,target=es5).types index d8aebdc010118..e923a58604b77 100644 --- a/tests/baselines/reference/arrayIterationLibES5TargetDifferent(nolib=false,target=es5).types +++ b/tests/baselines/reference/arrayIterationLibES5TargetDifferent(nolib=false,target=es5).types @@ -47,14 +47,14 @@ for (const x of aString) { > : ^^^^^^ } -declare const aNumber: number; ->aNumber : number +declare const a number: number; +>a number : number > : ^^^^^^ -for (const x of aNumber) { +for (const x of a number) { >x : any > : ^^^ ->aNumber : number +>a number : number > : ^^^^^^ log(x); diff --git a/tests/baselines/reference/arrayIterationLibES5TargetDifferent(nolib=false,target=esnext).errors.txt b/tests/baselines/reference/arrayIterationLibES5TargetDifferent(nolib=false,target=esnext).errors.txt index ce984d1c13283..ce3818b24b2e8 100644 --- a/tests/baselines/reference/arrayIterationLibES5TargetDifferent(nolib=false,target=esnext).errors.txt +++ b/tests/baselines/reference/arrayIterationLibES5TargetDifferent(nolib=false,target=esnext).errors.txt @@ -15,9 +15,9 @@ arrayIterationLibES5TargetDifferent.ts(21,17): error TS2495: Type '{ foo: string log(x); } - declare const aNumber: number; + declare const a number: number; - for (const x of aNumber) { + for (const x of a number) { ~~~~~~~ !!! error TS2495: Type 'number' is not an array type or a string type. log(x); diff --git a/tests/baselines/reference/arrayIterationLibES5TargetDifferent(nolib=false,target=esnext).js b/tests/baselines/reference/arrayIterationLibES5TargetDifferent(nolib=false,target=esnext).js index 4fae88f865ff2..cef1a3c0e364e 100644 --- a/tests/baselines/reference/arrayIterationLibES5TargetDifferent(nolib=false,target=esnext).js +++ b/tests/baselines/reference/arrayIterationLibES5TargetDifferent(nolib=false,target=esnext).js @@ -13,9 +13,9 @@ for (const x of aString) { log(x); } -declare const aNumber: number; +declare const a number: number; -for (const x of aNumber) { +for (const x of a number) { log(x); } @@ -33,7 +33,7 @@ for (const x of [1, 2, 3]) { for (const x of aString) { log(x); } -for (const x of aNumber) { +for (const x of a number) { log(x); } for (const x of anObject) { diff --git a/tests/baselines/reference/arrayIterationLibES5TargetDifferent(nolib=false,target=esnext).symbols b/tests/baselines/reference/arrayIterationLibES5TargetDifferent(nolib=false,target=esnext).symbols index 6fba112cb1b2c..667f740285e3f 100644 --- a/tests/baselines/reference/arrayIterationLibES5TargetDifferent(nolib=false,target=esnext).symbols +++ b/tests/baselines/reference/arrayIterationLibES5TargetDifferent(nolib=false,target=esnext).symbols @@ -25,12 +25,12 @@ for (const x of aString) { >x : Symbol(x, Decl(arrayIterationLibES5TargetDifferent.ts, 8, 10)) } -declare const aNumber: number; ->aNumber : Symbol(aNumber, Decl(arrayIterationLibES5TargetDifferent.ts, 12, 13)) +declare const a number: number; +>a number : Symbol(a number, Decl(arrayIterationLibES5TargetDifferent.ts, 12, 13)) -for (const x of aNumber) { +for (const x of a number) { >x : Symbol(x, Decl(arrayIterationLibES5TargetDifferent.ts, 14, 10)) ->aNumber : Symbol(aNumber, Decl(arrayIterationLibES5TargetDifferent.ts, 12, 13)) +>a number : Symbol(a number, Decl(arrayIterationLibES5TargetDifferent.ts, 12, 13)) log(x); >log : Symbol(log, Decl(arrayIterationLibES5TargetDifferent.ts, 0, 0)) diff --git a/tests/baselines/reference/arrayIterationLibES5TargetDifferent(nolib=false,target=esnext).types b/tests/baselines/reference/arrayIterationLibES5TargetDifferent(nolib=false,target=esnext).types index d8aebdc010118..e923a58604b77 100644 --- a/tests/baselines/reference/arrayIterationLibES5TargetDifferent(nolib=false,target=esnext).types +++ b/tests/baselines/reference/arrayIterationLibES5TargetDifferent(nolib=false,target=esnext).types @@ -47,14 +47,14 @@ for (const x of aString) { > : ^^^^^^ } -declare const aNumber: number; ->aNumber : number +declare const a number: number; +>a number : number > : ^^^^^^ -for (const x of aNumber) { +for (const x of a number) { >x : any > : ^^^ ->aNumber : number +>a number : number > : ^^^^^^ log(x); diff --git a/tests/baselines/reference/arrayIterationLibES5TargetDifferent(nolib=true,target=es2015).errors.txt b/tests/baselines/reference/arrayIterationLibES5TargetDifferent(nolib=true,target=es2015).errors.txt index c37bcb476dec3..cb2a9c79843bb 100644 --- a/tests/baselines/reference/arrayIterationLibES5TargetDifferent(nolib=true,target=es2015).errors.txt +++ b/tests/baselines/reference/arrayIterationLibES5TargetDifferent(nolib=true,target=es2015).errors.txt @@ -35,9 +35,9 @@ error TS5053: Option 'lib' cannot be specified with option 'noLib'. log(x); } - declare const aNumber: number; + declare const a number: number; - for (const x of aNumber) { + for (const x of a number) { log(x); } diff --git a/tests/baselines/reference/arrayIterationLibES5TargetDifferent(nolib=true,target=es2015).js b/tests/baselines/reference/arrayIterationLibES5TargetDifferent(nolib=true,target=es2015).js index 4fae88f865ff2..cef1a3c0e364e 100644 --- a/tests/baselines/reference/arrayIterationLibES5TargetDifferent(nolib=true,target=es2015).js +++ b/tests/baselines/reference/arrayIterationLibES5TargetDifferent(nolib=true,target=es2015).js @@ -13,9 +13,9 @@ for (const x of aString) { log(x); } -declare const aNumber: number; +declare const a number: number; -for (const x of aNumber) { +for (const x of a number) { log(x); } @@ -33,7 +33,7 @@ for (const x of [1, 2, 3]) { for (const x of aString) { log(x); } -for (const x of aNumber) { +for (const x of a number) { log(x); } for (const x of anObject) { diff --git a/tests/baselines/reference/arrayIterationLibES5TargetDifferent(nolib=true,target=es2015).symbols b/tests/baselines/reference/arrayIterationLibES5TargetDifferent(nolib=true,target=es2015).symbols index 6fba112cb1b2c..667f740285e3f 100644 --- a/tests/baselines/reference/arrayIterationLibES5TargetDifferent(nolib=true,target=es2015).symbols +++ b/tests/baselines/reference/arrayIterationLibES5TargetDifferent(nolib=true,target=es2015).symbols @@ -25,12 +25,12 @@ for (const x of aString) { >x : Symbol(x, Decl(arrayIterationLibES5TargetDifferent.ts, 8, 10)) } -declare const aNumber: number; ->aNumber : Symbol(aNumber, Decl(arrayIterationLibES5TargetDifferent.ts, 12, 13)) +declare const a number: number; +>a number : Symbol(a number, Decl(arrayIterationLibES5TargetDifferent.ts, 12, 13)) -for (const x of aNumber) { +for (const x of a number) { >x : Symbol(x, Decl(arrayIterationLibES5TargetDifferent.ts, 14, 10)) ->aNumber : Symbol(aNumber, Decl(arrayIterationLibES5TargetDifferent.ts, 12, 13)) +>a number : Symbol(a number, Decl(arrayIterationLibES5TargetDifferent.ts, 12, 13)) log(x); >log : Symbol(log, Decl(arrayIterationLibES5TargetDifferent.ts, 0, 0)) diff --git a/tests/baselines/reference/arrayIterationLibES5TargetDifferent(nolib=true,target=es2015).types b/tests/baselines/reference/arrayIterationLibES5TargetDifferent(nolib=true,target=es2015).types index b442bce581e58..6e8959dda0d9a 100644 --- a/tests/baselines/reference/arrayIterationLibES5TargetDifferent(nolib=true,target=es2015).types +++ b/tests/baselines/reference/arrayIterationLibES5TargetDifferent(nolib=true,target=es2015).types @@ -47,14 +47,14 @@ for (const x of aString) { > : ^^^^^^ } -declare const aNumber: number; ->aNumber : number +declare const a number: number; +>a number : number > : ^^^^^^ -for (const x of aNumber) { +for (const x of a number) { >x : any > : ^^^ ->aNumber : number +>a number : number > : ^^^^^^ log(x); diff --git a/tests/baselines/reference/arrayIterationLibES5TargetDifferent(nolib=true,target=es5).errors.txt b/tests/baselines/reference/arrayIterationLibES5TargetDifferent(nolib=true,target=es5).errors.txt index 6ab551aaab35b..d8640eb38cefa 100644 --- a/tests/baselines/reference/arrayIterationLibES5TargetDifferent(nolib=true,target=es5).errors.txt +++ b/tests/baselines/reference/arrayIterationLibES5TargetDifferent(nolib=true,target=es5).errors.txt @@ -37,9 +37,9 @@ error TS5107: Option 'target=ES5' is deprecated and will stop functioning in Typ log(x); } - declare const aNumber: number; + declare const a number: number; - for (const x of aNumber) { + for (const x of a number) { log(x); } diff --git a/tests/baselines/reference/arrayIterationLibES5TargetDifferent(nolib=true,target=es5).js b/tests/baselines/reference/arrayIterationLibES5TargetDifferent(nolib=true,target=es5).js index 2511293911245..5a814d19a0b2d 100644 --- a/tests/baselines/reference/arrayIterationLibES5TargetDifferent(nolib=true,target=es5).js +++ b/tests/baselines/reference/arrayIterationLibES5TargetDifferent(nolib=true,target=es5).js @@ -13,9 +13,9 @@ for (const x of aString) { log(x); } -declare const aNumber: number; +declare const a number: number; -for (const x of aNumber) { +for (const x of a number) { log(x); } @@ -35,7 +35,7 @@ for (var _b = 0, aString_1 = aString; _b < aString_1.length; _b++) { var x = aString_1[_b]; log(x); } -for (var _c = 0, aNumber_1 = aNumber; _c < aNumber_1.length; _c++) { +for (var _c = 0, aNumber_1 = a number; _c < aNumber_1.length; _c++) { var x = aNumber_1[_c]; log(x); } diff --git a/tests/baselines/reference/arrayIterationLibES5TargetDifferent(nolib=true,target=es5).symbols b/tests/baselines/reference/arrayIterationLibES5TargetDifferent(nolib=true,target=es5).symbols index 6fba112cb1b2c..667f740285e3f 100644 --- a/tests/baselines/reference/arrayIterationLibES5TargetDifferent(nolib=true,target=es5).symbols +++ b/tests/baselines/reference/arrayIterationLibES5TargetDifferent(nolib=true,target=es5).symbols @@ -25,12 +25,12 @@ for (const x of aString) { >x : Symbol(x, Decl(arrayIterationLibES5TargetDifferent.ts, 8, 10)) } -declare const aNumber: number; ->aNumber : Symbol(aNumber, Decl(arrayIterationLibES5TargetDifferent.ts, 12, 13)) +declare const a number: number; +>a number : Symbol(a number, Decl(arrayIterationLibES5TargetDifferent.ts, 12, 13)) -for (const x of aNumber) { +for (const x of a number) { >x : Symbol(x, Decl(arrayIterationLibES5TargetDifferent.ts, 14, 10)) ->aNumber : Symbol(aNumber, Decl(arrayIterationLibES5TargetDifferent.ts, 12, 13)) +>a number : Symbol(a number, Decl(arrayIterationLibES5TargetDifferent.ts, 12, 13)) log(x); >log : Symbol(log, Decl(arrayIterationLibES5TargetDifferent.ts, 0, 0)) diff --git a/tests/baselines/reference/arrayIterationLibES5TargetDifferent(nolib=true,target=es5).types b/tests/baselines/reference/arrayIterationLibES5TargetDifferent(nolib=true,target=es5).types index b442bce581e58..6e8959dda0d9a 100644 --- a/tests/baselines/reference/arrayIterationLibES5TargetDifferent(nolib=true,target=es5).types +++ b/tests/baselines/reference/arrayIterationLibES5TargetDifferent(nolib=true,target=es5).types @@ -47,14 +47,14 @@ for (const x of aString) { > : ^^^^^^ } -declare const aNumber: number; ->aNumber : number +declare const a number: number; +>a number : number > : ^^^^^^ -for (const x of aNumber) { +for (const x of a number) { >x : any > : ^^^ ->aNumber : number +>a number : number > : ^^^^^^ log(x); diff --git a/tests/baselines/reference/arrayIterationLibES5TargetDifferent(nolib=true,target=esnext).errors.txt b/tests/baselines/reference/arrayIterationLibES5TargetDifferent(nolib=true,target=esnext).errors.txt index c37bcb476dec3..cb2a9c79843bb 100644 --- a/tests/baselines/reference/arrayIterationLibES5TargetDifferent(nolib=true,target=esnext).errors.txt +++ b/tests/baselines/reference/arrayIterationLibES5TargetDifferent(nolib=true,target=esnext).errors.txt @@ -35,9 +35,9 @@ error TS5053: Option 'lib' cannot be specified with option 'noLib'. log(x); } - declare const aNumber: number; + declare const a number: number; - for (const x of aNumber) { + for (const x of a number) { log(x); } diff --git a/tests/baselines/reference/arrayIterationLibES5TargetDifferent(nolib=true,target=esnext).js b/tests/baselines/reference/arrayIterationLibES5TargetDifferent(nolib=true,target=esnext).js index 4fae88f865ff2..cef1a3c0e364e 100644 --- a/tests/baselines/reference/arrayIterationLibES5TargetDifferent(nolib=true,target=esnext).js +++ b/tests/baselines/reference/arrayIterationLibES5TargetDifferent(nolib=true,target=esnext).js @@ -13,9 +13,9 @@ for (const x of aString) { log(x); } -declare const aNumber: number; +declare const a number: number; -for (const x of aNumber) { +for (const x of a number) { log(x); } @@ -33,7 +33,7 @@ for (const x of [1, 2, 3]) { for (const x of aString) { log(x); } -for (const x of aNumber) { +for (const x of a number) { log(x); } for (const x of anObject) { diff --git a/tests/baselines/reference/arrayIterationLibES5TargetDifferent(nolib=true,target=esnext).symbols b/tests/baselines/reference/arrayIterationLibES5TargetDifferent(nolib=true,target=esnext).symbols index 6fba112cb1b2c..667f740285e3f 100644 --- a/tests/baselines/reference/arrayIterationLibES5TargetDifferent(nolib=true,target=esnext).symbols +++ b/tests/baselines/reference/arrayIterationLibES5TargetDifferent(nolib=true,target=esnext).symbols @@ -25,12 +25,12 @@ for (const x of aString) { >x : Symbol(x, Decl(arrayIterationLibES5TargetDifferent.ts, 8, 10)) } -declare const aNumber: number; ->aNumber : Symbol(aNumber, Decl(arrayIterationLibES5TargetDifferent.ts, 12, 13)) +declare const a number: number; +>a number : Symbol(a number, Decl(arrayIterationLibES5TargetDifferent.ts, 12, 13)) -for (const x of aNumber) { +for (const x of a number) { >x : Symbol(x, Decl(arrayIterationLibES5TargetDifferent.ts, 14, 10)) ->aNumber : Symbol(aNumber, Decl(arrayIterationLibES5TargetDifferent.ts, 12, 13)) +>a number : Symbol(a number, Decl(arrayIterationLibES5TargetDifferent.ts, 12, 13)) log(x); >log : Symbol(log, Decl(arrayIterationLibES5TargetDifferent.ts, 0, 0)) diff --git a/tests/baselines/reference/arrayIterationLibES5TargetDifferent(nolib=true,target=esnext).types b/tests/baselines/reference/arrayIterationLibES5TargetDifferent(nolib=true,target=esnext).types index b442bce581e58..6e8959dda0d9a 100644 --- a/tests/baselines/reference/arrayIterationLibES5TargetDifferent(nolib=true,target=esnext).types +++ b/tests/baselines/reference/arrayIterationLibES5TargetDifferent(nolib=true,target=esnext).types @@ -47,14 +47,14 @@ for (const x of aString) { > : ^^^^^^ } -declare const aNumber: number; ->aNumber : number +declare const a number: number; +>a number : number > : ^^^^^^ -for (const x of aNumber) { +for (const x of a number) { >x : any > : ^^^ ->aNumber : number +>a number : number > : ^^^^^^ log(x); diff --git a/tests/baselines/reference/arraySpreadInCall.errors.txt b/tests/baselines/reference/arraySpreadInCall.errors.txt index 147c3676659ae..52c1f5beb02e0 100644 --- a/tests/baselines/reference/arraySpreadInCall.errors.txt +++ b/tests/baselines/reference/arraySpreadInCall.errors.txt @@ -28,7 +28,7 @@ arraySpreadInCall.ts(32,12): error TS2554: Expected 0-1 arguments, but got 2. const x43 = f4(...([1, 'foo'])) const x44 = f4(true, ...([1, 'foo'])) - // dicovered in #52845#issuecomment-1459132562 + // discovered in #52845#issuecomment-1459132562 interface IAction { run(event?: unknown): unknown; } diff --git a/tests/baselines/reference/arraySpreadInCall.symbols b/tests/baselines/reference/arraySpreadInCall.symbols index 96b009ba0c918..a1e91def67417 100644 --- a/tests/baselines/reference/arraySpreadInCall.symbols +++ b/tests/baselines/reference/arraySpreadInCall.symbols @@ -97,7 +97,7 @@ const x44 = f4(true, ...([1, 'foo'])) >x44 : Symbol(x44, Decl(arraySpreadInCall.ts, 24, 5)) >f4 : Symbol(f4, Decl(arraySpreadInCall.ts, 18, 37)) -// dicovered in #52845#issuecomment-1459132562 +// discovered in #52845#issuecomment-1459132562 interface IAction { >IAction : Symbol(IAction, Decl(arraySpreadInCall.ts, 24, 37)) diff --git a/tests/baselines/reference/arraySpreadInCall.types b/tests/baselines/reference/arraySpreadInCall.types index 5bded461fc933..963177617886f 100644 --- a/tests/baselines/reference/arraySpreadInCall.types +++ b/tests/baselines/reference/arraySpreadInCall.types @@ -417,7 +417,7 @@ const x44 = f4(true, ...([1, 'foo'])) >'foo' : "foo" > : ^^^^^ -// dicovered in #52845#issuecomment-1459132562 +// discovered in #52845#issuecomment-1459132562 interface IAction { run(event?: unknown): unknown; >run : (event?: unknown) => unknown diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembersAccessibility.errors.txt b/tests/baselines/reference/assignmentCompatWithObjectMembersAccessibility.errors.txt index 931bc9e32919a..ee47e58828b0a 100644 --- a/tests/baselines/reference/assignmentCompatWithObjectMembersAccessibility.errors.txt +++ b/tests/baselines/reference/assignmentCompatWithObjectMembersAccessibility.errors.txt @@ -108,19 +108,19 @@ assignmentCompatWithObjectMembersAccessibility.ts(106,5): error TS2322: Type 'D' !!! error TS2322: Type 'E' is not assignable to type 'D'. !!! error TS2322: Property 'foo' is private in type 'E' but not in type 'D'. - e = a; // errror + e = a; // error ~ !!! error TS2322: Type '{ foo: string; }' is not assignable to type 'E'. !!! error TS2322: Property 'foo' is private in type 'E' but not in type '{ foo: string; }'. - e = b; // errror + e = b; // error ~ !!! error TS2322: Type 'Base' is not assignable to type 'E'. !!! error TS2322: Property 'foo' is private in type 'E' but not in type 'Base'. - e = i; // errror + e = i; // error ~ !!! error TS2322: Type 'I' is not assignable to type 'E'. !!! error TS2322: Property 'foo' is private in type 'E' but not in type 'I'. - e = d; // errror + e = d; // error ~ !!! error TS2322: Type 'D' is not assignable to type 'E'. !!! error TS2322: Property 'foo' is private in type 'E' but not in type 'D'. @@ -211,19 +211,19 @@ assignmentCompatWithObjectMembersAccessibility.ts(106,5): error TS2322: Type 'D' !!! error TS2322: Type 'E' is not assignable to type 'D'. !!! error TS2322: Property 'foo' is private in type 'E' but not in type 'D'. - e = a; // errror + e = a; // error ~ !!! error TS2322: Type '{ foo: string; }' is not assignable to type 'E'. !!! error TS2322: Property 'foo' is private in type 'E' but not in type '{ foo: string; }'. - e = b; // errror + e = b; // error ~ !!! error TS2322: Type 'Base' is not assignable to type 'E'. !!! error TS2322: Types have separate declarations of a private property 'foo'. - e = i; // errror + e = i; // error ~ !!! error TS2322: Type 'I' is not assignable to type 'E'. !!! error TS2322: Types have separate declarations of a private property 'foo'. - e = d; // errror + e = d; // error ~ !!! error TS2322: Type 'D' is not assignable to type 'E'. !!! error TS2322: Property 'foo' is private in type 'E' but not in type 'D'. diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembersAccessibility.js b/tests/baselines/reference/assignmentCompatWithObjectMembersAccessibility.js index 01cedd0d45146..9c896c85c5f6b 100644 --- a/tests/baselines/reference/assignmentCompatWithObjectMembersAccessibility.js +++ b/tests/baselines/reference/assignmentCompatWithObjectMembersAccessibility.js @@ -48,10 +48,10 @@ namespace TargetIsPublic { d = i; d = e; // error - e = a; // errror - e = b; // errror - e = i; // errror - e = d; // errror + e = a; // error + e = b; // error + e = i; // error + e = d; // error e = e; } @@ -103,10 +103,10 @@ namespace TargetIsPublic { d = i; // error d = e; // error - e = a; // errror - e = b; // errror - e = i; // errror - e = d; // errror + e = a; // error + e = b; // error + e = i; // error + e = d; // error e = e; } @@ -140,10 +140,10 @@ var TargetIsPublic; d = b; d = i; d = e; // error - e = a; // errror - e = b; // errror - e = i; // errror - e = d; // errror + e = a; // error + e = b; // error + e = i; // error + e = d; // error e = e; })(TargetIsPublic || (TargetIsPublic = {})); (function (TargetIsPublic) { @@ -173,9 +173,9 @@ var TargetIsPublic; d = b; // error d = i; // error d = e; // error - e = a; // errror - e = b; // errror - e = i; // errror - e = d; // errror + e = a; // error + e = b; // error + e = i; // error + e = d; // error e = e; })(TargetIsPublic || (TargetIsPublic = {})); diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembersAccessibility.symbols b/tests/baselines/reference/assignmentCompatWithObjectMembersAccessibility.symbols index f2372eea05d11..8222123581701 100644 --- a/tests/baselines/reference/assignmentCompatWithObjectMembersAccessibility.symbols +++ b/tests/baselines/reference/assignmentCompatWithObjectMembersAccessibility.symbols @@ -119,19 +119,19 @@ namespace TargetIsPublic { >d : Symbol(d, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 24, 15)) >e : Symbol(e, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 25, 15)) - e = a; // errror + e = a; // error >e : Symbol(e, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 25, 15)) >a : Symbol(a, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 12, 15)) - e = b; // errror + e = b; // error >e : Symbol(e, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 25, 15)) >b : Symbol(b, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 13, 15)) - e = i; // errror + e = i; // error >e : Symbol(e, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 25, 15)) >i : Symbol(i, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 14, 15)) - e = d; // errror + e = d; // error >e : Symbol(e, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 25, 15)) >d : Symbol(d, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 24, 15)) @@ -264,19 +264,19 @@ namespace TargetIsPublic { >d : Symbol(d, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 77, 15)) >e : Symbol(e, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 78, 15)) - e = a; // errror + e = a; // error >e : Symbol(e, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 78, 15)) >a : Symbol(a, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 64, 15)) - e = b; // errror + e = b; // error >e : Symbol(e, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 78, 15)) >b : Symbol(b, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 65, 15)) - e = i; // errror + e = i; // error >e : Symbol(e, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 78, 15)) >i : Symbol(i, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 66, 15)) - e = d; // errror + e = d; // error >e : Symbol(e, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 78, 15)) >d : Symbol(d, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 77, 15)) diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembersAccessibility.types b/tests/baselines/reference/assignmentCompatWithObjectMembersAccessibility.types index afd00c67b2dda..fae8270485045 100644 --- a/tests/baselines/reference/assignmentCompatWithObjectMembersAccessibility.types +++ b/tests/baselines/reference/assignmentCompatWithObjectMembersAccessibility.types @@ -191,7 +191,7 @@ namespace TargetIsPublic { >e : E > : ^ - e = a; // errror + e = a; // error >e = a : { foo: string; } > : ^^^^^^^ ^^^ >e : E @@ -199,7 +199,7 @@ namespace TargetIsPublic { >a : { foo: string; } > : ^^^^^^^ ^^^ - e = b; // errror + e = b; // error >e = b : Base > : ^^^^ >e : E @@ -207,7 +207,7 @@ namespace TargetIsPublic { >b : Base > : ^^^^ - e = i; // errror + e = i; // error >e = i : I > : ^ >e : E @@ -215,7 +215,7 @@ namespace TargetIsPublic { >i : I > : ^ - e = d; // errror + e = d; // error >e = d : D > : ^ >e : E @@ -435,7 +435,7 @@ namespace TargetIsPublic { >e : E > : ^ - e = a; // errror + e = a; // error >e = a : { foo: string; } > : ^^^^^^^ ^^^ >e : E @@ -443,7 +443,7 @@ namespace TargetIsPublic { >a : { foo: string; } > : ^^^^^^^ ^^^ - e = b; // errror + e = b; // error >e = b : Base > : ^^^^ >e : E @@ -451,7 +451,7 @@ namespace TargetIsPublic { >b : Base > : ^^^^ - e = i; // errror + e = i; // error >e = i : I > : ^ >e : E @@ -459,7 +459,7 @@ namespace TargetIsPublic { >i : I > : ^ - e = d; // errror + e = d; // error >e = d : D > : ^ >e : E diff --git a/tests/baselines/reference/assignmentLHSIsValue.errors.txt b/tests/baselines/reference/assignmentLHSIsValue.errors.txt index a18848edd2ec1..60ce7b33475ca 100644 --- a/tests/baselines/reference/assignmentLHSIsValue.errors.txt +++ b/tests/baselines/reference/assignmentLHSIsValue.errors.txt @@ -145,7 +145,7 @@ assignmentLHSIsValue.ts(70,1): error TS2364: The left-hand side of an assignment ~~~~~ !!! error TS2364: The left-hand side of an assignment expression must be a variable or a property access. - // parentheses, the containted expression is value + // parentheses, the contained expression is value (this) = value; ~~~~~~ !!! error TS2364: The left-hand side of an assignment expression must be a variable or a property access. diff --git a/tests/baselines/reference/assignmentLHSIsValue.js b/tests/baselines/reference/assignmentLHSIsValue.js index 1f72fa9a898e4..fd05608336bf0 100644 --- a/tests/baselines/reference/assignmentLHSIsValue.js +++ b/tests/baselines/reference/assignmentLHSIsValue.js @@ -56,7 +56,7 @@ function bar() { } = value; // function calls foo() = value; -// parentheses, the containted expression is value +// parentheses, the contained expression is value (this) = value; (M) = value; (C) = value; @@ -122,7 +122,7 @@ value; value; // function calls foo() = value; -// parentheses, the containted expression is value +// parentheses, the contained expression is value (this) = value; (M) = value; (C) = value; diff --git a/tests/baselines/reference/assignmentLHSIsValue.symbols b/tests/baselines/reference/assignmentLHSIsValue.symbols index c7f9c4990c607..11bb255d48d88 100644 --- a/tests/baselines/reference/assignmentLHSIsValue.symbols +++ b/tests/baselines/reference/assignmentLHSIsValue.symbols @@ -117,7 +117,7 @@ foo() = value; >foo : Symbol(foo, Decl(assignmentLHSIsValue.ts, 8, 1)) >value : Symbol(value, Decl(assignmentLHSIsValue.ts, 1, 3)) -// parentheses, the containted expression is value +// parentheses, the contained expression is value (this) = value; >this : Symbol(globalThis) >value : Symbol(value, Decl(assignmentLHSIsValue.ts, 1, 3)) diff --git a/tests/baselines/reference/assignmentLHSIsValue.types b/tests/baselines/reference/assignmentLHSIsValue.types index f220f5d95b3a8..20a79254a579d 100644 --- a/tests/baselines/reference/assignmentLHSIsValue.types +++ b/tests/baselines/reference/assignmentLHSIsValue.types @@ -246,7 +246,7 @@ foo() = value; >value : any > : ^^^ -// parentheses, the containted expression is value +// parentheses, the contained expression is value (this) = value; >(this) = value : any > : ^^^ diff --git a/tests/baselines/reference/assignmentRestElementWithErrorSourceType.errors.txt b/tests/baselines/reference/assignmentRestElementWithErrorSourceType.errors.txt index 8ff32235ff726..ef2d76a0608e3 100644 --- a/tests/baselines/reference/assignmentRestElementWithErrorSourceType.errors.txt +++ b/tests/baselines/reference/assignmentRestElementWithErrorSourceType.errors.txt @@ -4,7 +4,7 @@ assignmentRestElementWithErrorSourceType.ts(2,10): error TS2552: Cannot find nam ==== assignmentRestElementWithErrorSourceType.ts (2 errors) ==== var tuple: [string, number]; - [...c] = tupel; // intentionally misspelled + [...c] = tuple; // intentionally misspelled ~ !!! error TS2304: Cannot find name 'c'. ~~~~~ diff --git a/tests/baselines/reference/assignmentRestElementWithErrorSourceType.js b/tests/baselines/reference/assignmentRestElementWithErrorSourceType.js index cb48549d9fca8..9ff6fec9e8e2b 100644 --- a/tests/baselines/reference/assignmentRestElementWithErrorSourceType.js +++ b/tests/baselines/reference/assignmentRestElementWithErrorSourceType.js @@ -2,9 +2,9 @@ //// [assignmentRestElementWithErrorSourceType.ts] var tuple: [string, number]; -[...c] = tupel; // intentionally misspelled +[...c] = tuple; // intentionally misspelled //// [assignmentRestElementWithErrorSourceType.js] "use strict"; var tuple; -[...c] = tupel; // intentionally misspelled +[...c] = tuple; // intentionally misspelled diff --git a/tests/baselines/reference/assignmentRestElementWithErrorSourceType.symbols b/tests/baselines/reference/assignmentRestElementWithErrorSourceType.symbols index ca8cca9f60619..8265e0569086f 100644 --- a/tests/baselines/reference/assignmentRestElementWithErrorSourceType.symbols +++ b/tests/baselines/reference/assignmentRestElementWithErrorSourceType.symbols @@ -4,4 +4,4 @@ var tuple: [string, number]; >tuple : Symbol(tuple, Decl(assignmentRestElementWithErrorSourceType.ts, 0, 3)) -[...c] = tupel; // intentionally misspelled +[...c] = tuple; // intentionally misspelled diff --git a/tests/baselines/reference/assignmentRestElementWithErrorSourceType.types b/tests/baselines/reference/assignmentRestElementWithErrorSourceType.types index 3e46edc2ea57a..4fc3589579de2 100644 --- a/tests/baselines/reference/assignmentRestElementWithErrorSourceType.types +++ b/tests/baselines/reference/assignmentRestElementWithErrorSourceType.types @@ -5,8 +5,8 @@ var tuple: [string, number]; >tuple : [string, number] > : ^^^^^^^^^^^^^^^^ -[...c] = tupel; // intentionally misspelled ->[...c] = tupel : any +[...c] = tuple; // intentionally misspelled +>[...c] = tuple : any > : ^^^ >[...c] : any[] > : ^^^^^ @@ -14,6 +14,6 @@ var tuple: [string, number]; > : ^^^ >c : any > : ^^^ ->tupel : any +>tuple : any > : ^^^ diff --git a/tests/baselines/reference/asyncArrowFunction11_es5(target=es5).js b/tests/baselines/reference/asyncArrowFunction11_es5(target=es5).js index b0cf216455139..5fb03552c8829 100644 --- a/tests/baselines/reference/asyncArrowFunction11_es5(target=es5).js +++ b/tests/baselines/reference/asyncArrowFunction11_es5(target=es5).js @@ -21,7 +21,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge }); }; var __generator = (this && this.__generator) || function (thisArg, body) { - var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); + var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, tries: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; function verb(n) { return function (v) { return step([n, v]); }; } function step(op) { @@ -33,14 +33,14 @@ var __generator = (this && this.__generator) || function (thisArg, body) { case 0: case 1: t = op; break; case 4: _.label++; return { value: op[1], done: false }; case 5: _.label++; y = op[1]; op = [0]; continue; - case 7: op = _.ops.pop(); _.trys.pop(); continue; + case 7: op = _.ops.pop(); _.tries.pop(); continue; default: - if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } + if (!(t = _.tries, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } if (t[2]) _.ops.pop(); - _.trys.pop(); continue; + _.tries.pop(); continue; } op = body.call(thisArg, _); } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } diff --git a/tests/baselines/reference/asyncAwaitIsolatedModules_es5(target=es5).js b/tests/baselines/reference/asyncAwaitIsolatedModules_es5(target=es5).js index cdf1f60ab1ed3..65207a354c77e 100644 --- a/tests/baselines/reference/asyncAwaitIsolatedModules_es5(target=es5).js +++ b/tests/baselines/reference/asyncAwaitIsolatedModules_es5(target=es5).js @@ -53,7 +53,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge }); }; var __generator = (this && this.__generator) || function (thisArg, body) { - var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); + var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, tries: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; function verb(n) { return function (v) { return step([n, v]); }; } function step(op) { @@ -65,14 +65,14 @@ var __generator = (this && this.__generator) || function (thisArg, body) { case 0: case 1: t = op; break; case 4: _.label++; return { value: op[1], done: false }; case 5: _.label++; y = op[1]; op = [0]; continue; - case 7: op = _.ops.pop(); _.trys.pop(); continue; + case 7: op = _.ops.pop(); _.tries.pop(); continue; default: - if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } + if (!(t = _.tries, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } if (t[2]) _.ops.pop(); - _.trys.pop(); continue; + _.tries.pop(); continue; } op = body.call(thisArg, _); } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } diff --git a/tests/baselines/reference/asyncAwait_es5(target=es5).js b/tests/baselines/reference/asyncAwait_es5(target=es5).js index cb3ccae780530..ad5bfe0a3f168 100644 --- a/tests/baselines/reference/asyncAwait_es5(target=es5).js +++ b/tests/baselines/reference/asyncAwait_es5(target=es5).js @@ -60,7 +60,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge }); }; var __generator = (this && this.__generator) || function (thisArg, body) { - var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); + var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, tries: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; function verb(n) { return function (v) { return step([n, v]); }; } function step(op) { @@ -72,14 +72,14 @@ var __generator = (this && this.__generator) || function (thisArg, body) { case 0: case 1: t = op; break; case 4: _.label++; return { value: op[1], done: false }; case 5: _.label++; y = op[1]; op = [0]; continue; - case 7: op = _.ops.pop(); _.trys.pop(); continue; + case 7: op = _.ops.pop(); _.tries.pop(); continue; default: - if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } + if (!(t = _.tries, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } if (t[2]) _.ops.pop(); - _.trys.pop(); continue; + _.tries.pop(); continue; } op = body.call(thisArg, _); } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } diff --git a/tests/baselines/reference/asyncFunctionTempVariableScoping(target=es5).js b/tests/baselines/reference/asyncFunctionTempVariableScoping(target=es5).js index 89bd1d4167b6f..d749259acde74 100644 --- a/tests/baselines/reference/asyncFunctionTempVariableScoping(target=es5).js +++ b/tests/baselines/reference/asyncFunctionTempVariableScoping(target=es5).js @@ -18,7 +18,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge }); }; var __generator = (this && this.__generator) || function (thisArg, body) { - var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); + var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, tries: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; function verb(n) { return function (v) { return step([n, v]); }; } function step(op) { @@ -30,14 +30,14 @@ var __generator = (this && this.__generator) || function (thisArg, body) { case 0: case 1: t = op; break; case 4: _.label++; return { value: op[1], done: false }; case 5: _.label++; y = op[1]; op = [0]; continue; - case 7: op = _.ops.pop(); _.trys.pop(); continue; + case 7: op = _.ops.pop(); _.tries.pop(); continue; default: - if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } + if (!(t = _.tries, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } if (t[2]) _.ops.pop(); - _.trys.pop(); continue; + _.tries.pop(); continue; } op = body.call(thisArg, _); } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } diff --git a/tests/baselines/reference/asyncImportedPromise_es5(target=es5).js b/tests/baselines/reference/asyncImportedPromise_es5(target=es5).js index c6841ddd8a6f1..d53ec91ed77e3 100644 --- a/tests/baselines/reference/asyncImportedPromise_es5(target=es5).js +++ b/tests/baselines/reference/asyncImportedPromise_es5(target=es5).js @@ -48,7 +48,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge }); }; var __generator = (this && this.__generator) || function (thisArg, body) { - var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); + var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, tries: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; function verb(n) { return function (v) { return step([n, v]); }; } function step(op) { @@ -60,14 +60,14 @@ var __generator = (this && this.__generator) || function (thisArg, body) { case 0: case 1: t = op; break; case 4: _.label++; return { value: op[1], done: false }; case 5: _.label++; y = op[1]; op = [0]; continue; - case 7: op = _.ops.pop(); _.trys.pop(); continue; + case 7: op = _.ops.pop(); _.tries.pop(); continue; default: - if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } + if (!(t = _.tries, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } if (t[2]) _.ops.pop(); - _.trys.pop(); continue; + _.tries.pop(); continue; } op = body.call(thisArg, _); } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } diff --git a/tests/baselines/reference/asyncMultiFile_es5(target=es5).js b/tests/baselines/reference/asyncMultiFile_es5(target=es5).js index 3068938535652..5472a0bb5b842 100644 --- a/tests/baselines/reference/asyncMultiFile_es5(target=es5).js +++ b/tests/baselines/reference/asyncMultiFile_es5(target=es5).js @@ -17,7 +17,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge }); }; var __generator = (this && this.__generator) || function (thisArg, body) { - var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); + var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, tries: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; function verb(n) { return function (v) { return step([n, v]); }; } function step(op) { @@ -29,14 +29,14 @@ var __generator = (this && this.__generator) || function (thisArg, body) { case 0: case 1: t = op; break; case 4: _.label++; return { value: op[1], done: false }; case 5: _.label++; y = op[1]; op = [0]; continue; - case 7: op = _.ops.pop(); _.trys.pop(); continue; + case 7: op = _.ops.pop(); _.tries.pop(); continue; default: - if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } + if (!(t = _.tries, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } if (t[2]) _.ops.pop(); - _.trys.pop(); continue; + _.tries.pop(); continue; } op = body.call(thisArg, _); } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } diff --git a/tests/baselines/reference/awaitUsingDeclarations.1(target=es5).js b/tests/baselines/reference/awaitUsingDeclarations.1(target=es5).js index a3dbd289b99bd..7b83505cca83e 100644 --- a/tests/baselines/reference/awaitUsingDeclarations.1(target=es5).js +++ b/tests/baselines/reference/awaitUsingDeclarations.1(target=es5).js @@ -121,7 +121,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge }); }; var __generator = (this && this.__generator) || function (thisArg, body) { - var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); + var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, tries: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; function verb(n) { return function (v) { return step([n, v]); }; } function step(op) { @@ -133,14 +133,14 @@ var __generator = (this && this.__generator) || function (thisArg, body) { case 0: case 1: t = op; break; case 4: _.label++; return { value: op[1], done: false }; case 5: _.label++; y = op[1]; op = [0]; continue; - case 7: op = _.ops.pop(); _.trys.pop(); continue; + case 7: op = _.ops.pop(); _.tries.pop(); continue; default: - if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } + if (!(t = _.tries, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } if (t[2]) _.ops.pop(); - _.trys.pop(); continue; + _.tries.pop(); continue; } op = body.call(thisArg, _); } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } @@ -223,7 +223,7 @@ function af() { env_18 = { stack: [], error: void 0, hasError: false }; _b.label = 1; case 1: - _b.trys.push([1, 3, 4, 7]); + _b.tries.push([1, 3, 4, 7]); d3 = __addDisposableResource(env_18, (_a = {}, _a[Symbol.asyncDispose] = function () { return __awaiter(this, void 0, void 0, function () { return __generator(this, function (_a) { return [2 /*return*/]; @@ -261,7 +261,7 @@ function ag() { env_19 = { stack: [], error: void 0, hasError: false }; _b.label = 1; case 1: - _b.trys.push([1, 5, 6, 9]); + _b.tries.push([1, 5, 6, 9]); d5 = __addDisposableResource(env_19, (_a = {}, _a[Symbol.asyncDispose] = function () { return __awaiter(this, void 0, void 0, function () { return __generator(this, function (_a) { return [2 /*return*/]; @@ -310,7 +310,7 @@ try { env_20 = { stack: [], error: void 0, hasError: false }; _b.label = 1; case 1: - _b.trys.push([1, 2, 3, 6]); + _b.tries.push([1, 2, 3, 6]); d6 = __addDisposableResource(env_20, (_a = {}, _a[Symbol.asyncDispose] = function () { return __awaiter(this, void 0, void 0, function () { return __generator(this, function (_a) { return [2 /*return*/]; @@ -346,7 +346,7 @@ try { env_21 = { stack: [], error: void 0, hasError: false }; _b.label = 1; case 1: - _b.trys.push([1, 2, 3, 6]); + _b.tries.push([1, 2, 3, 6]); d7 = __addDisposableResource(env_21, (_a = {}, _a[Symbol.asyncDispose] = function () { return __awaiter(this, void 0, void 0, function () { return __generator(this, function (_a) { return [2 /*return*/]; @@ -381,7 +381,7 @@ try { env_22 = { stack: [], error: void 0, hasError: false }; _b.label = 1; case 1: - _b.trys.push([1, 3, 4, 7]); + _b.tries.push([1, 3, 4, 7]); d13 = __addDisposableResource(env_22, (_a = {}, _a[Symbol.asyncDispose] = function () { return __awaiter(this, void 0, void 0, function () { return __generator(this, function (_a) { return [2 /*return*/]; @@ -419,7 +419,7 @@ try { env_23 = { stack: [], error: void 0, hasError: false }; _b.label = 1; case 1: - _b.trys.push([1, 5, 6, 9]); + _b.tries.push([1, 5, 6, 9]); d15 = __addDisposableResource(env_23, (_a = {}, _a[Symbol.asyncDispose] = function () { return __awaiter(this, void 0, void 0, function () { return __generator(this, function (_a) { return [2 /*return*/]; diff --git a/tests/baselines/reference/awaitUsingDeclarations.2(target=es5).js b/tests/baselines/reference/awaitUsingDeclarations.2(target=es5).js index 7241ac59bb64e..baef4c5d653f9 100644 --- a/tests/baselines/reference/awaitUsingDeclarations.2(target=es5).js +++ b/tests/baselines/reference/awaitUsingDeclarations.2(target=es5).js @@ -19,7 +19,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge }); }; var __generator = (this && this.__generator) || function (thisArg, body) { - var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); + var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, tries: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; function verb(n) { return function (v) { return step([n, v]); }; } function step(op) { @@ -31,14 +31,14 @@ var __generator = (this && this.__generator) || function (thisArg, body) { case 0: case 1: t = op; break; case 4: _.label++; return { value: op[1], done: false }; case 5: _.label++; y = op[1]; op = [0]; continue; - case 7: op = _.ops.pop(); _.trys.pop(); continue; + case 7: op = _.ops.pop(); _.tries.pop(); continue; default: - if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } + if (!(t = _.tries, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } if (t[2]) _.ops.pop(); - _.trys.pop(); continue; + _.tries.pop(); continue; } op = body.call(thisArg, _); } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } diff --git a/tests/baselines/reference/awaitUsingDeclarations.3(target=es5).js b/tests/baselines/reference/awaitUsingDeclarations.3(target=es5).js index c774b207cdb52..a850e52c95c6d 100644 --- a/tests/baselines/reference/awaitUsingDeclarations.3(target=es5).js +++ b/tests/baselines/reference/awaitUsingDeclarations.3(target=es5).js @@ -21,7 +21,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge }); }; var __generator = (this && this.__generator) || function (thisArg, body) { - var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); + var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, tries: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; function verb(n) { return function (v) { return step([n, v]); }; } function step(op) { @@ -33,14 +33,14 @@ var __generator = (this && this.__generator) || function (thisArg, body) { case 0: case 1: t = op; break; case 4: _.label++; return { value: op[1], done: false }; case 5: _.label++; y = op[1]; op = [0]; continue; - case 7: op = _.ops.pop(); _.trys.pop(); continue; + case 7: op = _.ops.pop(); _.tries.pop(); continue; default: - if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } + if (!(t = _.tries, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } if (t[2]) _.ops.pop(); - _.trys.pop(); continue; + _.tries.pop(); continue; } op = body.call(thisArg, _); } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } diff --git a/tests/baselines/reference/awaitUsingDeclarationsInFor(target=es5).js b/tests/baselines/reference/awaitUsingDeclarationsInFor(target=es5).js index dc7e5ad84cc20..68135ac84c373 100644 --- a/tests/baselines/reference/awaitUsingDeclarationsInFor(target=es5).js +++ b/tests/baselines/reference/awaitUsingDeclarationsInFor(target=es5).js @@ -21,7 +21,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge }); }; var __generator = (this && this.__generator) || function (thisArg, body) { - var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); + var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, tries: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; function verb(n) { return function (v) { return step([n, v]); }; } function step(op) { @@ -33,14 +33,14 @@ var __generator = (this && this.__generator) || function (thisArg, body) { case 0: case 1: t = op; break; case 4: _.label++; return { value: op[1], done: false }; case 5: _.label++; y = op[1]; op = [0]; continue; - case 7: op = _.ops.pop(); _.trys.pop(); continue; + case 7: op = _.ops.pop(); _.tries.pop(); continue; default: - if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } + if (!(t = _.tries, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } if (t[2]) _.ops.pop(); - _.trys.pop(); continue; + _.tries.pop(); continue; } op = body.call(thisArg, _); } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } @@ -109,7 +109,7 @@ function main() { env_1 = { stack: [], error: void 0, hasError: false }; _c.label = 1; case 1: - _c.trys.push([1, 2, 3, 6]); + _c.tries.push([1, 2, 3, 6]); d1 = __addDisposableResource(env_1, (_a = {}, _a[Symbol.dispose] = function () { }, _a), true), d2 = __addDisposableResource(env_1, (_b = {}, _b[Symbol.asyncDispose] = function () { return __awaiter(this, void 0, void 0, function () { return __generator(this, function (_a) { return [2 /*return*/]; diff --git a/tests/baselines/reference/awaitUsingDeclarationsInForAwaitOf(target=es5).js b/tests/baselines/reference/awaitUsingDeclarationsInForAwaitOf(target=es5).js index ae21ea63dce7d..d92ba3e16bc70 100644 --- a/tests/baselines/reference/awaitUsingDeclarationsInForAwaitOf(target=es5).js +++ b/tests/baselines/reference/awaitUsingDeclarationsInForAwaitOf(target=es5).js @@ -18,7 +18,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge }); }; var __generator = (this && this.__generator) || function (thisArg, body) { - var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); + var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, tries: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; function verb(n) { return function (v) { return step([n, v]); }; } function step(op) { @@ -30,14 +30,14 @@ var __generator = (this && this.__generator) || function (thisArg, body) { case 0: case 1: t = op; break; case 4: _.label++; return { value: op[1], done: false }; case 5: _.label++; y = op[1]; op = [0]; continue; - case 7: op = _.ops.pop(); _.trys.pop(); continue; + case 7: op = _.ops.pop(); _.tries.pop(); continue; default: - if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } + if (!(t = _.tries, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } if (t[2]) _.ops.pop(); - _.trys.pop(); continue; + _.tries.pop(); continue; } op = body.call(thisArg, _); } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } @@ -111,7 +111,7 @@ function main() { return __generator(this, function (_j) { switch (_j.label) { case 0: - _j.trys.push([0, 10, 11, 16]); + _j.tries.push([0, 10, 11, 16]); _a = true, _b = __asyncValues([(_d = {}, _d[Symbol.asyncDispose] = function () { return __awaiter(this, void 0, void 0, function () { return __generator(this, function (_a) { return [2 /*return*/]; @@ -127,7 +127,7 @@ function main() { env_1 = { stack: [], error: void 0, hasError: false }; _j.label = 3; case 3: - _j.trys.push([3, 4, 5, 8]); + _j.tries.push([3, 4, 5, 8]); d1 = __addDisposableResource(env_1, d1_1, true); return [3 /*break*/, 8]; case 4: @@ -152,7 +152,7 @@ function main() { e_2 = { error: e_2_1 }; return [3 /*break*/, 16]; case 11: - _j.trys.push([11, , 14, 15]); + _j.tries.push([11, , 14, 15]); if (!(!_a && !_f && (_g = _b.return))) return [3 /*break*/, 13]; return [4 /*yield*/, _g.call(_b)]; case 12: diff --git a/tests/baselines/reference/awaitUsingDeclarationsInForAwaitOf.3(target=es5).js b/tests/baselines/reference/awaitUsingDeclarationsInForAwaitOf.3(target=es5).js index f929d3d0c6ced..54f48612c3234 100644 --- a/tests/baselines/reference/awaitUsingDeclarationsInForAwaitOf.3(target=es5).js +++ b/tests/baselines/reference/awaitUsingDeclarationsInForAwaitOf.3(target=es5).js @@ -24,7 +24,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge }); }; var __generator = (this && this.__generator) || function (thisArg, body) { - var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); + var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, tries: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; function verb(n) { return function (v) { return step([n, v]); }; } function step(op) { @@ -36,14 +36,14 @@ var __generator = (this && this.__generator) || function (thisArg, body) { case 0: case 1: t = op; break; case 4: _.label++; return { value: op[1], done: false }; case 5: _.label++; y = op[1]; op = [0]; continue; - case 7: op = _.ops.pop(); _.trys.pop(); continue; + case 7: op = _.ops.pop(); _.tries.pop(); continue; default: - if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } + if (!(t = _.tries, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } if (t[2]) _.ops.pop(); - _.trys.pop(); continue; + _.tries.pop(); continue; } op = body.call(thisArg, _); } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } @@ -145,7 +145,7 @@ export function test() { return __generator(this, function (_f) { switch (_f.label) { case 0: - _f.trys.push([0, 10, 11, 16]); + _f.tries.push([0, 10, 11, 16]); _a = true, x_2 = __asyncValues(x); _f.label = 1; case 1: return [4 /*yield*/, x_2.next()]; @@ -157,7 +157,7 @@ export function test() { env_2 = { stack: [], error: void 0, hasError: false }; _f.label = 3; case 3: - _f.trys.push([3, 4, 5, 8]); + _f.tries.push([3, 4, 5, 8]); _b = __addDisposableResource(env_2, _b_1, true); ; return [3 /*break*/, 8]; @@ -183,7 +183,7 @@ export function test() { e_4 = { error: e_4_1 }; return [3 /*break*/, 16]; case 11: - _f.trys.push([11, , 14, 15]); + _f.tries.push([11, , 14, 15]); if (!(!_a && !_c && (_d = x_2.return))) return [3 /*break*/, 13]; return [4 /*yield*/, _d.call(x_2)]; case 12: diff --git a/tests/baselines/reference/awaitUsingDeclarationsInForOf.1(target=es5).js b/tests/baselines/reference/awaitUsingDeclarationsInForOf.1(target=es5).js index de4af47d79d03..8d3283dda0e93 100644 --- a/tests/baselines/reference/awaitUsingDeclarationsInForOf.1(target=es5).js +++ b/tests/baselines/reference/awaitUsingDeclarationsInForOf.1(target=es5).js @@ -19,7 +19,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge }); }; var __generator = (this && this.__generator) || function (thisArg, body) { - var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); + var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, tries: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; function verb(n) { return function (v) { return step([n, v]); }; } function step(op) { @@ -31,14 +31,14 @@ var __generator = (this && this.__generator) || function (thisArg, body) { case 0: case 1: t = op; break; case 4: _.label++; return { value: op[1], done: false }; case 5: _.label++; y = op[1]; op = [0]; continue; - case 7: op = _.ops.pop(); _.trys.pop(); continue; + case 7: op = _.ops.pop(); _.tries.pop(); continue; default: - if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } + if (!(t = _.tries, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } if (t[2]) _.ops.pop(); - _.trys.pop(); continue; + _.tries.pop(); continue; } op = body.call(thisArg, _); } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } @@ -116,7 +116,7 @@ function main() { env_1 = { stack: [], error: void 0, hasError: false }; _d.label = 2; case 2: - _d.trys.push([2, 3, 4, 7]); + _d.tries.push([2, 3, 4, 7]); d1 = __addDisposableResource(env_1, d1_1, true); return [3 /*break*/, 7]; case 3: diff --git a/tests/baselines/reference/awaitUsingDeclarationsInForOf.5(target=es5).js b/tests/baselines/reference/awaitUsingDeclarationsInForOf.5(target=es5).js index 6b9e8308d45a9..dc0521f37a8b4 100644 --- a/tests/baselines/reference/awaitUsingDeclarationsInForOf.5(target=es5).js +++ b/tests/baselines/reference/awaitUsingDeclarationsInForOf.5(target=es5).js @@ -24,7 +24,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge }); }; var __generator = (this && this.__generator) || function (thisArg, body) { - var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); + var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, tries: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; function verb(n) { return function (v) { return step([n, v]); }; } function step(op) { @@ -36,14 +36,14 @@ var __generator = (this && this.__generator) || function (thisArg, body) { case 0: case 1: t = op; break; case 4: _.label++; return { value: op[1], done: false }; case 5: _.label++; y = op[1]; op = [0]; continue; - case 7: op = _.ops.pop(); _.trys.pop(); continue; + case 7: op = _.ops.pop(); _.tries.pop(); continue; default: - if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } + if (!(t = _.tries, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } if (t[2]) _.ops.pop(); - _.trys.pop(); continue; + _.tries.pop(); continue; } op = body.call(thisArg, _); } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } @@ -133,7 +133,7 @@ export function test() { env_2 = { stack: [], error: void 0, hasError: false }; _b.label = 2; case 2: - _b.trys.push([2, 3, 4, 7]); + _b.tries.push([2, 3, 4, 7]); _a = __addDisposableResource(env_2, _a_2, true); ; return [3 /*break*/, 7]; diff --git a/tests/baselines/reference/baseIndexSignatureResolution.errors.txt b/tests/baselines/reference/baseIndexSignatureResolution.errors.txt index 15c537d66f2d8..820c969041cf3 100644 --- a/tests/baselines/reference/baseIndexSignatureResolution.errors.txt +++ b/tests/baselines/reference/baseIndexSignatureResolution.errors.txt @@ -11,7 +11,7 @@ baseIndexSignatureResolution.ts(11,5): error TS2322: Type 'null' is not assignab ~ !!! error TS2564: Property 'b' has no initializer and is not definitely assigned in the constructor. - // Note - commmenting "extends Foo" prevents the error + // Note - commenting "extends Foo" prevents the error interface Foo { [i: number]: Base; } diff --git a/tests/baselines/reference/baseIndexSignatureResolution.js b/tests/baselines/reference/baseIndexSignatureResolution.js index ce42439846750..0775716a5deed 100644 --- a/tests/baselines/reference/baseIndexSignatureResolution.js +++ b/tests/baselines/reference/baseIndexSignatureResolution.js @@ -4,7 +4,7 @@ class Base { private a: string; } class Derived extends Base { private b: string; } -// Note - commmenting "extends Foo" prevents the error +// Note - commenting "extends Foo" prevents the error interface Foo { [i: number]: Base; } diff --git a/tests/baselines/reference/baseIndexSignatureResolution.symbols b/tests/baselines/reference/baseIndexSignatureResolution.symbols index 8720e27169f37..b8d760885d53c 100644 --- a/tests/baselines/reference/baseIndexSignatureResolution.symbols +++ b/tests/baselines/reference/baseIndexSignatureResolution.symbols @@ -10,7 +10,7 @@ class Derived extends Base { private b: string; } >Base : Symbol(Base, Decl(baseIndexSignatureResolution.ts, 0, 0)) >b : Symbol(Derived.b, Decl(baseIndexSignatureResolution.ts, 1, 28)) -// Note - commmenting "extends Foo" prevents the error +// Note - commenting "extends Foo" prevents the error interface Foo { >Foo : Symbol(Foo, Decl(baseIndexSignatureResolution.ts, 1, 49)) diff --git a/tests/baselines/reference/baseIndexSignatureResolution.types b/tests/baselines/reference/baseIndexSignatureResolution.types index b32a7be8824d4..7ff33a84a26d2 100644 --- a/tests/baselines/reference/baseIndexSignatureResolution.types +++ b/tests/baselines/reference/baseIndexSignatureResolution.types @@ -15,7 +15,7 @@ class Derived extends Base { private b: string; } >b : string > : ^^^^^^ -// Note - commmenting "extends Foo" prevents the error +// Note - commenting "extends Foo" prevents the error interface Foo { [i: number]: Base; >i : number diff --git a/tests/baselines/reference/bestCommonTypeWithContextualTyping.errors.txt b/tests/baselines/reference/bestCommonTypeWithContextualTyping.errors.txt index 92c77bc2dfa3d..e4c8153354261 100644 --- a/tests/baselines/reference/bestCommonTypeWithContextualTyping.errors.txt +++ b/tests/baselines/reference/bestCommonTypeWithContextualTyping.errors.txt @@ -7,20 +7,20 @@ bestCommonTypeWithContextualTyping.ts(19,31): error TS2873: This kind of express p?: number; } - interface Ellement { + interface Element { dummy; p: any; } - declare var e: Ellement; + declare var e: Element; // All of these should pass. Neither type is a supertype of the other, but the RHS should - // always use Ellement in these examples (not Contextual). Because Ellement is assignable + // always use Element in these examples (not Contextual). Because Element is assignable // to Contextual, no errors. - var arr: Contextual[] = [e]; // Ellement[] - var obj: { [s: string]: Contextual } = { s: e }; // { s: Ellement; [s: string]: Ellement } + var arr: Contextual[] = [e]; // Element[] + var obj: { [s: string]: Contextual } = { s: e }; // { s: Element; [s: string]: Element } - var conditional: Contextual = null ? e : e; // Ellement + var conditional: Contextual = null ? e : e; // Element ~~~~ !!! error TS2873: This kind of expression is always falsy. - var contextualOr: Contextual = e || e; // Ellement \ No newline at end of file + var contextualOr: Contextual = e || e; // Element \ No newline at end of file diff --git a/tests/baselines/reference/bestCommonTypeWithContextualTyping.js b/tests/baselines/reference/bestCommonTypeWithContextualTyping.js index 3eb18c5763db7..9e869e35b94e6 100644 --- a/tests/baselines/reference/bestCommonTypeWithContextualTyping.js +++ b/tests/baselines/reference/bestCommonTypeWithContextualTyping.js @@ -6,28 +6,28 @@ interface Contextual { p?: number; } -interface Ellement { +interface Element { dummy; p: any; } -declare var e: Ellement; +declare var e: Element; // All of these should pass. Neither type is a supertype of the other, but the RHS should -// always use Ellement in these examples (not Contextual). Because Ellement is assignable +// always use Element in these examples (not Contextual). Because Element is assignable // to Contextual, no errors. -var arr: Contextual[] = [e]; // Ellement[] -var obj: { [s: string]: Contextual } = { s: e }; // { s: Ellement; [s: string]: Ellement } +var arr: Contextual[] = [e]; // Element[] +var obj: { [s: string]: Contextual } = { s: e }; // { s: Element; [s: string]: Element } -var conditional: Contextual = null ? e : e; // Ellement -var contextualOr: Contextual = e || e; // Ellement +var conditional: Contextual = null ? e : e; // Element +var contextualOr: Contextual = e || e; // Element //// [bestCommonTypeWithContextualTyping.js] "use strict"; // All of these should pass. Neither type is a supertype of the other, but the RHS should -// always use Ellement in these examples (not Contextual). Because Ellement is assignable +// always use Element in these examples (not Contextual). Because Element is assignable // to Contextual, no errors. -var arr = [e]; // Ellement[] -var obj = { s: e }; // { s: Ellement; [s: string]: Ellement } -var conditional = null ? e : e; // Ellement -var contextualOr = e || e; // Ellement +var arr = [e]; // Element[] +var obj = { s: e }; // { s: Element; [s: string]: Element } +var conditional = null ? e : e; // Element +var contextualOr = e || e; // Element diff --git a/tests/baselines/reference/bestCommonTypeWithContextualTyping.symbols b/tests/baselines/reference/bestCommonTypeWithContextualTyping.symbols index cd2055da1f232..8d7ac282b7c2a 100644 --- a/tests/baselines/reference/bestCommonTypeWithContextualTyping.symbols +++ b/tests/baselines/reference/bestCommonTypeWithContextualTyping.symbols @@ -11,42 +11,42 @@ interface Contextual { >p : Symbol(Contextual.p, Decl(bestCommonTypeWithContextualTyping.ts, 1, 10)) } -interface Ellement { ->Ellement : Symbol(Ellement, Decl(bestCommonTypeWithContextualTyping.ts, 3, 1)) +interface Element { +>Element : Symbol(Element, Decl(bestCommonTypeWithContextualTyping.ts, 3, 1)) dummy; ->dummy : Symbol(Ellement.dummy, Decl(bestCommonTypeWithContextualTyping.ts, 5, 20)) +>dummy : Symbol(Element.dummy, Decl(bestCommonTypeWithContextualTyping.ts, 5, 20)) p: any; ->p : Symbol(Ellement.p, Decl(bestCommonTypeWithContextualTyping.ts, 6, 10)) +>p : Symbol(Element.p, Decl(bestCommonTypeWithContextualTyping.ts, 6, 10)) } -declare var e: Ellement; +declare var e: Element; >e : Symbol(e, Decl(bestCommonTypeWithContextualTyping.ts, 10, 11)) ->Ellement : Symbol(Ellement, Decl(bestCommonTypeWithContextualTyping.ts, 3, 1)) +>Element : Symbol(Element, Decl(bestCommonTypeWithContextualTyping.ts, 3, 1)) // All of these should pass. Neither type is a supertype of the other, but the RHS should -// always use Ellement in these examples (not Contextual). Because Ellement is assignable +// always use Element in these examples (not Contextual). Because Element is assignable // to Contextual, no errors. -var arr: Contextual[] = [e]; // Ellement[] +var arr: Contextual[] = [e]; // Element[] >arr : Symbol(arr, Decl(bestCommonTypeWithContextualTyping.ts, 15, 3)) >Contextual : Symbol(Contextual, Decl(bestCommonTypeWithContextualTyping.ts, 0, 0)) >e : Symbol(e, Decl(bestCommonTypeWithContextualTyping.ts, 10, 11)) -var obj: { [s: string]: Contextual } = { s: e }; // { s: Ellement; [s: string]: Ellement } +var obj: { [s: string]: Contextual } = { s: e }; // { s: Element; [s: string]: Element } >obj : Symbol(obj, Decl(bestCommonTypeWithContextualTyping.ts, 16, 3)) >s : Symbol(s, Decl(bestCommonTypeWithContextualTyping.ts, 16, 12)) >Contextual : Symbol(Contextual, Decl(bestCommonTypeWithContextualTyping.ts, 0, 0)) >s : Symbol(s, Decl(bestCommonTypeWithContextualTyping.ts, 16, 40)) >e : Symbol(e, Decl(bestCommonTypeWithContextualTyping.ts, 10, 11)) -var conditional: Contextual = null ? e : e; // Ellement +var conditional: Contextual = null ? e : e; // Element >conditional : Symbol(conditional, Decl(bestCommonTypeWithContextualTyping.ts, 18, 3)) >Contextual : Symbol(Contextual, Decl(bestCommonTypeWithContextualTyping.ts, 0, 0)) >e : Symbol(e, Decl(bestCommonTypeWithContextualTyping.ts, 10, 11)) >e : Symbol(e, Decl(bestCommonTypeWithContextualTyping.ts, 10, 11)) -var contextualOr: Contextual = e || e; // Ellement +var contextualOr: Contextual = e || e; // Element >contextualOr : Symbol(contextualOr, Decl(bestCommonTypeWithContextualTyping.ts, 19, 3)) >Contextual : Symbol(Contextual, Decl(bestCommonTypeWithContextualTyping.ts, 0, 0)) >e : Symbol(e, Decl(bestCommonTypeWithContextualTyping.ts, 10, 11)) diff --git a/tests/baselines/reference/bestCommonTypeWithContextualTyping.types b/tests/baselines/reference/bestCommonTypeWithContextualTyping.types index e60e4114561e8..b48ae611efb10 100644 --- a/tests/baselines/reference/bestCommonTypeWithContextualTyping.types +++ b/tests/baselines/reference/bestCommonTypeWithContextualTyping.types @@ -11,7 +11,7 @@ interface Contextual { > : ^^^^^^ } -interface Ellement { +interface Element { dummy; >dummy : any > : ^^^ @@ -21,50 +21,50 @@ interface Ellement { > : ^^^ } -declare var e: Ellement; ->e : Ellement +declare var e: Element; +>e : Element > : ^^^^^^^^ // All of these should pass. Neither type is a supertype of the other, but the RHS should -// always use Ellement in these examples (not Contextual). Because Ellement is assignable +// always use Element in these examples (not Contextual). Because Element is assignable // to Contextual, no errors. -var arr: Contextual[] = [e]; // Ellement[] +var arr: Contextual[] = [e]; // Element[] >arr : Contextual[] > : ^^^^^^^^^^^^ ->[e] : Ellement[] +>[e] : Element[] > : ^^^^^^^^^^ ->e : Ellement +>e : Element > : ^^^^^^^^ -var obj: { [s: string]: Contextual } = { s: e }; // { s: Ellement; [s: string]: Ellement } +var obj: { [s: string]: Contextual } = { s: e }; // { s: Element; [s: string]: Element } >obj : { [s: string]: Contextual; } > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ >s : string > : ^^^^^^ ->{ s: e } : { s: Ellement; } +>{ s: e } : { s: Element; } > : ^^^^^^^^^^^^^^^^ ->s : Ellement +>s : Element > : ^^^^^^^^ ->e : Ellement +>e : Element > : ^^^^^^^^ -var conditional: Contextual = null ? e : e; // Ellement +var conditional: Contextual = null ? e : e; // Element >conditional : Contextual > : ^^^^^^^^^^ ->null ? e : e : Ellement +>null ? e : e : Element > : ^^^^^^^^ ->e : Ellement +>e : Element > : ^^^^^^^^ ->e : Ellement +>e : Element > : ^^^^^^^^ -var contextualOr: Contextual = e || e; // Ellement +var contextualOr: Contextual = e || e; // Element >contextualOr : Contextual > : ^^^^^^^^^^ ->e || e : Ellement +>e || e : Element > : ^^^^^^^^ ->e : Ellement +>e : Element > : ^^^^^^^^ ->e : Ellement +>e : Element > : ^^^^^^^^ diff --git a/tests/baselines/reference/binderBinaryExpressionStress.js b/tests/baselines/reference/binderBinaryExpressionStress.js index 45fd955c280a5..81778ca71568a 100644 --- a/tests/baselines/reference/binderBinaryExpressionStress.js +++ b/tests/baselines/reference/binderBinaryExpressionStress.js @@ -2,7 +2,7 @@ //// [binderBinaryExpressionStress.ts] // regression test for https://github.com/microsoft/TypeScript/issues/35633 -// If we need to emit comments or subsitutions for a node, we have to skip the trampoline +// If we need to emit comments or substitutions for a node, we have to skip the trampoline // that allows us to handle emitting arbitrarily complex binary expressions // so we simplify the emit as much as possible to allow us to emit. In addition, // we disable the type & symbol baselines just because they're _way too big_ diff --git a/tests/baselines/reference/bindingPatternCannotBeOnlyInferenceSource.errors.txt b/tests/baselines/reference/bindingPatternCannotBeOnlyInferenceSource.errors.txt index c5f979027174c..933fcddd6fa56 100644 --- a/tests/baselines/reference/bindingPatternCannotBeOnlyInferenceSource.errors.txt +++ b/tests/baselines/reference/bindingPatternCannotBeOnlyInferenceSource.errors.txt @@ -36,7 +36,7 @@ bindingPatternCannotBeOnlyInferenceSource.ts(5,7): error TS2488: Type 'unknown' declare function useReduxDispatch1>(destructuring: Destructuring): T; const {} = useReduxDispatch1( (d, f) => ({ - funcA: (...p) => d(f.funcA(...p)), // p should be inferrable + funcA: (...p) => d(f.funcA(...p)), // p should be inferable funcB: (...p) => d(f.funcB(...p)), funcC: (...p) => d(f.funcC(...p)), }) diff --git a/tests/baselines/reference/bindingPatternCannotBeOnlyInferenceSource.js b/tests/baselines/reference/bindingPatternCannotBeOnlyInferenceSource.js index c80aceda7b632..b8ca7291cc397 100644 --- a/tests/baselines/reference/bindingPatternCannotBeOnlyInferenceSource.js +++ b/tests/baselines/reference/bindingPatternCannotBeOnlyInferenceSource.js @@ -21,7 +21,7 @@ type TFuncs1 = typeof funcs1; declare function useReduxDispatch1>(destructuring: Destructuring): T; const {} = useReduxDispatch1( (d, f) => ({ - funcA: (...p) => d(f.funcA(...p)), // p should be inferrable + funcA: (...p) => d(f.funcA(...p)), // p should be inferable funcB: (...p) => d(f.funcB(...p)), funcC: (...p) => d(f.funcC(...p)), }) @@ -40,7 +40,7 @@ const funcs1 = { funcC: (c, cc, ccc) => { }, }; const {} = useReduxDispatch1((d, f) => ({ - funcA: (...p) => d(f.funcA(...p)), // p should be inferrable + funcA: (...p) => d(f.funcA(...p)), // p should be inferable funcB: (...p) => d(f.funcB(...p)), funcC: (...p) => d(f.funcC(...p)), })); diff --git a/tests/baselines/reference/bindingPatternCannotBeOnlyInferenceSource.symbols b/tests/baselines/reference/bindingPatternCannotBeOnlyInferenceSource.symbols index ee5c7bb2ecf64..a2dc602d9be27 100644 --- a/tests/baselines/reference/bindingPatternCannotBeOnlyInferenceSource.symbols +++ b/tests/baselines/reference/bindingPatternCannotBeOnlyInferenceSource.symbols @@ -103,7 +103,7 @@ const {} = useReduxDispatch1( >d : Symbol(d, Decl(bindingPatternCannotBeOnlyInferenceSource.ts, 19, 5)) >f : Symbol(f, Decl(bindingPatternCannotBeOnlyInferenceSource.ts, 19, 7)) - funcA: (...p) => d(f.funcA(...p)), // p should be inferrable + funcA: (...p) => d(f.funcA(...p)), // p should be inferable >funcA : Symbol(funcA, Decl(bindingPatternCannotBeOnlyInferenceSource.ts, 19, 16)) >p : Symbol(p, Decl(bindingPatternCannotBeOnlyInferenceSource.ts, 20, 16)) >d : Symbol(d, Decl(bindingPatternCannotBeOnlyInferenceSource.ts, 19, 5)) diff --git a/tests/baselines/reference/bindingPatternCannotBeOnlyInferenceSource.types b/tests/baselines/reference/bindingPatternCannotBeOnlyInferenceSource.types index 53bac68d19430..ce980acefce7c 100644 --- a/tests/baselines/reference/bindingPatternCannotBeOnlyInferenceSource.types +++ b/tests/baselines/reference/bindingPatternCannotBeOnlyInferenceSource.types @@ -118,24 +118,24 @@ declare function useReduxDispatch1>(destructur > : ^^^^^^^^^^^^^^^^^^^^^^^^ ^^ ^^^^^ ^^^^^^^^^^ ^^ ^^ ^^ ^^^^^ ^^^^^^^^^^ ^^ ^^ ^^ ^^ ^^ ^^^^^ ^^^^^^^ const {} = useReduxDispatch1( ->useReduxDispatch1( (d, f) => ({ funcA: (...p) => d(f.funcA(...p)), // p should be inferrable funcB: (...p) => d(f.funcB(...p)), funcC: (...p) => d(f.funcC(...p)), })) : { funcA: (a: boolean) => void; funcB: (b: string, bb: string) => void; funcC: (c: number, cc: number, ccc: boolean) => void; } +>useReduxDispatch1( (d, f) => ({ funcA: (...p) => d(f.funcA(...p)), // p should be inferable funcB: (...p) => d(f.funcB(...p)), funcC: (...p) => d(f.funcC(...p)), })) : { funcA: (a: boolean) => void; funcB: (b: string, bb: string) => void; funcC: (c: number, cc: number, ccc: boolean) => void; } > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ >useReduxDispatch1 : >(destructuring: Destructuring) => T > : ^ ^^^^^^^^^ ^^ ^^ ^^^^^ (d, f) => ({ ->(d, f) => ({ funcA: (...p) => d(f.funcA(...p)), // p should be inferrable funcB: (...p) => d(f.funcB(...p)), funcC: (...p) => d(f.funcC(...p)), }) : (d: Dispatch, f: { funcA: (a: boolean) => void; funcB: (b: string, bb: string) => void; funcC: (c: number, cc: number, ccc: boolean) => void; }) => { funcA: (a: boolean) => void; funcB: (b: string, bb: string) => void; funcC: (c: number, cc: number, ccc: boolean) => void; } +>(d, f) => ({ funcA: (...p) => d(f.funcA(...p)), // p should be inferable funcB: (...p) => d(f.funcB(...p)), funcC: (...p) => d(f.funcC(...p)), }) : (d: Dispatch, f: { funcA: (a: boolean) => void; funcB: (b: string, bb: string) => void; funcC: (c: number, cc: number, ccc: boolean) => void; }) => { funcA: (a: boolean) => void; funcB: (b: string, bb: string) => void; funcC: (c: number, cc: number, ccc: boolean) => void; } > : ^ ^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^ ^^ ^^^^^ ^^^^^^^^^^ ^^ ^^ ^^ ^^^^^ ^^^^^^^^^^ ^^ ^^ ^^ ^^ ^^ ^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ >d : Dispatch > : ^^^^^^^^^^^^^ >f : { funcA: (a: boolean) => void; funcB: (b: string, bb: string) => void; funcC: (c: number, cc: number, ccc: boolean) => void; } > : ^^^^^^^^^^ ^^ ^^^^^ ^^^^^^^^^^ ^^ ^^ ^^ ^^^^^ ^^^^^^^^^^ ^^ ^^ ^^ ^^ ^^ ^^^^^ ^^^ ->({ funcA: (...p) => d(f.funcA(...p)), // p should be inferrable funcB: (...p) => d(f.funcB(...p)), funcC: (...p) => d(f.funcC(...p)), }) : { funcA: (a: boolean) => void; funcB: (b: string, bb: string) => void; funcC: (c: number, cc: number, ccc: boolean) => void; } +>({ funcA: (...p) => d(f.funcA(...p)), // p should be inferable funcB: (...p) => d(f.funcB(...p)), funcC: (...p) => d(f.funcC(...p)), }) : { funcA: (a: boolean) => void; funcB: (b: string, bb: string) => void; funcC: (c: number, cc: number, ccc: boolean) => void; } > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ->{ funcA: (...p) => d(f.funcA(...p)), // p should be inferrable funcB: (...p) => d(f.funcB(...p)), funcC: (...p) => d(f.funcC(...p)), } : { funcA: (a: boolean) => void; funcB: (b: string, bb: string) => void; funcC: (c: number, cc: number, ccc: boolean) => void; } +>{ funcA: (...p) => d(f.funcA(...p)), // p should be inferable funcB: (...p) => d(f.funcB(...p)), funcC: (...p) => d(f.funcC(...p)), } : { funcA: (a: boolean) => void; funcB: (b: string, bb: string) => void; funcC: (c: number, cc: number, ccc: boolean) => void; } > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - funcA: (...p) => d(f.funcA(...p)), // p should be inferrable + funcA: (...p) => d(f.funcA(...p)), // p should be inferable >funcA : (a: boolean) => void > : ^^^^^^^^^^^^^^^^^^^^ >(...p) => d(f.funcA(...p)) : (a: boolean) => void diff --git a/tests/baselines/reference/blockScopedBindingsInDownlevelGenerator(target=es5).js b/tests/baselines/reference/blockScopedBindingsInDownlevelGenerator(target=es5).js index fe8e2955d7113..747a907b9dfb0 100644 --- a/tests/baselines/reference/blockScopedBindingsInDownlevelGenerator(target=es5).js +++ b/tests/baselines/reference/blockScopedBindingsInDownlevelGenerator(target=es5).js @@ -11,7 +11,7 @@ function* a() { //// [blockScopedBindingsInDownlevelGenerator.js] "use strict"; var __generator = (this && this.__generator) || function (thisArg, body) { - var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); + var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, tries: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; function verb(n) { return function (v) { return step([n, v]); }; } function step(op) { @@ -23,14 +23,14 @@ var __generator = (this && this.__generator) || function (thisArg, body) { case 0: case 1: t = op; break; case 4: _.label++; return { value: op[1], done: false }; case 5: _.label++; y = op[1]; op = [0]; continue; - case 7: op = _.ops.pop(); _.trys.pop(); continue; + case 7: op = _.ops.pop(); _.tries.pop(); continue; default: - if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } + if (!(t = _.tries, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } if (t[2]) _.ops.pop(); - _.trys.pop(); continue; + _.tries.pop(); continue; } op = body.call(thisArg, _); } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } @@ -68,7 +68,7 @@ function a() { }; _d.label = 1; case 1: - _d.trys.push([1, 6, 7, 8]); + _d.tries.push([1, 6, 7, 8]); _a = __values([1, 2, 3]), _b = _a.next(); _d.label = 2; case 2: diff --git a/tests/baselines/reference/blockScopedVariablesUseBeforeDef(target=es5).js b/tests/baselines/reference/blockScopedVariablesUseBeforeDef(target=es5).js index 6340aa1eea313..3075c0722144b 100644 --- a/tests/baselines/reference/blockScopedVariablesUseBeforeDef(target=es5).js +++ b/tests/baselines/reference/blockScopedVariablesUseBeforeDef(target=es5).js @@ -173,7 +173,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge }); }; var __generator = (this && this.__generator) || function (thisArg, body) { - var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); + var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, tries: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; function verb(n) { return function (v) { return step([n, v]); }; } function step(op) { @@ -185,14 +185,14 @@ var __generator = (this && this.__generator) || function (thisArg, body) { case 0: case 1: t = op; break; case 4: _.label++; return { value: op[1], done: false }; case 5: _.label++; y = op[1]; op = [0]; continue; - case 7: op = _.ops.pop(); _.trys.pop(); continue; + case 7: op = _.ops.pop(); _.tries.pop(); continue; default: - if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } + if (!(t = _.tries, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } if (t[2]) _.ops.pop(); - _.trys.pop(); continue; + _.tries.pop(); continue; } op = body.call(thisArg, _); } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } diff --git a/tests/baselines/reference/callOfConditionalTypeWithConcreteBranches.js b/tests/baselines/reference/callOfConditionalTypeWithConcreteBranches.js index 257c144596c5c..0ba600f130056 100644 --- a/tests/baselines/reference/callOfConditionalTypeWithConcreteBranches.js +++ b/tests/baselines/reference/callOfConditionalTypeWithConcreteBranches.js @@ -31,7 +31,7 @@ function fn2(arg: Q2) { fn2(m => m(42)); fn2(m => m(42)); -// webidl-conversions example where substituion must occur, despite contravariance of the position +// webidl-conversions example where substitution must occur, despite contravariance of the position // due to the invariant usage in `Parameters` type X = V extends (...args: any[]) => any ? (...args: Parameters) => void : Function; diff --git a/tests/baselines/reference/callOfConditionalTypeWithConcreteBranches.symbols b/tests/baselines/reference/callOfConditionalTypeWithConcreteBranches.symbols index 5d4a94718915f..3f4e4cbcee637 100644 --- a/tests/baselines/reference/callOfConditionalTypeWithConcreteBranches.symbols +++ b/tests/baselines/reference/callOfConditionalTypeWithConcreteBranches.symbols @@ -92,7 +92,7 @@ fn2(m => m(42)); >m : Symbol(m, Decl(callOfConditionalTypeWithConcreteBranches.ts, 28, 12)) >m : Symbol(m, Decl(callOfConditionalTypeWithConcreteBranches.ts, 28, 12)) -// webidl-conversions example where substituion must occur, despite contravariance of the position +// webidl-conversions example where substitution must occur, despite contravariance of the position // due to the invariant usage in `Parameters` type X = V extends (...args: any[]) => any ? (...args: Parameters) => void : Function; diff --git a/tests/baselines/reference/callOfConditionalTypeWithConcreteBranches.types b/tests/baselines/reference/callOfConditionalTypeWithConcreteBranches.types index 18587d635d7c1..d805983f62b28 100644 --- a/tests/baselines/reference/callOfConditionalTypeWithConcreteBranches.types +++ b/tests/baselines/reference/callOfConditionalTypeWithConcreteBranches.types @@ -143,7 +143,7 @@ fn2(m => m(42)); >42 : 42 > : ^^ -// webidl-conversions example where substituion must occur, despite contravariance of the position +// webidl-conversions example where substitution must occur, despite contravariance of the position // due to the invariant usage in `Parameters` type X = V extends (...args: any[]) => any ? (...args: Parameters) => void : Function; diff --git a/tests/baselines/reference/canWatch/canWatchAtTypesDos.baseline.md b/tests/baselines/reference/canWatch/canWatchAtTypesDos.baseline.md index ceadaec49e1e0..81080b4f12d63 100644 --- a/tests/baselines/reference/canWatch/canWatchAtTypesDos.baseline.md +++ b/tests/baselines/reference/canWatch/canWatchAtTypesDos.baseline.md @@ -1,7 +1,7 @@ # canWatchAtTypes Determines if given node_modules/@types can be watched. -These are the typeRoots calculated because user didnt specify typeRoots in compierOptions +These are the typeRoots calculated because user didn't specify typeRoots in compierOptions ## Testing for Dos root: c:/ diff --git a/tests/baselines/reference/canWatch/canWatchAtTypesPosix.baseline.md b/tests/baselines/reference/canWatch/canWatchAtTypesPosix.baseline.md index 157005e7a1954..d434161aede9c 100644 --- a/tests/baselines/reference/canWatch/canWatchAtTypesPosix.baseline.md +++ b/tests/baselines/reference/canWatch/canWatchAtTypesPosix.baseline.md @@ -1,7 +1,7 @@ # canWatchAtTypes Determines if given node_modules/@types can be watched. -These are the typeRoots calculated because user didnt specify typeRoots in compierOptions +These are the typeRoots calculated because user didn't specify typeRoots in compierOptions ## Testing for Posix root: / diff --git a/tests/baselines/reference/canWatch/canWatchAtTypesUnc.baseline.md b/tests/baselines/reference/canWatch/canWatchAtTypesUnc.baseline.md index ed24ca81da906..2400dc8d7134a 100644 --- a/tests/baselines/reference/canWatch/canWatchAtTypesUnc.baseline.md +++ b/tests/baselines/reference/canWatch/canWatchAtTypesUnc.baseline.md @@ -1,7 +1,7 @@ # canWatchAtTypes Determines if given node_modules/@types can be watched. -These are the typeRoots calculated because user didnt specify typeRoots in compierOptions +These are the typeRoots calculated because user didn't specify typeRoots in compierOptions ## Testing for Unc root: //vda1cs4850/ diff --git a/tests/baselines/reference/canWatch/canWatchAtTypesUncDos.baseline.md b/tests/baselines/reference/canWatch/canWatchAtTypesUncDos.baseline.md index 264ea11a86b8a..7b4ced15e8d9f 100644 --- a/tests/baselines/reference/canWatch/canWatchAtTypesUncDos.baseline.md +++ b/tests/baselines/reference/canWatch/canWatchAtTypesUncDos.baseline.md @@ -1,7 +1,7 @@ # canWatchAtTypes Determines if given node_modules/@types can be watched. -These are the typeRoots calculated because user didnt specify typeRoots in compierOptions +These are the typeRoots calculated because user didn't specify typeRoots in compierOptions ## Testing for UncDos root: //vda1cs4850/c$ diff --git a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationAtTypesIndirDos.baseline.md b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationAtTypesIndirDos.baseline.md index c0ad5bf2d1f24..0b6dd4b1f582e 100644 --- a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationAtTypesIndirDos.baseline.md +++ b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationAtTypesIndirDos.baseline.md @@ -1,6 +1,6 @@ # getDirectoryToWatchFailedLookupLocationAtTypesIndir -Determines whether to watch given failed lookup location (file that didnt exist) when resolving module. +Determines whether to watch given failed lookup location (file that didn't exist) when resolving module. It also determines the directory to watch and whether to watch it recursively or not. ## Testing for Dos root: c:/ diff --git a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationAtTypesIndirNonRecursiveDos.baseline.md b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationAtTypesIndirNonRecursiveDos.baseline.md index 316b527f681de..0a7085c26dfa1 100644 --- a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationAtTypesIndirNonRecursiveDos.baseline.md +++ b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationAtTypesIndirNonRecursiveDos.baseline.md @@ -1,6 +1,6 @@ # getDirectoryToWatchFailedLookupLocationAtTypesIndirNonRecursive -Determines whether to watch given failed lookup location (file that didnt exist) when resolving module. +Determines whether to watch given failed lookup location (file that didn't exist) when resolving module. It also determines the directory to watch and whether to watch it recursively or not. ## Testing for Dos root: c:/ diff --git a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationAtTypesIndirNonRecursivePosix.baseline.md b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationAtTypesIndirNonRecursivePosix.baseline.md index 414e2c9a178ef..9884dbf98ffd9 100644 --- a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationAtTypesIndirNonRecursivePosix.baseline.md +++ b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationAtTypesIndirNonRecursivePosix.baseline.md @@ -1,6 +1,6 @@ # getDirectoryToWatchFailedLookupLocationAtTypesIndirNonRecursive -Determines whether to watch given failed lookup location (file that didnt exist) when resolving module. +Determines whether to watch given failed lookup location (file that didn't exist) when resolving module. It also determines the directory to watch and whether to watch it recursively or not. ## Testing for Posix root: / diff --git a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationAtTypesIndirNonRecursiveUnc.baseline.md b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationAtTypesIndirNonRecursiveUnc.baseline.md index db653c6e2fa1f..aaff5e7a93479 100644 --- a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationAtTypesIndirNonRecursiveUnc.baseline.md +++ b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationAtTypesIndirNonRecursiveUnc.baseline.md @@ -1,6 +1,6 @@ # getDirectoryToWatchFailedLookupLocationAtTypesIndirNonRecursive -Determines whether to watch given failed lookup location (file that didnt exist) when resolving module. +Determines whether to watch given failed lookup location (file that didn't exist) when resolving module. It also determines the directory to watch and whether to watch it recursively or not. ## Testing for Unc root: //vda1cs4850/ diff --git a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationAtTypesIndirNonRecursiveUncDos.baseline.md b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationAtTypesIndirNonRecursiveUncDos.baseline.md index 1a7c89ae6c9f0..47191411de979 100644 --- a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationAtTypesIndirNonRecursiveUncDos.baseline.md +++ b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationAtTypesIndirNonRecursiveUncDos.baseline.md @@ -1,6 +1,6 @@ # getDirectoryToWatchFailedLookupLocationAtTypesIndirNonRecursive -Determines whether to watch given failed lookup location (file that didnt exist) when resolving module. +Determines whether to watch given failed lookup location (file that didn't exist) when resolving module. It also determines the directory to watch and whether to watch it recursively or not. ## Testing for UncDos root: //vda1cs4850/c$ diff --git a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationAtTypesIndirPosix.baseline.md b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationAtTypesIndirPosix.baseline.md index cd55d55720677..da431b5c65fab 100644 --- a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationAtTypesIndirPosix.baseline.md +++ b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationAtTypesIndirPosix.baseline.md @@ -1,6 +1,6 @@ # getDirectoryToWatchFailedLookupLocationAtTypesIndir -Determines whether to watch given failed lookup location (file that didnt exist) when resolving module. +Determines whether to watch given failed lookup location (file that didn't exist) when resolving module. It also determines the directory to watch and whether to watch it recursively or not. ## Testing for Posix root: / diff --git a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationAtTypesIndirUnc.baseline.md b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationAtTypesIndirUnc.baseline.md index d0a5d63756e9c..caf073c2a5cd2 100644 --- a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationAtTypesIndirUnc.baseline.md +++ b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationAtTypesIndirUnc.baseline.md @@ -1,6 +1,6 @@ # getDirectoryToWatchFailedLookupLocationAtTypesIndir -Determines whether to watch given failed lookup location (file that didnt exist) when resolving module. +Determines whether to watch given failed lookup location (file that didn't exist) when resolving module. It also determines the directory to watch and whether to watch it recursively or not. ## Testing for Unc root: //vda1cs4850/ diff --git a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationAtTypesIndirUncDos.baseline.md b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationAtTypesIndirUncDos.baseline.md index 1528754379345..08bd437ecf463 100644 --- a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationAtTypesIndirUncDos.baseline.md +++ b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationAtTypesIndirUncDos.baseline.md @@ -1,6 +1,6 @@ # getDirectoryToWatchFailedLookupLocationAtTypesIndir -Determines whether to watch given failed lookup location (file that didnt exist) when resolving module. +Determines whether to watch given failed lookup location (file that didn't exist) when resolving module. It also determines the directory to watch and whether to watch it recursively or not. ## Testing for UncDos root: //vda1cs4850/c$ diff --git a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationAtTypesInfileDos.baseline.md b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationAtTypesInfileDos.baseline.md index 07cb92bc58b3c..f92bf250de58d 100644 --- a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationAtTypesInfileDos.baseline.md +++ b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationAtTypesInfileDos.baseline.md @@ -1,6 +1,6 @@ # getDirectoryToWatchFailedLookupLocationAtTypesInfile -Determines whether to watch given failed lookup location (file that didnt exist) when resolving module. +Determines whether to watch given failed lookup location (file that didn't exist) when resolving module. It also determines the directory to watch and whether to watch it recursively or not. ## Testing for Dos root: c:/ diff --git a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationAtTypesInfileNonRecursiveDos.baseline.md b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationAtTypesInfileNonRecursiveDos.baseline.md index 87913c6b184ab..37f3aa4dc48c8 100644 --- a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationAtTypesInfileNonRecursiveDos.baseline.md +++ b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationAtTypesInfileNonRecursiveDos.baseline.md @@ -1,6 +1,6 @@ # getDirectoryToWatchFailedLookupLocationAtTypesInfileNonRecursive -Determines whether to watch given failed lookup location (file that didnt exist) when resolving module. +Determines whether to watch given failed lookup location (file that didn't exist) when resolving module. It also determines the directory to watch and whether to watch it recursively or not. ## Testing for Dos root: c:/ diff --git a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationAtTypesInfileNonRecursivePosix.baseline.md b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationAtTypesInfileNonRecursivePosix.baseline.md index 9fb0ae9b53c3e..99dddf72148ef 100644 --- a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationAtTypesInfileNonRecursivePosix.baseline.md +++ b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationAtTypesInfileNonRecursivePosix.baseline.md @@ -1,6 +1,6 @@ # getDirectoryToWatchFailedLookupLocationAtTypesInfileNonRecursive -Determines whether to watch given failed lookup location (file that didnt exist) when resolving module. +Determines whether to watch given failed lookup location (file that didn't exist) when resolving module. It also determines the directory to watch and whether to watch it recursively or not. ## Testing for Posix root: / diff --git a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationAtTypesInfileNonRecursiveUnc.baseline.md b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationAtTypesInfileNonRecursiveUnc.baseline.md index 275f42e436bca..04a4b345f5bf9 100644 --- a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationAtTypesInfileNonRecursiveUnc.baseline.md +++ b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationAtTypesInfileNonRecursiveUnc.baseline.md @@ -1,6 +1,6 @@ # getDirectoryToWatchFailedLookupLocationAtTypesInfileNonRecursive -Determines whether to watch given failed lookup location (file that didnt exist) when resolving module. +Determines whether to watch given failed lookup location (file that didn't exist) when resolving module. It also determines the directory to watch and whether to watch it recursively or not. ## Testing for Unc root: //vda1cs4850/ diff --git a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationAtTypesInfileNonRecursiveUncDos.baseline.md b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationAtTypesInfileNonRecursiveUncDos.baseline.md index eda002c4057a4..80a169fa230ec 100644 --- a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationAtTypesInfileNonRecursiveUncDos.baseline.md +++ b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationAtTypesInfileNonRecursiveUncDos.baseline.md @@ -1,6 +1,6 @@ # getDirectoryToWatchFailedLookupLocationAtTypesInfileNonRecursive -Determines whether to watch given failed lookup location (file that didnt exist) when resolving module. +Determines whether to watch given failed lookup location (file that didn't exist) when resolving module. It also determines the directory to watch and whether to watch it recursively or not. ## Testing for UncDos root: //vda1cs4850/c$ diff --git a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationAtTypesInfilePosix.baseline.md b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationAtTypesInfilePosix.baseline.md index e9f8b803de4de..974601e79d7e9 100644 --- a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationAtTypesInfilePosix.baseline.md +++ b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationAtTypesInfilePosix.baseline.md @@ -1,6 +1,6 @@ # getDirectoryToWatchFailedLookupLocationAtTypesInfile -Determines whether to watch given failed lookup location (file that didnt exist) when resolving module. +Determines whether to watch given failed lookup location (file that didn't exist) when resolving module. It also determines the directory to watch and whether to watch it recursively or not. ## Testing for Posix root: / diff --git a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationAtTypesInfileUnc.baseline.md b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationAtTypesInfileUnc.baseline.md index 149d6688c020d..96b33b3f6664d 100644 --- a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationAtTypesInfileUnc.baseline.md +++ b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationAtTypesInfileUnc.baseline.md @@ -1,6 +1,6 @@ # getDirectoryToWatchFailedLookupLocationAtTypesInfile -Determines whether to watch given failed lookup location (file that didnt exist) when resolving module. +Determines whether to watch given failed lookup location (file that didn't exist) when resolving module. It also determines the directory to watch and whether to watch it recursively or not. ## Testing for Unc root: //vda1cs4850/ diff --git a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationAtTypesInfileUncDos.baseline.md b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationAtTypesInfileUncDos.baseline.md index 9e899ebc16422..7afe3ee2a1d13 100644 --- a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationAtTypesInfileUncDos.baseline.md +++ b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationAtTypesInfileUncDos.baseline.md @@ -1,6 +1,6 @@ # getDirectoryToWatchFailedLookupLocationAtTypesInfile -Determines whether to watch given failed lookup location (file that didnt exist) when resolving module. +Determines whether to watch given failed lookup location (file that didn't exist) when resolving module. It also determines the directory to watch and whether to watch it recursively or not. ## Testing for UncDos root: //vda1cs4850/c$ diff --git a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationAtTypesInsubDirDos.baseline.md b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationAtTypesInsubDirDos.baseline.md index c133342803931..dde501527ef1c 100644 --- a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationAtTypesInsubDirDos.baseline.md +++ b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationAtTypesInsubDirDos.baseline.md @@ -1,6 +1,6 @@ # getDirectoryToWatchFailedLookupLocationAtTypesInsubDir -Determines whether to watch given failed lookup location (file that didnt exist) when resolving module. +Determines whether to watch given failed lookup location (file that didn't exist) when resolving module. It also determines the directory to watch and whether to watch it recursively or not. ## Testing for Dos root: c:/ diff --git a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationAtTypesInsubDirNonRecursiveDos.baseline.md b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationAtTypesInsubDirNonRecursiveDos.baseline.md index c817fb276b34a..2cbe0c9e3a39d 100644 --- a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationAtTypesInsubDirNonRecursiveDos.baseline.md +++ b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationAtTypesInsubDirNonRecursiveDos.baseline.md @@ -1,6 +1,6 @@ # getDirectoryToWatchFailedLookupLocationAtTypesInsubDirNonRecursive -Determines whether to watch given failed lookup location (file that didnt exist) when resolving module. +Determines whether to watch given failed lookup location (file that didn't exist) when resolving module. It also determines the directory to watch and whether to watch it recursively or not. ## Testing for Dos root: c:/ diff --git a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationAtTypesInsubDirNonRecursivePosix.baseline.md b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationAtTypesInsubDirNonRecursivePosix.baseline.md index 40dd7436f1bae..ef6223e69cba1 100644 --- a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationAtTypesInsubDirNonRecursivePosix.baseline.md +++ b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationAtTypesInsubDirNonRecursivePosix.baseline.md @@ -1,6 +1,6 @@ # getDirectoryToWatchFailedLookupLocationAtTypesInsubDirNonRecursive -Determines whether to watch given failed lookup location (file that didnt exist) when resolving module. +Determines whether to watch given failed lookup location (file that didn't exist) when resolving module. It also determines the directory to watch and whether to watch it recursively or not. ## Testing for Posix root: / diff --git a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationAtTypesInsubDirNonRecursiveUnc.baseline.md b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationAtTypesInsubDirNonRecursiveUnc.baseline.md index d9b684c855219..6d7b395fa3a72 100644 --- a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationAtTypesInsubDirNonRecursiveUnc.baseline.md +++ b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationAtTypesInsubDirNonRecursiveUnc.baseline.md @@ -1,6 +1,6 @@ # getDirectoryToWatchFailedLookupLocationAtTypesInsubDirNonRecursive -Determines whether to watch given failed lookup location (file that didnt exist) when resolving module. +Determines whether to watch given failed lookup location (file that didn't exist) when resolving module. It also determines the directory to watch and whether to watch it recursively or not. ## Testing for Unc root: //vda1cs4850/ diff --git a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationAtTypesInsubDirNonRecursiveUncDos.baseline.md b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationAtTypesInsubDirNonRecursiveUncDos.baseline.md index 48cd4c9583dbf..34a50d2dab663 100644 --- a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationAtTypesInsubDirNonRecursiveUncDos.baseline.md +++ b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationAtTypesInsubDirNonRecursiveUncDos.baseline.md @@ -1,6 +1,6 @@ # getDirectoryToWatchFailedLookupLocationAtTypesInsubDirNonRecursive -Determines whether to watch given failed lookup location (file that didnt exist) when resolving module. +Determines whether to watch given failed lookup location (file that didn't exist) when resolving module. It also determines the directory to watch and whether to watch it recursively or not. ## Testing for UncDos root: //vda1cs4850/c$ diff --git a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationAtTypesInsubDirPosix.baseline.md b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationAtTypesInsubDirPosix.baseline.md index c4f70b5c69c8c..38ebcf891c712 100644 --- a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationAtTypesInsubDirPosix.baseline.md +++ b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationAtTypesInsubDirPosix.baseline.md @@ -1,6 +1,6 @@ # getDirectoryToWatchFailedLookupLocationAtTypesInsubDir -Determines whether to watch given failed lookup location (file that didnt exist) when resolving module. +Determines whether to watch given failed lookup location (file that didn't exist) when resolving module. It also determines the directory to watch and whether to watch it recursively or not. ## Testing for Posix root: / diff --git a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationAtTypesInsubDirUnc.baseline.md b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationAtTypesInsubDirUnc.baseline.md index 98f650cf051bf..d236348aa578c 100644 --- a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationAtTypesInsubDirUnc.baseline.md +++ b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationAtTypesInsubDirUnc.baseline.md @@ -1,6 +1,6 @@ # getDirectoryToWatchFailedLookupLocationAtTypesInsubDir -Determines whether to watch given failed lookup location (file that didnt exist) when resolving module. +Determines whether to watch given failed lookup location (file that didn't exist) when resolving module. It also determines the directory to watch and whether to watch it recursively or not. ## Testing for Unc root: //vda1cs4850/ diff --git a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationAtTypesInsubDirUncDos.baseline.md b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationAtTypesInsubDirUncDos.baseline.md index 198b51d059810..39d113e9abf78 100644 --- a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationAtTypesInsubDirUncDos.baseline.md +++ b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationAtTypesInsubDirUncDos.baseline.md @@ -1,6 +1,6 @@ # getDirectoryToWatchFailedLookupLocationAtTypesInsubDir -Determines whether to watch given failed lookup location (file that didnt exist) when resolving module. +Determines whether to watch given failed lookup location (file that didn't exist) when resolving module. It also determines the directory to watch and whether to watch it recursively or not. ## Testing for UncDos root: //vda1cs4850/c$ diff --git a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationIndirDos.baseline.md b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationIndirDos.baseline.md index 0bb1f8a7511ce..1a6a2bcb30bcc 100644 --- a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationIndirDos.baseline.md +++ b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationIndirDos.baseline.md @@ -1,6 +1,6 @@ # getDirectoryToWatchFailedLookupLocationIndir -Determines whether to watch given failed lookup location (file that didnt exist) when resolving module. +Determines whether to watch given failed lookup location (file that didn't exist) when resolving module. It also determines the directory to watch and whether to watch it recursively or not. ## Testing for Dos root: c:/ diff --git a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationIndirNonRecursiveDos.baseline.md b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationIndirNonRecursiveDos.baseline.md index 6f0920c6b2762..5a2dcdb7bcd2b 100644 --- a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationIndirNonRecursiveDos.baseline.md +++ b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationIndirNonRecursiveDos.baseline.md @@ -1,6 +1,6 @@ # getDirectoryToWatchFailedLookupLocationIndirNonRecursive -Determines whether to watch given failed lookup location (file that didnt exist) when resolving module. +Determines whether to watch given failed lookup location (file that didn't exist) when resolving module. It also determines the directory to watch and whether to watch it recursively or not. ## Testing for Dos root: c:/ diff --git a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationIndirNonRecursivePosix.baseline.md b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationIndirNonRecursivePosix.baseline.md index 552e6a0f46a0c..37caf2713d689 100644 --- a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationIndirNonRecursivePosix.baseline.md +++ b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationIndirNonRecursivePosix.baseline.md @@ -1,6 +1,6 @@ # getDirectoryToWatchFailedLookupLocationIndirNonRecursive -Determines whether to watch given failed lookup location (file that didnt exist) when resolving module. +Determines whether to watch given failed lookup location (file that didn't exist) when resolving module. It also determines the directory to watch and whether to watch it recursively or not. ## Testing for Posix root: / diff --git a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationIndirNonRecursiveUnc.baseline.md b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationIndirNonRecursiveUnc.baseline.md index fbeb67bdaa10a..5c34904480379 100644 --- a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationIndirNonRecursiveUnc.baseline.md +++ b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationIndirNonRecursiveUnc.baseline.md @@ -1,6 +1,6 @@ # getDirectoryToWatchFailedLookupLocationIndirNonRecursive -Determines whether to watch given failed lookup location (file that didnt exist) when resolving module. +Determines whether to watch given failed lookup location (file that didn't exist) when resolving module. It also determines the directory to watch and whether to watch it recursively or not. ## Testing for Unc root: //vda1cs4850/ diff --git a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationIndirNonRecursiveUncDos.baseline.md b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationIndirNonRecursiveUncDos.baseline.md index 1246e40cefde8..c46824d58edc7 100644 --- a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationIndirNonRecursiveUncDos.baseline.md +++ b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationIndirNonRecursiveUncDos.baseline.md @@ -1,6 +1,6 @@ # getDirectoryToWatchFailedLookupLocationIndirNonRecursive -Determines whether to watch given failed lookup location (file that didnt exist) when resolving module. +Determines whether to watch given failed lookup location (file that didn't exist) when resolving module. It also determines the directory to watch and whether to watch it recursively or not. ## Testing for UncDos root: //vda1cs4850/c$ diff --git a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationIndirPosix.baseline.md b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationIndirPosix.baseline.md index 65e628d35a914..4628c0cca0db1 100644 --- a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationIndirPosix.baseline.md +++ b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationIndirPosix.baseline.md @@ -1,6 +1,6 @@ # getDirectoryToWatchFailedLookupLocationIndir -Determines whether to watch given failed lookup location (file that didnt exist) when resolving module. +Determines whether to watch given failed lookup location (file that didn't exist) when resolving module. It also determines the directory to watch and whether to watch it recursively or not. ## Testing for Posix root: / diff --git a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationIndirUnc.baseline.md b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationIndirUnc.baseline.md index 4f7dab7b3e7a1..d35ab16d674d9 100644 --- a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationIndirUnc.baseline.md +++ b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationIndirUnc.baseline.md @@ -1,6 +1,6 @@ # getDirectoryToWatchFailedLookupLocationIndir -Determines whether to watch given failed lookup location (file that didnt exist) when resolving module. +Determines whether to watch given failed lookup location (file that didn't exist) when resolving module. It also determines the directory to watch and whether to watch it recursively or not. ## Testing for Unc root: //vda1cs4850/ diff --git a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationIndirUncDos.baseline.md b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationIndirUncDos.baseline.md index bd391728a4ca6..e6512f2b8b026 100644 --- a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationIndirUncDos.baseline.md +++ b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationIndirUncDos.baseline.md @@ -1,6 +1,6 @@ # getDirectoryToWatchFailedLookupLocationIndir -Determines whether to watch given failed lookup location (file that didnt exist) when resolving module. +Determines whether to watch given failed lookup location (file that didn't exist) when resolving module. It also determines the directory to watch and whether to watch it recursively or not. ## Testing for UncDos root: //vda1cs4850/c$ diff --git a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationInfileDos.baseline.md b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationInfileDos.baseline.md index 96339fc2c036b..b89b72a93b1ef 100644 --- a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationInfileDos.baseline.md +++ b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationInfileDos.baseline.md @@ -1,6 +1,6 @@ # getDirectoryToWatchFailedLookupLocationInfile -Determines whether to watch given failed lookup location (file that didnt exist) when resolving module. +Determines whether to watch given failed lookup location (file that didn't exist) when resolving module. It also determines the directory to watch and whether to watch it recursively or not. ## Testing for Dos root: c:/ diff --git a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationInfileNonRecursiveDos.baseline.md b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationInfileNonRecursiveDos.baseline.md index f6031db82417a..eb1cc4e333445 100644 --- a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationInfileNonRecursiveDos.baseline.md +++ b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationInfileNonRecursiveDos.baseline.md @@ -1,6 +1,6 @@ # getDirectoryToWatchFailedLookupLocationInfileNonRecursive -Determines whether to watch given failed lookup location (file that didnt exist) when resolving module. +Determines whether to watch given failed lookup location (file that didn't exist) when resolving module. It also determines the directory to watch and whether to watch it recursively or not. ## Testing for Dos root: c:/ diff --git a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationInfileNonRecursivePosix.baseline.md b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationInfileNonRecursivePosix.baseline.md index a1eecd45beaae..59b8a6f63554e 100644 --- a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationInfileNonRecursivePosix.baseline.md +++ b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationInfileNonRecursivePosix.baseline.md @@ -1,6 +1,6 @@ # getDirectoryToWatchFailedLookupLocationInfileNonRecursive -Determines whether to watch given failed lookup location (file that didnt exist) when resolving module. +Determines whether to watch given failed lookup location (file that didn't exist) when resolving module. It also determines the directory to watch and whether to watch it recursively or not. ## Testing for Posix root: / diff --git a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationInfileNonRecursiveUnc.baseline.md b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationInfileNonRecursiveUnc.baseline.md index b0405e563b788..558b08eab5b01 100644 --- a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationInfileNonRecursiveUnc.baseline.md +++ b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationInfileNonRecursiveUnc.baseline.md @@ -1,6 +1,6 @@ # getDirectoryToWatchFailedLookupLocationInfileNonRecursive -Determines whether to watch given failed lookup location (file that didnt exist) when resolving module. +Determines whether to watch given failed lookup location (file that didn't exist) when resolving module. It also determines the directory to watch and whether to watch it recursively or not. ## Testing for Unc root: //vda1cs4850/ diff --git a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationInfileNonRecursiveUncDos.baseline.md b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationInfileNonRecursiveUncDos.baseline.md index d26d699987939..0a31dc540ff23 100644 --- a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationInfileNonRecursiveUncDos.baseline.md +++ b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationInfileNonRecursiveUncDos.baseline.md @@ -1,6 +1,6 @@ # getDirectoryToWatchFailedLookupLocationInfileNonRecursive -Determines whether to watch given failed lookup location (file that didnt exist) when resolving module. +Determines whether to watch given failed lookup location (file that didn't exist) when resolving module. It also determines the directory to watch and whether to watch it recursively or not. ## Testing for UncDos root: //vda1cs4850/c$ diff --git a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationInfilePosix.baseline.md b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationInfilePosix.baseline.md index 5931f13e3454e..71016e71a352d 100644 --- a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationInfilePosix.baseline.md +++ b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationInfilePosix.baseline.md @@ -1,6 +1,6 @@ # getDirectoryToWatchFailedLookupLocationInfile -Determines whether to watch given failed lookup location (file that didnt exist) when resolving module. +Determines whether to watch given failed lookup location (file that didn't exist) when resolving module. It also determines the directory to watch and whether to watch it recursively or not. ## Testing for Posix root: / diff --git a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationInfileUnc.baseline.md b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationInfileUnc.baseline.md index c1f33dff02b4a..97302699e11e9 100644 --- a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationInfileUnc.baseline.md +++ b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationInfileUnc.baseline.md @@ -1,6 +1,6 @@ # getDirectoryToWatchFailedLookupLocationInfile -Determines whether to watch given failed lookup location (file that didnt exist) when resolving module. +Determines whether to watch given failed lookup location (file that didn't exist) when resolving module. It also determines the directory to watch and whether to watch it recursively or not. ## Testing for Unc root: //vda1cs4850/ diff --git a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationInfileUncDos.baseline.md b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationInfileUncDos.baseline.md index d743b3f46b409..02e363b81d3ca 100644 --- a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationInfileUncDos.baseline.md +++ b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationInfileUncDos.baseline.md @@ -1,6 +1,6 @@ # getDirectoryToWatchFailedLookupLocationInfile -Determines whether to watch given failed lookup location (file that didnt exist) when resolving module. +Determines whether to watch given failed lookup location (file that didn't exist) when resolving module. It also determines the directory to watch and whether to watch it recursively or not. ## Testing for UncDos root: //vda1cs4850/c$ diff --git a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationInsubDirDos.baseline.md b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationInsubDirDos.baseline.md index 058ba1ecb0643..e76a220eb7926 100644 --- a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationInsubDirDos.baseline.md +++ b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationInsubDirDos.baseline.md @@ -1,6 +1,6 @@ # getDirectoryToWatchFailedLookupLocationInsubDir -Determines whether to watch given failed lookup location (file that didnt exist) when resolving module. +Determines whether to watch given failed lookup location (file that didn't exist) when resolving module. It also determines the directory to watch and whether to watch it recursively or not. ## Testing for Dos root: c:/ diff --git a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationInsubDirNonRecursiveDos.baseline.md b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationInsubDirNonRecursiveDos.baseline.md index ad6d52f1733db..84bc0a1dbf562 100644 --- a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationInsubDirNonRecursiveDos.baseline.md +++ b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationInsubDirNonRecursiveDos.baseline.md @@ -1,6 +1,6 @@ # getDirectoryToWatchFailedLookupLocationInsubDirNonRecursive -Determines whether to watch given failed lookup location (file that didnt exist) when resolving module. +Determines whether to watch given failed lookup location (file that didn't exist) when resolving module. It also determines the directory to watch and whether to watch it recursively or not. ## Testing for Dos root: c:/ diff --git a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationInsubDirNonRecursivePosix.baseline.md b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationInsubDirNonRecursivePosix.baseline.md index e14026275e8d5..e0299404e558c 100644 --- a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationInsubDirNonRecursivePosix.baseline.md +++ b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationInsubDirNonRecursivePosix.baseline.md @@ -1,6 +1,6 @@ # getDirectoryToWatchFailedLookupLocationInsubDirNonRecursive -Determines whether to watch given failed lookup location (file that didnt exist) when resolving module. +Determines whether to watch given failed lookup location (file that didn't exist) when resolving module. It also determines the directory to watch and whether to watch it recursively or not. ## Testing for Posix root: / diff --git a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationInsubDirNonRecursiveUnc.baseline.md b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationInsubDirNonRecursiveUnc.baseline.md index 7e6198df42cbe..f6a751f351250 100644 --- a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationInsubDirNonRecursiveUnc.baseline.md +++ b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationInsubDirNonRecursiveUnc.baseline.md @@ -1,6 +1,6 @@ # getDirectoryToWatchFailedLookupLocationInsubDirNonRecursive -Determines whether to watch given failed lookup location (file that didnt exist) when resolving module. +Determines whether to watch given failed lookup location (file that didn't exist) when resolving module. It also determines the directory to watch and whether to watch it recursively or not. ## Testing for Unc root: //vda1cs4850/ diff --git a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationInsubDirNonRecursiveUncDos.baseline.md b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationInsubDirNonRecursiveUncDos.baseline.md index 7735f60a4608b..d354f037035de 100644 --- a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationInsubDirNonRecursiveUncDos.baseline.md +++ b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationInsubDirNonRecursiveUncDos.baseline.md @@ -1,6 +1,6 @@ # getDirectoryToWatchFailedLookupLocationInsubDirNonRecursive -Determines whether to watch given failed lookup location (file that didnt exist) when resolving module. +Determines whether to watch given failed lookup location (file that didn't exist) when resolving module. It also determines the directory to watch and whether to watch it recursively or not. ## Testing for UncDos root: //vda1cs4850/c$ diff --git a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationInsubDirPosix.baseline.md b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationInsubDirPosix.baseline.md index 8c2fe1c29daae..a6ded84143a3b 100644 --- a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationInsubDirPosix.baseline.md +++ b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationInsubDirPosix.baseline.md @@ -1,6 +1,6 @@ # getDirectoryToWatchFailedLookupLocationInsubDir -Determines whether to watch given failed lookup location (file that didnt exist) when resolving module. +Determines whether to watch given failed lookup location (file that didn't exist) when resolving module. It also determines the directory to watch and whether to watch it recursively or not. ## Testing for Posix root: / diff --git a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationInsubDirUnc.baseline.md b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationInsubDirUnc.baseline.md index b67462df1ee1f..0fd00b70dedbd 100644 --- a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationInsubDirUnc.baseline.md +++ b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationInsubDirUnc.baseline.md @@ -1,6 +1,6 @@ # getDirectoryToWatchFailedLookupLocationInsubDir -Determines whether to watch given failed lookup location (file that didnt exist) when resolving module. +Determines whether to watch given failed lookup location (file that didn't exist) when resolving module. It also determines the directory to watch and whether to watch it recursively or not. ## Testing for Unc root: //vda1cs4850/ diff --git a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationInsubDirUncDos.baseline.md b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationInsubDirUncDos.baseline.md index 63bbadcc15dee..4545b8f966233 100644 --- a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationInsubDirUncDos.baseline.md +++ b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationInsubDirUncDos.baseline.md @@ -1,6 +1,6 @@ # getDirectoryToWatchFailedLookupLocationInsubDir -Determines whether to watch given failed lookup location (file that didnt exist) when resolving module. +Determines whether to watch given failed lookup location (file that didn't exist) when resolving module. It also determines the directory to watch and whether to watch it recursively or not. ## Testing for UncDos root: //vda1cs4850/c$ diff --git a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationNodeModulesIndirDos.baseline.md b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationNodeModulesIndirDos.baseline.md index 9ec34c80c23cb..a124ef43b95e8 100644 --- a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationNodeModulesIndirDos.baseline.md +++ b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationNodeModulesIndirDos.baseline.md @@ -1,6 +1,6 @@ # getDirectoryToWatchFailedLookupLocationNodeModulesIndir -Determines whether to watch given failed lookup location (file that didnt exist) when resolving module. +Determines whether to watch given failed lookup location (file that didn't exist) when resolving module. It also determines the directory to watch and whether to watch it recursively or not. ## Testing for Dos root: c:/ diff --git a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationNodeModulesIndirNonRecursiveDos.baseline.md b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationNodeModulesIndirNonRecursiveDos.baseline.md index a5787305f2d53..909ebb89ed763 100644 --- a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationNodeModulesIndirNonRecursiveDos.baseline.md +++ b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationNodeModulesIndirNonRecursiveDos.baseline.md @@ -1,6 +1,6 @@ # getDirectoryToWatchFailedLookupLocationNodeModulesIndirNonRecursive -Determines whether to watch given failed lookup location (file that didnt exist) when resolving module. +Determines whether to watch given failed lookup location (file that didn't exist) when resolving module. It also determines the directory to watch and whether to watch it recursively or not. ## Testing for Dos root: c:/ diff --git a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationNodeModulesIndirNonRecursivePosix.baseline.md b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationNodeModulesIndirNonRecursivePosix.baseline.md index 0f3f1ef1f0d20..ac3b791cac158 100644 --- a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationNodeModulesIndirNonRecursivePosix.baseline.md +++ b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationNodeModulesIndirNonRecursivePosix.baseline.md @@ -1,6 +1,6 @@ # getDirectoryToWatchFailedLookupLocationNodeModulesIndirNonRecursive -Determines whether to watch given failed lookup location (file that didnt exist) when resolving module. +Determines whether to watch given failed lookup location (file that didn't exist) when resolving module. It also determines the directory to watch and whether to watch it recursively or not. ## Testing for Posix root: / diff --git a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationNodeModulesIndirNonRecursiveUnc.baseline.md b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationNodeModulesIndirNonRecursiveUnc.baseline.md index 73b810bf08ae2..2acb72b1b359d 100644 --- a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationNodeModulesIndirNonRecursiveUnc.baseline.md +++ b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationNodeModulesIndirNonRecursiveUnc.baseline.md @@ -1,6 +1,6 @@ # getDirectoryToWatchFailedLookupLocationNodeModulesIndirNonRecursive -Determines whether to watch given failed lookup location (file that didnt exist) when resolving module. +Determines whether to watch given failed lookup location (file that didn't exist) when resolving module. It also determines the directory to watch and whether to watch it recursively or not. ## Testing for Unc root: //vda1cs4850/ diff --git a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationNodeModulesIndirNonRecursiveUncDos.baseline.md b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationNodeModulesIndirNonRecursiveUncDos.baseline.md index 5e41dcccb9f1c..0ff8f0e0e651c 100644 --- a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationNodeModulesIndirNonRecursiveUncDos.baseline.md +++ b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationNodeModulesIndirNonRecursiveUncDos.baseline.md @@ -1,6 +1,6 @@ # getDirectoryToWatchFailedLookupLocationNodeModulesIndirNonRecursive -Determines whether to watch given failed lookup location (file that didnt exist) when resolving module. +Determines whether to watch given failed lookup location (file that didn't exist) when resolving module. It also determines the directory to watch and whether to watch it recursively or not. ## Testing for UncDos root: //vda1cs4850/c$ diff --git a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationNodeModulesIndirPosix.baseline.md b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationNodeModulesIndirPosix.baseline.md index 70ae966bff6a6..fb53e1965d0d6 100644 --- a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationNodeModulesIndirPosix.baseline.md +++ b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationNodeModulesIndirPosix.baseline.md @@ -1,6 +1,6 @@ # getDirectoryToWatchFailedLookupLocationNodeModulesIndir -Determines whether to watch given failed lookup location (file that didnt exist) when resolving module. +Determines whether to watch given failed lookup location (file that didn't exist) when resolving module. It also determines the directory to watch and whether to watch it recursively or not. ## Testing for Posix root: / diff --git a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationNodeModulesIndirUnc.baseline.md b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationNodeModulesIndirUnc.baseline.md index 543371a484709..89669e0404292 100644 --- a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationNodeModulesIndirUnc.baseline.md +++ b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationNodeModulesIndirUnc.baseline.md @@ -1,6 +1,6 @@ # getDirectoryToWatchFailedLookupLocationNodeModulesIndir -Determines whether to watch given failed lookup location (file that didnt exist) when resolving module. +Determines whether to watch given failed lookup location (file that didn't exist) when resolving module. It also determines the directory to watch and whether to watch it recursively or not. ## Testing for Unc root: //vda1cs4850/ diff --git a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationNodeModulesIndirUncDos.baseline.md b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationNodeModulesIndirUncDos.baseline.md index 53e3a7f374d11..76d391f9bcccb 100644 --- a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationNodeModulesIndirUncDos.baseline.md +++ b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationNodeModulesIndirUncDos.baseline.md @@ -1,6 +1,6 @@ # getDirectoryToWatchFailedLookupLocationNodeModulesIndir -Determines whether to watch given failed lookup location (file that didnt exist) when resolving module. +Determines whether to watch given failed lookup location (file that didn't exist) when resolving module. It also determines the directory to watch and whether to watch it recursively or not. ## Testing for UncDos root: //vda1cs4850/c$ diff --git a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationNodeModulesInfileDos.baseline.md b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationNodeModulesInfileDos.baseline.md index 4687b39d95d85..0b29778343ec9 100644 --- a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationNodeModulesInfileDos.baseline.md +++ b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationNodeModulesInfileDos.baseline.md @@ -1,6 +1,6 @@ # getDirectoryToWatchFailedLookupLocationNodeModulesInfile -Determines whether to watch given failed lookup location (file that didnt exist) when resolving module. +Determines whether to watch given failed lookup location (file that didn't exist) when resolving module. It also determines the directory to watch and whether to watch it recursively or not. ## Testing for Dos root: c:/ diff --git a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationNodeModulesInfileNonRecursiveDos.baseline.md b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationNodeModulesInfileNonRecursiveDos.baseline.md index 5720b59cf0695..327dec9e32ed4 100644 --- a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationNodeModulesInfileNonRecursiveDos.baseline.md +++ b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationNodeModulesInfileNonRecursiveDos.baseline.md @@ -1,6 +1,6 @@ # getDirectoryToWatchFailedLookupLocationNodeModulesInfileNonRecursive -Determines whether to watch given failed lookup location (file that didnt exist) when resolving module. +Determines whether to watch given failed lookup location (file that didn't exist) when resolving module. It also determines the directory to watch and whether to watch it recursively or not. ## Testing for Dos root: c:/ diff --git a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationNodeModulesInfileNonRecursivePosix.baseline.md b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationNodeModulesInfileNonRecursivePosix.baseline.md index ea91b46e683cd..58a5f27b371a1 100644 --- a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationNodeModulesInfileNonRecursivePosix.baseline.md +++ b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationNodeModulesInfileNonRecursivePosix.baseline.md @@ -1,6 +1,6 @@ # getDirectoryToWatchFailedLookupLocationNodeModulesInfileNonRecursive -Determines whether to watch given failed lookup location (file that didnt exist) when resolving module. +Determines whether to watch given failed lookup location (file that didn't exist) when resolving module. It also determines the directory to watch and whether to watch it recursively or not. ## Testing for Posix root: / diff --git a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationNodeModulesInfileNonRecursiveUnc.baseline.md b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationNodeModulesInfileNonRecursiveUnc.baseline.md index 6ce463b202996..05ccbd69c84d5 100644 --- a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationNodeModulesInfileNonRecursiveUnc.baseline.md +++ b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationNodeModulesInfileNonRecursiveUnc.baseline.md @@ -1,6 +1,6 @@ # getDirectoryToWatchFailedLookupLocationNodeModulesInfileNonRecursive -Determines whether to watch given failed lookup location (file that didnt exist) when resolving module. +Determines whether to watch given failed lookup location (file that didn't exist) when resolving module. It also determines the directory to watch and whether to watch it recursively or not. ## Testing for Unc root: //vda1cs4850/ diff --git a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationNodeModulesInfileNonRecursiveUncDos.baseline.md b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationNodeModulesInfileNonRecursiveUncDos.baseline.md index e84f00d532d5a..b78a1630bbd75 100644 --- a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationNodeModulesInfileNonRecursiveUncDos.baseline.md +++ b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationNodeModulesInfileNonRecursiveUncDos.baseline.md @@ -1,6 +1,6 @@ # getDirectoryToWatchFailedLookupLocationNodeModulesInfileNonRecursive -Determines whether to watch given failed lookup location (file that didnt exist) when resolving module. +Determines whether to watch given failed lookup location (file that didn't exist) when resolving module. It also determines the directory to watch and whether to watch it recursively or not. ## Testing for UncDos root: //vda1cs4850/c$ diff --git a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationNodeModulesInfilePosix.baseline.md b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationNodeModulesInfilePosix.baseline.md index 60b879d5ad179..c7ba245d80671 100644 --- a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationNodeModulesInfilePosix.baseline.md +++ b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationNodeModulesInfilePosix.baseline.md @@ -1,6 +1,6 @@ # getDirectoryToWatchFailedLookupLocationNodeModulesInfile -Determines whether to watch given failed lookup location (file that didnt exist) when resolving module. +Determines whether to watch given failed lookup location (file that didn't exist) when resolving module. It also determines the directory to watch and whether to watch it recursively or not. ## Testing for Posix root: / diff --git a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationNodeModulesInfileUnc.baseline.md b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationNodeModulesInfileUnc.baseline.md index c2f832154a8df..0871345384788 100644 --- a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationNodeModulesInfileUnc.baseline.md +++ b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationNodeModulesInfileUnc.baseline.md @@ -1,6 +1,6 @@ # getDirectoryToWatchFailedLookupLocationNodeModulesInfile -Determines whether to watch given failed lookup location (file that didnt exist) when resolving module. +Determines whether to watch given failed lookup location (file that didn't exist) when resolving module. It also determines the directory to watch and whether to watch it recursively or not. ## Testing for Unc root: //vda1cs4850/ diff --git a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationNodeModulesInfileUncDos.baseline.md b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationNodeModulesInfileUncDos.baseline.md index 31a38f250f677..264d66111c4b0 100644 --- a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationNodeModulesInfileUncDos.baseline.md +++ b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationNodeModulesInfileUncDos.baseline.md @@ -1,6 +1,6 @@ # getDirectoryToWatchFailedLookupLocationNodeModulesInfile -Determines whether to watch given failed lookup location (file that didnt exist) when resolving module. +Determines whether to watch given failed lookup location (file that didn't exist) when resolving module. It also determines the directory to watch and whether to watch it recursively or not. ## Testing for UncDos root: //vda1cs4850/c$ diff --git a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationNodeModulesInsubDirDos.baseline.md b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationNodeModulesInsubDirDos.baseline.md index c89a0d4740b34..0272c53e4d06c 100644 --- a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationNodeModulesInsubDirDos.baseline.md +++ b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationNodeModulesInsubDirDos.baseline.md @@ -1,6 +1,6 @@ # getDirectoryToWatchFailedLookupLocationNodeModulesInsubDir -Determines whether to watch given failed lookup location (file that didnt exist) when resolving module. +Determines whether to watch given failed lookup location (file that didn't exist) when resolving module. It also determines the directory to watch and whether to watch it recursively or not. ## Testing for Dos root: c:/ diff --git a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationNodeModulesInsubDirNonRecursiveDos.baseline.md b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationNodeModulesInsubDirNonRecursiveDos.baseline.md index 397361418eb7a..2d3ed44cf44cf 100644 --- a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationNodeModulesInsubDirNonRecursiveDos.baseline.md +++ b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationNodeModulesInsubDirNonRecursiveDos.baseline.md @@ -1,6 +1,6 @@ # getDirectoryToWatchFailedLookupLocationNodeModulesInsubDirNonRecursive -Determines whether to watch given failed lookup location (file that didnt exist) when resolving module. +Determines whether to watch given failed lookup location (file that didn't exist) when resolving module. It also determines the directory to watch and whether to watch it recursively or not. ## Testing for Dos root: c:/ diff --git a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationNodeModulesInsubDirNonRecursivePosix.baseline.md b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationNodeModulesInsubDirNonRecursivePosix.baseline.md index 73b158021627c..78c64a9a12d74 100644 --- a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationNodeModulesInsubDirNonRecursivePosix.baseline.md +++ b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationNodeModulesInsubDirNonRecursivePosix.baseline.md @@ -1,6 +1,6 @@ # getDirectoryToWatchFailedLookupLocationNodeModulesInsubDirNonRecursive -Determines whether to watch given failed lookup location (file that didnt exist) when resolving module. +Determines whether to watch given failed lookup location (file that didn't exist) when resolving module. It also determines the directory to watch and whether to watch it recursively or not. ## Testing for Posix root: / diff --git a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationNodeModulesInsubDirNonRecursiveUnc.baseline.md b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationNodeModulesInsubDirNonRecursiveUnc.baseline.md index d103a951baef0..a4bef89e582ef 100644 --- a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationNodeModulesInsubDirNonRecursiveUnc.baseline.md +++ b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationNodeModulesInsubDirNonRecursiveUnc.baseline.md @@ -1,6 +1,6 @@ # getDirectoryToWatchFailedLookupLocationNodeModulesInsubDirNonRecursive -Determines whether to watch given failed lookup location (file that didnt exist) when resolving module. +Determines whether to watch given failed lookup location (file that didn't exist) when resolving module. It also determines the directory to watch and whether to watch it recursively or not. ## Testing for Unc root: //vda1cs4850/ diff --git a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationNodeModulesInsubDirNonRecursiveUncDos.baseline.md b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationNodeModulesInsubDirNonRecursiveUncDos.baseline.md index 65872b6a2491f..002955619bbf8 100644 --- a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationNodeModulesInsubDirNonRecursiveUncDos.baseline.md +++ b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationNodeModulesInsubDirNonRecursiveUncDos.baseline.md @@ -1,6 +1,6 @@ # getDirectoryToWatchFailedLookupLocationNodeModulesInsubDirNonRecursive -Determines whether to watch given failed lookup location (file that didnt exist) when resolving module. +Determines whether to watch given failed lookup location (file that didn't exist) when resolving module. It also determines the directory to watch and whether to watch it recursively or not. ## Testing for UncDos root: //vda1cs4850/c$ diff --git a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationNodeModulesInsubDirPosix.baseline.md b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationNodeModulesInsubDirPosix.baseline.md index 44d2cb4fc1f73..5fe850103114c 100644 --- a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationNodeModulesInsubDirPosix.baseline.md +++ b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationNodeModulesInsubDirPosix.baseline.md @@ -1,6 +1,6 @@ # getDirectoryToWatchFailedLookupLocationNodeModulesInsubDir -Determines whether to watch given failed lookup location (file that didnt exist) when resolving module. +Determines whether to watch given failed lookup location (file that didn't exist) when resolving module. It also determines the directory to watch and whether to watch it recursively or not. ## Testing for Posix root: / diff --git a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationNodeModulesInsubDirUnc.baseline.md b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationNodeModulesInsubDirUnc.baseline.md index ccab4a8f7c8b6..44570ee21cc19 100644 --- a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationNodeModulesInsubDirUnc.baseline.md +++ b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationNodeModulesInsubDirUnc.baseline.md @@ -1,6 +1,6 @@ # getDirectoryToWatchFailedLookupLocationNodeModulesInsubDir -Determines whether to watch given failed lookup location (file that didnt exist) when resolving module. +Determines whether to watch given failed lookup location (file that didn't exist) when resolving module. It also determines the directory to watch and whether to watch it recursively or not. ## Testing for Unc root: //vda1cs4850/ diff --git a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationNodeModulesInsubDirUncDos.baseline.md b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationNodeModulesInsubDirUncDos.baseline.md index a9cebad17dbfc..b33e58567783d 100644 --- a/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationNodeModulesInsubDirUncDos.baseline.md +++ b/tests/baselines/reference/canWatch/getDirectoryToWatchFailedLookupLocationNodeModulesInsubDirUncDos.baseline.md @@ -1,6 +1,6 @@ # getDirectoryToWatchFailedLookupLocationNodeModulesInsubDir -Determines whether to watch given failed lookup location (file that didnt exist) when resolving module. +Determines whether to watch given failed lookup location (file that didn't exist) when resolving module. It also determines the directory to watch and whether to watch it recursively or not. ## Testing for UncDos root: //vda1cs4850/c$ diff --git a/tests/baselines/reference/castExpressionParentheses.js b/tests/baselines/reference/castExpressionParentheses.js index 11cd9fca73e77..eb90b200e4e25 100644 --- a/tests/baselines/reference/castExpressionParentheses.js +++ b/tests/baselines/reference/castExpressionParentheses.js @@ -44,10 +44,10 @@ new (A()); (function foo() { })(); (-A).x; -// nested cast, should keep one pair of parenthese +// nested cast, should keep one pair of parentheses ((-A)).x; -// nested parenthesized expression, should keep one pair of parenthese +// nested parenthesized expression, should keep one pair of parentheses ((A)) @@ -91,7 +91,7 @@ new (A()); (() => { })(); (function foo() { })(); (-A).x; -// nested cast, should keep one pair of parenthese +// nested cast, should keep one pair of parentheses (-A).x; -// nested parenthesized expression, should keep one pair of parenthese +// nested parenthesized expression, should keep one pair of parentheses (A); diff --git a/tests/baselines/reference/castExpressionParentheses.symbols b/tests/baselines/reference/castExpressionParentheses.symbols index 6d577c371c5b6..c2584a9b3b6d1 100644 --- a/tests/baselines/reference/castExpressionParentheses.symbols +++ b/tests/baselines/reference/castExpressionParentheses.symbols @@ -75,11 +75,11 @@ new (A()); (-A).x; >A : Symbol(A, Decl(castExpressionParentheses.ts, 31, 11)) -// nested cast, should keep one pair of parenthese +// nested cast, should keep one pair of parentheses ((-A)).x; >A : Symbol(A, Decl(castExpressionParentheses.ts, 31, 11)) -// nested parenthesized expression, should keep one pair of parenthese +// nested parenthesized expression, should keep one pair of parentheses ((A)) >A : Symbol(A, Decl(castExpressionParentheses.ts, 31, 11)) diff --git a/tests/baselines/reference/castExpressionParentheses.types b/tests/baselines/reference/castExpressionParentheses.types index 71e34b3dbbd5c..844f368b5caee 100644 --- a/tests/baselines/reference/castExpressionParentheses.types +++ b/tests/baselines/reference/castExpressionParentheses.types @@ -285,7 +285,7 @@ new (A()); >x : any > : ^^^ -// nested cast, should keep one pair of parenthese +// nested cast, should keep one pair of parentheses ((-A)).x; >((-A)).x : any >((-A)) : any @@ -301,7 +301,7 @@ new (A()); >x : any > : ^^^ -// nested parenthesized expression, should keep one pair of parenthese +// nested parenthesized expression, should keep one pair of parentheses ((A)) >((A)) : any >(A) : any diff --git a/tests/baselines/reference/circularlySimplifyingConditionalTypesNoCrash.js b/tests/baselines/reference/circularlySimplifyingConditionalTypesNoCrash.js index 7a0d7885a1f3b..a19ee9c35eebd 100644 --- a/tests/baselines/reference/circularlySimplifyingConditionalTypesNoCrash.js +++ b/tests/baselines/reference/circularlySimplifyingConditionalTypesNoCrash.js @@ -3,7 +3,7 @@ //// [circularlySimplifyingConditionalTypesNoCrash.ts] type Omit = Pick>; -type Shared< // Circularly self constraining type, defered thanks to mapping +type Shared< // Circularly self constraining type, deferred thanks to mapping InjectedProps, DecorationTargetProps extends Shared > = { diff --git a/tests/baselines/reference/circularlySimplifyingConditionalTypesNoCrash.symbols b/tests/baselines/reference/circularlySimplifyingConditionalTypesNoCrash.symbols index a949966970c3f..2444b0e1c317b 100644 --- a/tests/baselines/reference/circularlySimplifyingConditionalTypesNoCrash.symbols +++ b/tests/baselines/reference/circularlySimplifyingConditionalTypesNoCrash.symbols @@ -12,7 +12,7 @@ type Omit = Pick>; >T : Symbol(T, Decl(circularlySimplifyingConditionalTypesNoCrash.ts, 0, 10)) >K : Symbol(K, Decl(circularlySimplifyingConditionalTypesNoCrash.ts, 0, 12)) -type Shared< // Circularly self constraining type, defered thanks to mapping +type Shared< // Circularly self constraining type, deferred thanks to mapping >Shared : Symbol(Shared, Decl(circularlySimplifyingConditionalTypesNoCrash.ts, 0, 63)) InjectedProps, diff --git a/tests/baselines/reference/circularlySimplifyingConditionalTypesNoCrash.types b/tests/baselines/reference/circularlySimplifyingConditionalTypesNoCrash.types index 5aa7b5c308c6b..d3177bd0a00a6 100644 --- a/tests/baselines/reference/circularlySimplifyingConditionalTypesNoCrash.types +++ b/tests/baselines/reference/circularlySimplifyingConditionalTypesNoCrash.types @@ -5,7 +5,7 @@ type Omit = Pick>; >Omit : Omit > : ^^^^^^^^^^ -type Shared< // Circularly self constraining type, defered thanks to mapping +type Shared< // Circularly self constraining type, deferred thanks to mapping >Shared : Shared > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/classExtendingAny.errors.txt b/tests/baselines/reference/classExtendingAny.errors.txt index 0c6b8a5a59123..938f5878fc2d5 100644 --- a/tests/baselines/reference/classExtendingAny.errors.txt +++ b/tests/baselines/reference/classExtendingAny.errors.txt @@ -30,7 +30,7 @@ a.ts(3,5): error TS2564: Property 'payload' has no initializer and is not defini } f() { this.wat - this.wit + this.with this['wot'] super.alsoBad } diff --git a/tests/baselines/reference/classExtendingAny.symbols b/tests/baselines/reference/classExtendingAny.symbols index 6880a405cb82f..6e10eceb45548 100644 --- a/tests/baselines/reference/classExtendingAny.symbols +++ b/tests/baselines/reference/classExtendingAny.symbols @@ -55,7 +55,7 @@ class B extends Err { >this : Symbol(B, Decl(b.js, 0, 0)) >wat : Symbol(B.wat, Decl(b.js, 2, 15)) - this.wit + this.with >this : Symbol(B, Decl(b.js, 0, 0)) this['wot'] diff --git a/tests/baselines/reference/classExtendingAny.types b/tests/baselines/reference/classExtendingAny.types index 9a4c18bec6b54..6d7850f9972cd 100644 --- a/tests/baselines/reference/classExtendingAny.types +++ b/tests/baselines/reference/classExtendingAny.types @@ -125,12 +125,12 @@ class B extends Err { >wat : number > : ^^^^^^ - this.wit ->this.wit : any + this.with +>this.with : any > : ^^^ >this : this > : ^^^^ ->wit : any +>with : any > : ^^^ this['wot'] diff --git a/tests/baselines/reference/classMemberInitializerScoping.errors.txt b/tests/baselines/reference/classMemberInitializerScoping.errors.txt index 2b5209312dedc..f14abba29ac0c 100644 --- a/tests/baselines/reference/classMemberInitializerScoping.errors.txt +++ b/tests/baselines/reference/classMemberInitializerScoping.errors.txt @@ -8,7 +8,7 @@ classMemberInitializerScoping.ts(6,9): error TS2322: Type 'string' is not assign y: number = aaa; ~~~ !!! error TS2301: Initializer of instance member variable 'y' cannot reference identifier 'aaa' declared in the constructor. - static staticY: number = aaa; // This shouldnt be error + static staticY: number = aaa; // This shouldn't be error constructor(aaa) { this.y = ''; // was: error, cannot assign string to number ~~~~~~ diff --git a/tests/baselines/reference/classMemberInitializerScoping.js b/tests/baselines/reference/classMemberInitializerScoping.js index 5908cdd30db55..09e2937d0c82d 100644 --- a/tests/baselines/reference/classMemberInitializerScoping.js +++ b/tests/baselines/reference/classMemberInitializerScoping.js @@ -4,7 +4,7 @@ var aaa = 1; class CCC { y: number = aaa; - static staticY: number = aaa; // This shouldnt be error + static staticY: number = aaa; // This shouldn't be error constructor(aaa) { this.y = ''; // was: error, cannot assign string to number } @@ -31,7 +31,7 @@ class CCC { this.y = ''; // was: error, cannot assign string to number } } -CCC.staticY = aaa; // This shouldnt be error +CCC.staticY = aaa; // This shouldn't be error // above is equivalent to this: var aaaa = 1; class CCCC { diff --git a/tests/baselines/reference/classMemberInitializerScoping.symbols b/tests/baselines/reference/classMemberInitializerScoping.symbols index ba2dd1d15adab..ed7ec8c7bac34 100644 --- a/tests/baselines/reference/classMemberInitializerScoping.symbols +++ b/tests/baselines/reference/classMemberInitializerScoping.symbols @@ -11,7 +11,7 @@ class CCC { >y : Symbol(CCC.y, Decl(classMemberInitializerScoping.ts, 1, 11)) >aaa : Symbol(aaa, Decl(classMemberInitializerScoping.ts, 0, 3)) - static staticY: number = aaa; // This shouldnt be error + static staticY: number = aaa; // This shouldn't be error >staticY : Symbol(CCC.staticY, Decl(classMemberInitializerScoping.ts, 2, 20)) >aaa : Symbol(aaa, Decl(classMemberInitializerScoping.ts, 0, 3)) diff --git a/tests/baselines/reference/classMemberInitializerScoping.types b/tests/baselines/reference/classMemberInitializerScoping.types index 66aa9556ab355..0e6e7de046137 100644 --- a/tests/baselines/reference/classMemberInitializerScoping.types +++ b/tests/baselines/reference/classMemberInitializerScoping.types @@ -17,7 +17,7 @@ class CCC { >aaa : any > : ^^^ - static staticY: number = aaa; // This shouldnt be error + static staticY: number = aaa; // This shouldn't be error >staticY : number > : ^^^^^^ >aaa : number diff --git a/tests/baselines/reference/classMemberInitializerWithLamdaScoping.errors.txt b/tests/baselines/reference/classMemberInitializerWithLamdaScoping.errors.txt index 0b42be172ce21..19f22c8e10b9d 100644 --- a/tests/baselines/reference/classMemberInitializerWithLamdaScoping.errors.txt +++ b/tests/baselines/reference/classMemberInitializerWithLamdaScoping.errors.txt @@ -10,12 +10,12 @@ classMemberInitializerWithLamdaScoping.ts(23,21): error TS2301: Initializer of i } messageHandler = () => { var field = this.field; - console.log(field); // Using field here shouldnt be error + console.log(field); // Using field here shouldn't be error }; static field: number; static staticMessageHandler = () => { var field = Test.field; - console.log(field); // Using field here shouldnt be error + console.log(field); // Using field here shouldn't be error }; } @@ -28,9 +28,9 @@ classMemberInitializerWithLamdaScoping.ts(23,21): error TS2301: Initializer of i ~~~~~~ !!! error TS2301: Initializer of instance member variable 'messageHandler' cannot reference identifier 'field1' declared in the constructor. // but since this code would be generated inside constructor, in generated js - // it would resolve to private field1 and thats not what user intended here. + // it would resolve to private field1 and that's not what user intended here. }; static staticMessageHandler = () => { - console.log(field1); // This shouldnt be error as its a static property + console.log(field1); // This shouldn't be error as its a static property }; } \ No newline at end of file diff --git a/tests/baselines/reference/classMemberInitializerWithLamdaScoping.js b/tests/baselines/reference/classMemberInitializerWithLamdaScoping.js index 41cdeb654200f..d0ad1f70219fb 100644 --- a/tests/baselines/reference/classMemberInitializerWithLamdaScoping.js +++ b/tests/baselines/reference/classMemberInitializerWithLamdaScoping.js @@ -9,12 +9,12 @@ class Test { } messageHandler = () => { var field = this.field; - console.log(field); // Using field here shouldnt be error + console.log(field); // Using field here shouldn't be error }; static field: number; static staticMessageHandler = () => { var field = Test.field; - console.log(field); // Using field here shouldnt be error + console.log(field); // Using field here shouldn't be error }; } @@ -25,10 +25,10 @@ class Test1 { messageHandler = () => { console.log(field1); // But this should be error as the field1 will resolve to var field1 // but since this code would be generated inside constructor, in generated js - // it would resolve to private field1 and thats not what user intended here. + // it would resolve to private field1 and that's not what user intended here. }; static staticMessageHandler = () => { - console.log(field1); // This shouldnt be error as its a static property + console.log(field1); // This shouldn't be error as its a static property }; } @@ -39,13 +39,13 @@ class Test { this.field = field; this.messageHandler = () => { var field = this.field; - console.log(field); // Using field here shouldnt be error + console.log(field); // Using field here shouldn't be error }; } } Test.staticMessageHandler = () => { var field = Test.field; - console.log(field); // Using field here shouldnt be error + console.log(field); // Using field here shouldn't be error }; var field1; class Test1 { @@ -54,10 +54,10 @@ class Test1 { this.messageHandler = () => { console.log(field1); // But this should be error as the field1 will resolve to var field1 // but since this code would be generated inside constructor, in generated js - // it would resolve to private field1 and thats not what user intended here. + // it would resolve to private field1 and that's not what user intended here. }; } } Test1.staticMessageHandler = () => { - console.log(field1); // This shouldnt be error as its a static property + console.log(field1); // This shouldn't be error as its a static property }; diff --git a/tests/baselines/reference/classMemberInitializerWithLamdaScoping.symbols b/tests/baselines/reference/classMemberInitializerWithLamdaScoping.symbols index 7d089462db773..6097494d94659 100644 --- a/tests/baselines/reference/classMemberInitializerWithLamdaScoping.symbols +++ b/tests/baselines/reference/classMemberInitializerWithLamdaScoping.symbols @@ -24,7 +24,7 @@ class Test { >this : Symbol(Test, Decl(classMemberInitializerWithLamdaScoping.ts, 2, 2)) >field : Symbol(Test.field, Decl(classMemberInitializerWithLamdaScoping.ts, 4, 16)) - console.log(field); // Using field here shouldnt be error + console.log(field); // Using field here shouldn't be error >console.log : Symbol(log, Decl(classMemberInitializerWithLamdaScoping.ts, 0, 22)) >console : Symbol(console, Decl(classMemberInitializerWithLamdaScoping.ts, 0, 11)) >log : Symbol(log, Decl(classMemberInitializerWithLamdaScoping.ts, 0, 22)) @@ -43,7 +43,7 @@ class Test { >Test : Symbol(Test, Decl(classMemberInitializerWithLamdaScoping.ts, 2, 2)) >field : Symbol(Test.field, Decl(classMemberInitializerWithLamdaScoping.ts, 9, 6)) - console.log(field); // Using field here shouldnt be error + console.log(field); // Using field here shouldn't be error >console.log : Symbol(log, Decl(classMemberInitializerWithLamdaScoping.ts, 0, 22)) >console : Symbol(console, Decl(classMemberInitializerWithLamdaScoping.ts, 0, 11)) >log : Symbol(log, Decl(classMemberInitializerWithLamdaScoping.ts, 0, 22)) @@ -71,12 +71,12 @@ class Test1 { >field1 : Symbol(field1, Decl(classMemberInitializerWithLamdaScoping.ts, 17, 3)) // but since this code would be generated inside constructor, in generated js - // it would resolve to private field1 and thats not what user intended here. + // it would resolve to private field1 and that's not what user intended here. }; static staticMessageHandler = () => { >staticMessageHandler : Symbol(Test1.staticMessageHandler, Decl(classMemberInitializerWithLamdaScoping.ts, 25, 6)) - console.log(field1); // This shouldnt be error as its a static property + console.log(field1); // This shouldn't be error as its a static property >console.log : Symbol(log, Decl(classMemberInitializerWithLamdaScoping.ts, 0, 22)) >console : Symbol(console, Decl(classMemberInitializerWithLamdaScoping.ts, 0, 11)) >log : Symbol(log, Decl(classMemberInitializerWithLamdaScoping.ts, 0, 22)) diff --git a/tests/baselines/reference/classMemberInitializerWithLamdaScoping.types b/tests/baselines/reference/classMemberInitializerWithLamdaScoping.types index e91a5aff36481..970fbd7467d6e 100644 --- a/tests/baselines/reference/classMemberInitializerWithLamdaScoping.types +++ b/tests/baselines/reference/classMemberInitializerWithLamdaScoping.types @@ -23,7 +23,7 @@ class Test { messageHandler = () => { >messageHandler : () => void > : ^^^^^^^^^^ ->() => { var field = this.field; console.log(field); // Using field here shouldnt be error } : () => void +>() => { var field = this.field; console.log(field); // Using field here shouldn't be error } : () => void > : ^^^^^^^^^^ var field = this.field; @@ -36,7 +36,7 @@ class Test { >field : string > : ^^^^^^ - console.log(field); // Using field here shouldnt be error + console.log(field); // Using field here shouldn't be error >console.log(field) : void > : ^^^^ >console.log : (msg?: any) => void @@ -56,7 +56,7 @@ class Test { static staticMessageHandler = () => { >staticMessageHandler : () => void > : ^^^^^^^^^^ ->() => { var field = Test.field; console.log(field); // Using field here shouldnt be error } : () => void +>() => { var field = Test.field; console.log(field); // Using field here shouldn't be error } : () => void > : ^^^^^^^^^^ var field = Test.field; @@ -69,7 +69,7 @@ class Test { >field : number > : ^^^^^^ - console.log(field); // Using field here shouldnt be error + console.log(field); // Using field here shouldn't be error >console.log(field) : void > : ^^^^ >console.log : (msg?: any) => void @@ -99,7 +99,7 @@ class Test1 { messageHandler = () => { >messageHandler : () => void > : ^^^^^^^^^^ ->() => { console.log(field1); // But this should be error as the field1 will resolve to var field1 // but since this code would be generated inside constructor, in generated js // it would resolve to private field1 and thats not what user intended here. } : () => void +>() => { console.log(field1); // But this should be error as the field1 will resolve to var field1 // but since this code would be generated inside constructor, in generated js // it would resolve to private field1 and that's not what user intended here. } : () => void > : ^^^^^^^^^^ console.log(field1); // But this should be error as the field1 will resolve to var field1 @@ -115,15 +115,15 @@ class Test1 { > : ^^^ // but since this code would be generated inside constructor, in generated js - // it would resolve to private field1 and thats not what user intended here. + // it would resolve to private field1 and that's not what user intended here. }; static staticMessageHandler = () => { >staticMessageHandler : () => void > : ^^^^^^^^^^ ->() => { console.log(field1); // This shouldnt be error as its a static property } : () => void +>() => { console.log(field1); // This shouldn't be error as its a static property } : () => void > : ^^^^^^^^^^ - console.log(field1); // This shouldnt be error as its a static property + console.log(field1); // This shouldn't be error as its a static property >console.log(field1) : void > : ^^^^ >console.log : (msg?: any) => void diff --git a/tests/baselines/reference/classMemberInitializerWithLamdaScoping2.errors.txt b/tests/baselines/reference/classMemberInitializerWithLamdaScoping2.errors.txt index a8f51d0fa570c..f2ef66ac73a4d 100644 --- a/tests/baselines/reference/classMemberInitializerWithLamdaScoping2.errors.txt +++ b/tests/baselines/reference/classMemberInitializerWithLamdaScoping2.errors.txt @@ -16,6 +16,6 @@ classMemberInitializerWithLamdaScoping2_1.ts(8,21): error TS2301: Initializer of ~~~~~~ !!! error TS2301: Initializer of instance member variable 'messageHandler' cannot reference identifier 'field1' declared in the constructor. // but since this code would be generated inside constructor, in generated js - // it would resolve to private field1 and thats not what user intended here. + // it would resolve to private field1 and that's not what user intended here. }; } \ No newline at end of file diff --git a/tests/baselines/reference/classMemberInitializerWithLamdaScoping2.js b/tests/baselines/reference/classMemberInitializerWithLamdaScoping2.js index 3fcbb99c41b50..1a49397f3a0b1 100644 --- a/tests/baselines/reference/classMemberInitializerWithLamdaScoping2.js +++ b/tests/baselines/reference/classMemberInitializerWithLamdaScoping2.js @@ -13,7 +13,7 @@ class Test1 { messageHandler = () => { console.log(field1); // But this should be error as the field1 will resolve to var field1 // but since this code would be generated inside constructor, in generated js - // it would resolve to private field1 and thats not what user intended here. + // it would resolve to private field1 and that's not what user intended here. }; } @@ -28,7 +28,7 @@ class Test1 { this.messageHandler = () => { console.log(field1); // But this should be error as the field1 will resolve to var field1 // but since this code would be generated inside constructor, in generated js - // it would resolve to private field1 and thats not what user intended here. + // it would resolve to private field1 and that's not what user intended here. }; } } diff --git a/tests/baselines/reference/classMemberInitializerWithLamdaScoping2.symbols b/tests/baselines/reference/classMemberInitializerWithLamdaScoping2.symbols index 72e7a3b982ba4..ed7336624a278 100644 --- a/tests/baselines/reference/classMemberInitializerWithLamdaScoping2.symbols +++ b/tests/baselines/reference/classMemberInitializerWithLamdaScoping2.symbols @@ -29,6 +29,6 @@ class Test1 { >field1 : Symbol(field1, Decl(classMemberInitializerWithLamdaScoping2_0.ts, 0, 3)) // but since this code would be generated inside constructor, in generated js - // it would resolve to private field1 and thats not what user intended here. + // it would resolve to private field1 and that's not what user intended here. }; } diff --git a/tests/baselines/reference/classMemberInitializerWithLamdaScoping2.types b/tests/baselines/reference/classMemberInitializerWithLamdaScoping2.types index f679fce5321ca..85b6a3a6944a1 100644 --- a/tests/baselines/reference/classMemberInitializerWithLamdaScoping2.types +++ b/tests/baselines/reference/classMemberInitializerWithLamdaScoping2.types @@ -28,7 +28,7 @@ class Test1 { messageHandler = () => { >messageHandler : () => void > : ^^^^^^^^^^ ->() => { console.log(field1); // But this should be error as the field1 will resolve to var field1 // but since this code would be generated inside constructor, in generated js // it would resolve to private field1 and thats not what user intended here. } : () => void +>() => { console.log(field1); // But this should be error as the field1 will resolve to var field1 // but since this code would be generated inside constructor, in generated js // it would resolve to private field1 and that's not what user intended here. } : () => void > : ^^^^^^^^^^ console.log(field1); // But this should be error as the field1 will resolve to var field1 @@ -44,6 +44,6 @@ class Test1 { > : ^^^ // but since this code would be generated inside constructor, in generated js - // it would resolve to private field1 and thats not what user intended here. + // it would resolve to private field1 and that's not what user intended here. }; } diff --git a/tests/baselines/reference/classMemberInitializerWithLamdaScoping3.errors.txt b/tests/baselines/reference/classMemberInitializerWithLamdaScoping3.errors.txt index 0695788a65080..4f993807f1ab7 100644 --- a/tests/baselines/reference/classMemberInitializerWithLamdaScoping3.errors.txt +++ b/tests/baselines/reference/classMemberInitializerWithLamdaScoping3.errors.txt @@ -16,6 +16,6 @@ classMemberInitializerWithLamdaScoping3_1.ts(8,21): error TS2301: Initializer of ~~~~~~ !!! error TS2301: Initializer of instance member variable 'messageHandler' cannot reference identifier 'field1' declared in the constructor. // but since this code would be generated inside constructor, in generated js - // it would resolve to private field1 and thats not what user intended here. + // it would resolve to private field1 and that's not what user intended here. }; } \ No newline at end of file diff --git a/tests/baselines/reference/classMemberInitializerWithLamdaScoping3.js b/tests/baselines/reference/classMemberInitializerWithLamdaScoping3.js index f00325fadbece..1f71814ae5711 100644 --- a/tests/baselines/reference/classMemberInitializerWithLamdaScoping3.js +++ b/tests/baselines/reference/classMemberInitializerWithLamdaScoping3.js @@ -13,7 +13,7 @@ export class Test1 { messageHandler = () => { console.log(field1); // But this should be error as the field1 will resolve to var field1 // but since this code would be generated inside constructor, in generated js - // it would resolve to private field1 and thats not what user intended here. + // it would resolve to private field1 and that's not what user intended here. }; } @@ -27,7 +27,7 @@ export class Test1 { this.messageHandler = () => { console.log(field1); // But this should be error as the field1 will resolve to var field1 // but since this code would be generated inside constructor, in generated js - // it would resolve to private field1 and thats not what user intended here. + // it would resolve to private field1 and that's not what user intended here. }; } } diff --git a/tests/baselines/reference/classMemberInitializerWithLamdaScoping3.symbols b/tests/baselines/reference/classMemberInitializerWithLamdaScoping3.symbols index f48abe8299ee6..b03a760b2044c 100644 --- a/tests/baselines/reference/classMemberInitializerWithLamdaScoping3.symbols +++ b/tests/baselines/reference/classMemberInitializerWithLamdaScoping3.symbols @@ -29,6 +29,6 @@ export class Test1 { >field1 : Symbol(field1, Decl(classMemberInitializerWithLamdaScoping3_0.ts, 0, 3)) // but since this code would be generated inside constructor, in generated js - // it would resolve to private field1 and thats not what user intended here. + // it would resolve to private field1 and that's not what user intended here. }; } diff --git a/tests/baselines/reference/classMemberInitializerWithLamdaScoping3.types b/tests/baselines/reference/classMemberInitializerWithLamdaScoping3.types index 79f7bc5ad81fa..7aad60ee6b7d1 100644 --- a/tests/baselines/reference/classMemberInitializerWithLamdaScoping3.types +++ b/tests/baselines/reference/classMemberInitializerWithLamdaScoping3.types @@ -28,7 +28,7 @@ export class Test1 { messageHandler = () => { >messageHandler : () => void > : ^^^^^^^^^^ ->() => { console.log(field1); // But this should be error as the field1 will resolve to var field1 // but since this code would be generated inside constructor, in generated js // it would resolve to private field1 and thats not what user intended here. } : () => void +>() => { console.log(field1); // But this should be error as the field1 will resolve to var field1 // but since this code would be generated inside constructor, in generated js // it would resolve to private field1 and that's not what user intended here. } : () => void > : ^^^^^^^^^^ console.log(field1); // But this should be error as the field1 will resolve to var field1 @@ -44,6 +44,6 @@ export class Test1 { > : ^^^ // but since this code would be generated inside constructor, in generated js - // it would resolve to private field1 and thats not what user intended here. + // it would resolve to private field1 and that's not what user intended here. }; } diff --git a/tests/baselines/reference/classMemberInitializerWithLamdaScoping4.errors.txt b/tests/baselines/reference/classMemberInitializerWithLamdaScoping4.errors.txt index 0bfbbfecc23b9..6d46c61430a1e 100644 --- a/tests/baselines/reference/classMemberInitializerWithLamdaScoping4.errors.txt +++ b/tests/baselines/reference/classMemberInitializerWithLamdaScoping4.errors.txt @@ -12,7 +12,7 @@ classMemberInitializerWithLamdaScoping3_1.ts(8,21): error TS2663: Cannot find na constructor(private field1: string) { } messageHandler = () => { - console.log(field1); // Should be error that couldnt find symbol field1 + console.log(field1); // Should be error that couldn't find symbol field1 ~~~~~~ !!! error TS2663: Cannot find name 'field1'. Did you mean the instance member 'this.field1'? }; diff --git a/tests/baselines/reference/classMemberInitializerWithLamdaScoping4.js b/tests/baselines/reference/classMemberInitializerWithLamdaScoping4.js index 029e5cb181188..2fcbb665add6a 100644 --- a/tests/baselines/reference/classMemberInitializerWithLamdaScoping4.js +++ b/tests/baselines/reference/classMemberInitializerWithLamdaScoping4.js @@ -11,7 +11,7 @@ export class Test1 { constructor(private field1: string) { } messageHandler = () => { - console.log(field1); // Should be error that couldnt find symbol field1 + console.log(field1); // Should be error that couldn't find symbol field1 }; } @@ -27,7 +27,7 @@ class Test1 { constructor(field1) { this.field1 = field1; this.messageHandler = () => { - console.log(field1); // Should be error that couldnt find symbol field1 + console.log(field1); // Should be error that couldn't find symbol field1 }; } } diff --git a/tests/baselines/reference/classMemberInitializerWithLamdaScoping4.symbols b/tests/baselines/reference/classMemberInitializerWithLamdaScoping4.symbols index 49eee3d230039..00bc0f66e1ddc 100644 --- a/tests/baselines/reference/classMemberInitializerWithLamdaScoping4.symbols +++ b/tests/baselines/reference/classMemberInitializerWithLamdaScoping4.symbols @@ -22,7 +22,7 @@ export class Test1 { messageHandler = () => { >messageHandler : Symbol(Test1.messageHandler, Decl(classMemberInitializerWithLamdaScoping3_1.ts, 5, 5)) - console.log(field1); // Should be error that couldnt find symbol field1 + console.log(field1); // Should be error that couldn't find symbol field1 >console.log : Symbol(log, Decl(classMemberInitializerWithLamdaScoping3_1.ts, 0, 22)) >console : Symbol(console, Decl(classMemberInitializerWithLamdaScoping3_1.ts, 0, 11)) >log : Symbol(log, Decl(classMemberInitializerWithLamdaScoping3_1.ts, 0, 22)) diff --git a/tests/baselines/reference/classMemberInitializerWithLamdaScoping4.types b/tests/baselines/reference/classMemberInitializerWithLamdaScoping4.types index 8e6f0e3bd0d3f..4e1c765092fde 100644 --- a/tests/baselines/reference/classMemberInitializerWithLamdaScoping4.types +++ b/tests/baselines/reference/classMemberInitializerWithLamdaScoping4.types @@ -28,10 +28,10 @@ export class Test1 { messageHandler = () => { >messageHandler : () => void > : ^^^^^^^^^^ ->() => { console.log(field1); // Should be error that couldnt find symbol field1 } : () => void +>() => { console.log(field1); // Should be error that couldn't find symbol field1 } : () => void > : ^^^^^^^^^^ - console.log(field1); // Should be error that couldnt find symbol field1 + console.log(field1); // Should be error that couldn't find symbol field1 >console.log(field1) : void > : ^^^^ >console.log : (msg?: any) => void diff --git a/tests/baselines/reference/classMemberInitializerWithLamdaScoping5.js b/tests/baselines/reference/classMemberInitializerWithLamdaScoping5.js index ea44a39c2c0e1..f567cfe23ae33 100644 --- a/tests/baselines/reference/classMemberInitializerWithLamdaScoping5.js +++ b/tests/baselines/reference/classMemberInitializerWithLamdaScoping5.js @@ -9,7 +9,7 @@ class Greeter { } messageHandler = (message: string) => { - console.log(message); // This shouldnt be error + console.log(message); // This shouldn't be error } } @@ -18,7 +18,7 @@ class Greeter { class Greeter { constructor(message) { this.messageHandler = (message) => { - console.log(message); // This shouldnt be error + console.log(message); // This shouldn't be error }; } } diff --git a/tests/baselines/reference/classMemberInitializerWithLamdaScoping5.symbols b/tests/baselines/reference/classMemberInitializerWithLamdaScoping5.symbols index d52774845e261..1f8eb9f1a4176 100644 --- a/tests/baselines/reference/classMemberInitializerWithLamdaScoping5.symbols +++ b/tests/baselines/reference/classMemberInitializerWithLamdaScoping5.symbols @@ -21,7 +21,7 @@ class Greeter { >messageHandler : Symbol(Greeter.messageHandler, Decl(classMemberInitializerWithLamdaScoping5.ts, 5, 5)) >message : Symbol(message, Decl(classMemberInitializerWithLamdaScoping5.ts, 7, 22)) - console.log(message); // This shouldnt be error + console.log(message); // This shouldn't be error >console.log : Symbol(log, Decl(classMemberInitializerWithLamdaScoping5.ts, 0, 22)) >console : Symbol(console, Decl(classMemberInitializerWithLamdaScoping5.ts, 0, 11)) >log : Symbol(log, Decl(classMemberInitializerWithLamdaScoping5.ts, 0, 22)) diff --git a/tests/baselines/reference/classMemberInitializerWithLamdaScoping5.types b/tests/baselines/reference/classMemberInitializerWithLamdaScoping5.types index 42cef91e19142..3847d1b8e9eea 100644 --- a/tests/baselines/reference/classMemberInitializerWithLamdaScoping5.types +++ b/tests/baselines/reference/classMemberInitializerWithLamdaScoping5.types @@ -25,12 +25,12 @@ class Greeter { messageHandler = (message: string) => { >messageHandler : (message: string) => void > : ^ ^^ ^^^^^^^^^ ->(message: string) => { console.log(message); // This shouldnt be error } : (message: string) => void +>(message: string) => { console.log(message); // This shouldn't be error } : (message: string) => void > : ^ ^^ ^^^^^^^^^ >message : string > : ^^^^^^ - console.log(message); // This shouldnt be error + console.log(message); // This shouldn't be error >console.log(message) : void > : ^^^^ >console.log : (message?: any, ...optionalParams: any[]) => void diff --git a/tests/baselines/reference/classStaticBlock6(target=es5).js b/tests/baselines/reference/classStaticBlock6(target=es5).js index 41cb6673b515a..466db992c063c 100644 --- a/tests/baselines/reference/classStaticBlock6(target=es5).js +++ b/tests/baselines/reference/classStaticBlock6(target=es5).js @@ -103,7 +103,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge }); }; var __generator = (this && this.__generator) || function (thisArg, body) { - var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); + var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, tries: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; function verb(n) { return function (v) { return step([n, v]); }; } function step(op) { @@ -115,14 +115,14 @@ var __generator = (this && this.__generator) || function (thisArg, body) { case 0: case 1: t = op; break; case 4: _.label++; return { value: op[1], done: false }; case 5: _.label++; y = op[1]; op = [0]; continue; - case 7: op = _.ops.pop(); _.trys.pop(); continue; + case 7: op = _.ops.pop(); _.tries.pop(); continue; default: - if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } + if (!(t = _.tries, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } if (t[2]) _.ops.pop(); - _.trys.pop(); continue; + _.tries.pop(); continue; } op = body.call(thisArg, _); } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } diff --git a/tests/baselines/reference/collisionCodeGenModuleWithAccessorChildren.js b/tests/baselines/reference/collisionCodeGenModuleWithAccessorChildren.js index 2052250c9975b..3b35cc7e07599 100644 --- a/tests/baselines/reference/collisionCodeGenModuleWithAccessorChildren.js +++ b/tests/baselines/reference/collisionCodeGenModuleWithAccessorChildren.js @@ -21,7 +21,7 @@ namespace M { } } -namespace M { // Shouldnt be _M +namespace M { // Shouldn't be _M class e { private y; set M(p) { @@ -39,7 +39,7 @@ namespace M { } } -namespace M { // Shouldnt be _M +namespace M { // Shouldn't be _M class e { get M() { return x; diff --git a/tests/baselines/reference/collisionCodeGenModuleWithAccessorChildren.symbols b/tests/baselines/reference/collisionCodeGenModuleWithAccessorChildren.symbols index 73d8960703be7..9753d44c0da5c 100644 --- a/tests/baselines/reference/collisionCodeGenModuleWithAccessorChildren.symbols +++ b/tests/baselines/reference/collisionCodeGenModuleWithAccessorChildren.symbols @@ -51,7 +51,7 @@ namespace M { } } -namespace M { // Shouldnt be _M +namespace M { // Shouldn't be _M >M : Symbol(M, Decl(collisionCodeGenModuleWithAccessorChildren.ts, 0, 0), Decl(collisionCodeGenModuleWithAccessorChildren.ts, 8, 1), Decl(collisionCodeGenModuleWithAccessorChildren.ts, 18, 1), Decl(collisionCodeGenModuleWithAccessorChildren.ts, 27, 1), Decl(collisionCodeGenModuleWithAccessorChildren.ts, 36, 1)) class e { @@ -91,7 +91,7 @@ namespace M { } } -namespace M { // Shouldnt be _M +namespace M { // Shouldn't be _M >M : Symbol(M, Decl(collisionCodeGenModuleWithAccessorChildren.ts, 0, 0), Decl(collisionCodeGenModuleWithAccessorChildren.ts, 8, 1), Decl(collisionCodeGenModuleWithAccessorChildren.ts, 18, 1), Decl(collisionCodeGenModuleWithAccessorChildren.ts, 27, 1), Decl(collisionCodeGenModuleWithAccessorChildren.ts, 36, 1)) class e { diff --git a/tests/baselines/reference/collisionCodeGenModuleWithAccessorChildren.types b/tests/baselines/reference/collisionCodeGenModuleWithAccessorChildren.types index f73f96da8daa4..a203617b37da0 100644 --- a/tests/baselines/reference/collisionCodeGenModuleWithAccessorChildren.types +++ b/tests/baselines/reference/collisionCodeGenModuleWithAccessorChildren.types @@ -71,7 +71,7 @@ namespace M { } } -namespace M { // Shouldnt be _M +namespace M { // Shouldn't be _M >M : typeof M > : ^^^^^^^^ @@ -125,7 +125,7 @@ namespace M { } } -namespace M { // Shouldnt be _M +namespace M { // Shouldn't be _M >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/collisionCodeGenModuleWithMethodChildren.js b/tests/baselines/reference/collisionCodeGenModuleWithMethodChildren.js index 0ee348f5f98c3..afc91e4cf1ad9 100644 --- a/tests/baselines/reference/collisionCodeGenModuleWithMethodChildren.js +++ b/tests/baselines/reference/collisionCodeGenModuleWithMethodChildren.js @@ -27,7 +27,7 @@ namespace M { } } -namespace M { // Shouldnt bn _M +namespace M { // Shouldn't bn _M class f { M() { } diff --git a/tests/baselines/reference/collisionCodeGenModuleWithMethodChildren.symbols b/tests/baselines/reference/collisionCodeGenModuleWithMethodChildren.symbols index 68104b86f3dc0..779bb20b2465b 100644 --- a/tests/baselines/reference/collisionCodeGenModuleWithMethodChildren.symbols +++ b/tests/baselines/reference/collisionCodeGenModuleWithMethodChildren.symbols @@ -57,7 +57,7 @@ namespace M { } } -namespace M { // Shouldnt bn _M +namespace M { // Shouldn't bn _M >M : Symbol(M, Decl(collisionCodeGenModuleWithMethodChildren.ts, 0, 0), Decl(collisionCodeGenModuleWithMethodChildren.ts, 5, 1), Decl(collisionCodeGenModuleWithMethodChildren.ts, 14, 1), Decl(collisionCodeGenModuleWithMethodChildren.ts, 24, 1)) class f { diff --git a/tests/baselines/reference/collisionCodeGenModuleWithMethodChildren.types b/tests/baselines/reference/collisionCodeGenModuleWithMethodChildren.types index 38f6d135c1045..52c15ba1df673 100644 --- a/tests/baselines/reference/collisionCodeGenModuleWithMethodChildren.types +++ b/tests/baselines/reference/collisionCodeGenModuleWithMethodChildren.types @@ -76,7 +76,7 @@ namespace M { } } -namespace M { // Shouldnt bn _M +namespace M { // Shouldn't bn _M >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/collisionCodeGenModuleWithModuleChildren.js b/tests/baselines/reference/collisionCodeGenModuleWithModuleChildren.js index 951e90a2cd834..f5906c3ccb5ac 100644 --- a/tests/baselines/reference/collisionCodeGenModuleWithModuleChildren.js +++ b/tests/baselines/reference/collisionCodeGenModuleWithModuleChildren.js @@ -27,7 +27,7 @@ namespace M { } } -namespace M { // shouldnt be _M +namespace M { // shouldn't be _M namespace m3 { interface M { } diff --git a/tests/baselines/reference/collisionCodeGenModuleWithModuleChildren.symbols b/tests/baselines/reference/collisionCodeGenModuleWithModuleChildren.symbols index 541fd8bc76698..f922dfa24d388 100644 --- a/tests/baselines/reference/collisionCodeGenModuleWithModuleChildren.symbols +++ b/tests/baselines/reference/collisionCodeGenModuleWithModuleChildren.symbols @@ -57,7 +57,7 @@ namespace M { } } -namespace M { // shouldnt be _M +namespace M { // shouldn't be _M >M : Symbol(M, Decl(collisionCodeGenModuleWithModuleChildren.ts, 0, 0), Decl(collisionCodeGenModuleWithModuleChildren.ts, 6, 1), Decl(collisionCodeGenModuleWithModuleChildren.ts, 15, 1), Decl(collisionCodeGenModuleWithModuleChildren.ts, 24, 1), Decl(collisionCodeGenModuleWithModuleChildren.ts, 33, 1)) namespace m3 { diff --git a/tests/baselines/reference/collisionCodeGenModuleWithModuleChildren.types b/tests/baselines/reference/collisionCodeGenModuleWithModuleChildren.types index 2b2b111e2c016..49e41d6c452a0 100644 --- a/tests/baselines/reference/collisionCodeGenModuleWithModuleChildren.types +++ b/tests/baselines/reference/collisionCodeGenModuleWithModuleChildren.types @@ -85,7 +85,7 @@ namespace M { } } -namespace M { // shouldnt be _M +namespace M { // shouldn't be _M >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/collisionSuperAndParameter(target=es2015).js b/tests/baselines/reference/collisionSuperAndParameter(target=es2015).js index 17d9b5c2f845a..8644bbdfa88fb 100644 --- a/tests/baselines/reference/collisionSuperAndParameter(target=es2015).js +++ b/tests/baselines/reference/collisionSuperAndParameter(target=es2015).js @@ -3,7 +3,7 @@ //// [collisionSuperAndParameter.ts] class Foo { a() { - var lamda = (_super: number) => { // No Error + var lambda = (_super: number) => { // No Error return x => this; // New scope. So should inject new _this capture } } @@ -17,7 +17,7 @@ class Foo { } class Foo2 extends Foo { x() { - var lamda = (_super: number) => { // Error + var lambda = (_super: number) => { // Error return x => this; // New scope. So should inject new _this capture } } @@ -68,7 +68,7 @@ class Foo4 extends Foo { "use strict"; class Foo { a() { - var lamda = (_super) => { + var lambda = (_super) => { return x => this; // New scope. So should inject new _this capture }; } @@ -82,7 +82,7 @@ class Foo { } class Foo2 extends Foo { x() { - var lamda = (_super) => { + var lambda = (_super) => { return x => this; // New scope. So should inject new _this capture }; } diff --git a/tests/baselines/reference/collisionSuperAndParameter(target=es2015).symbols b/tests/baselines/reference/collisionSuperAndParameter(target=es2015).symbols index b84520561f690..17de441728114 100644 --- a/tests/baselines/reference/collisionSuperAndParameter(target=es2015).symbols +++ b/tests/baselines/reference/collisionSuperAndParameter(target=es2015).symbols @@ -7,8 +7,8 @@ class Foo { a() { >a : Symbol(Foo.a, Decl(collisionSuperAndParameter.ts, 0, 11)) - var lamda = (_super: number) => { // No Error ->lamda : Symbol(lamda, Decl(collisionSuperAndParameter.ts, 2, 11)) + var lambda = (_super: number) => { // No Error +>lambda : Symbol(lambda, Decl(collisionSuperAndParameter.ts, 2, 11)) >_super : Symbol(_super, Decl(collisionSuperAndParameter.ts, 2, 21)) return x => this; // New scope. So should inject new _this capture @@ -40,8 +40,8 @@ class Foo2 extends Foo { x() { >x : Symbol(Foo2.x, Decl(collisionSuperAndParameter.ts, 14, 24)) - var lamda = (_super: number) => { // Error ->lamda : Symbol(lamda, Decl(collisionSuperAndParameter.ts, 16, 11)) + var lambda = (_super: number) => { // Error +>lambda : Symbol(lambda, Decl(collisionSuperAndParameter.ts, 16, 11)) >_super : Symbol(_super, Decl(collisionSuperAndParameter.ts, 16, 21)) return x => this; // New scope. So should inject new _this capture diff --git a/tests/baselines/reference/collisionSuperAndParameter(target=es2015).types b/tests/baselines/reference/collisionSuperAndParameter(target=es2015).types index 5abe135cd301f..8abab465c0d5c 100644 --- a/tests/baselines/reference/collisionSuperAndParameter(target=es2015).types +++ b/tests/baselines/reference/collisionSuperAndParameter(target=es2015).types @@ -9,8 +9,8 @@ class Foo { >a : () => void > : ^^^^^^^^^^ - var lamda = (_super: number) => { // No Error ->lamda : (_super: number) => (x: any) => this + var lambda = (_super: number) => { // No Error +>lambda : (_super: number) => (x: any) => this > : ^ ^^ ^^^^^^ ^^^^^^^^^^^^ >(_super: number) => { // No Error return x => this; // New scope. So should inject new _this capture } : (_super: number) => (x: any) => this > : ^ ^^ ^^^^^^ ^^^^^^^^^^^^ @@ -62,8 +62,8 @@ class Foo2 extends Foo { >x : () => void > : ^^^^^^^^^^ - var lamda = (_super: number) => { // Error ->lamda : (_super: number) => (x: any) => this + var lambda = (_super: number) => { // Error +>lambda : (_super: number) => (x: any) => this > : ^ ^^ ^^^^^^ ^^^^^^^^^^^^ >(_super: number) => { // Error return x => this; // New scope. So should inject new _this capture } : (_super: number) => (x: any) => this > : ^ ^^ ^^^^^^ ^^^^^^^^^^^^ diff --git a/tests/baselines/reference/collisionSuperAndParameter(target=es5).errors.txt b/tests/baselines/reference/collisionSuperAndParameter(target=es5).errors.txt index 31fc5028bb0a0..f5183736f66b7 100644 --- a/tests/baselines/reference/collisionSuperAndParameter(target=es5).errors.txt +++ b/tests/baselines/reference/collisionSuperAndParameter(target=es5).errors.txt @@ -5,7 +5,7 @@ error TS5107: Option 'target=ES5' is deprecated and will stop functioning in Typ ==== collisionSuperAndParameter.ts (0 errors) ==== class Foo { a() { - var lamda = (_super: number) => { // No Error + var lambda = (_super: number) => { // No Error return x => this; // New scope. So should inject new _this capture } } @@ -19,7 +19,7 @@ error TS5107: Option 'target=ES5' is deprecated and will stop functioning in Typ } class Foo2 extends Foo { x() { - var lamda = (_super: number) => { // Error + var lambda = (_super: number) => { // Error return x => this; // New scope. So should inject new _this capture } } diff --git a/tests/baselines/reference/collisionSuperAndParameter(target=es5).js b/tests/baselines/reference/collisionSuperAndParameter(target=es5).js index d75b60586c65d..6bb685067d286 100644 --- a/tests/baselines/reference/collisionSuperAndParameter(target=es5).js +++ b/tests/baselines/reference/collisionSuperAndParameter(target=es5).js @@ -3,7 +3,7 @@ //// [collisionSuperAndParameter.ts] class Foo { a() { - var lamda = (_super: number) => { // No Error + var lambda = (_super: number) => { // No Error return x => this; // New scope. So should inject new _this capture } } @@ -17,7 +17,7 @@ class Foo { } class Foo2 extends Foo { x() { - var lamda = (_super: number) => { // Error + var lambda = (_super: number) => { // Error return x => this; // New scope. So should inject new _this capture } } @@ -86,7 +86,7 @@ var Foo = /** @class */ (function () { } Foo.prototype.a = function () { var _this = this; - var lamda = function (_super) { + var lambda = function (_super) { return function (x) { return _this; }; // New scope. So should inject new _this capture }; }; @@ -116,7 +116,7 @@ var Foo2 = /** @class */ (function (_super_1) { } Foo2.prototype.x = function () { var _this = this; - var lamda = function (_super) { + var lambda = function (_super) { return function (x) { return _this; }; // New scope. So should inject new _this capture }; }; diff --git a/tests/baselines/reference/collisionSuperAndParameter(target=es5).symbols b/tests/baselines/reference/collisionSuperAndParameter(target=es5).symbols index b84520561f690..17de441728114 100644 --- a/tests/baselines/reference/collisionSuperAndParameter(target=es5).symbols +++ b/tests/baselines/reference/collisionSuperAndParameter(target=es5).symbols @@ -7,8 +7,8 @@ class Foo { a() { >a : Symbol(Foo.a, Decl(collisionSuperAndParameter.ts, 0, 11)) - var lamda = (_super: number) => { // No Error ->lamda : Symbol(lamda, Decl(collisionSuperAndParameter.ts, 2, 11)) + var lambda = (_super: number) => { // No Error +>lambda : Symbol(lambda, Decl(collisionSuperAndParameter.ts, 2, 11)) >_super : Symbol(_super, Decl(collisionSuperAndParameter.ts, 2, 21)) return x => this; // New scope. So should inject new _this capture @@ -40,8 +40,8 @@ class Foo2 extends Foo { x() { >x : Symbol(Foo2.x, Decl(collisionSuperAndParameter.ts, 14, 24)) - var lamda = (_super: number) => { // Error ->lamda : Symbol(lamda, Decl(collisionSuperAndParameter.ts, 16, 11)) + var lambda = (_super: number) => { // Error +>lambda : Symbol(lambda, Decl(collisionSuperAndParameter.ts, 16, 11)) >_super : Symbol(_super, Decl(collisionSuperAndParameter.ts, 16, 21)) return x => this; // New scope. So should inject new _this capture diff --git a/tests/baselines/reference/collisionSuperAndParameter(target=es5).types b/tests/baselines/reference/collisionSuperAndParameter(target=es5).types index 2b5ff9f636f95..c4aac7c8d6f69 100644 --- a/tests/baselines/reference/collisionSuperAndParameter(target=es5).types +++ b/tests/baselines/reference/collisionSuperAndParameter(target=es5).types @@ -9,8 +9,8 @@ class Foo { >a : () => void > : ^^^^^^^^^^ - var lamda = (_super: number) => { // No Error ->lamda : (_super: number) => (x: any) => this + var lambda = (_super: number) => { // No Error +>lambda : (_super: number) => (x: any) => this > : ^ ^^ ^^^^^^ ^^^^^^^^^^^^ >(_super: number) => { // No Error return x => this; // New scope. So should inject new _this capture } : (_super: number) => (x: any) => this > : ^ ^^ ^^^^^^ ^^^^^^^^^^^^ @@ -64,8 +64,8 @@ class Foo2 extends Foo { >x : () => void > : ^^^^^^^^^^ - var lamda = (_super: number) => { // Error ->lamda : (_super: number) => (x: any) => this + var lambda = (_super: number) => { // Error +>lambda : (_super: number) => (x: any) => this > : ^ ^^ ^^^^^^ ^^^^^^^^^^^^ >(_super: number) => { // Error return x => this; // New scope. So should inject new _this capture } : (_super: number) => (x: any) => this > : ^ ^^ ^^^^^^ ^^^^^^^^^^^^ diff --git a/tests/baselines/reference/collisionThisExpressionAndParameter.js b/tests/baselines/reference/collisionThisExpressionAndParameter.js index 3f67820bde3b1..2b33f97983d57 100644 --- a/tests/baselines/reference/collisionThisExpressionAndParameter.js +++ b/tests/baselines/reference/collisionThisExpressionAndParameter.js @@ -9,7 +9,7 @@ class Foo { } } y() { - var lamda = (_this: number) => { // Error + var lambda = (_this: number) => { // Error return x => this; // New scope. So should inject new _this capture } } @@ -25,7 +25,7 @@ class Foo { } } y1() { - var lamda = (_this: number) => { // No Error + var lambda = (_this: number) => { // No Error } } z1(_this: number) { // No Error @@ -105,7 +105,7 @@ class Foo { } } y() { - var lamda = (_this) => { + var lambda = (_this) => { return x => this; // New scope. So should inject new _this capture }; } @@ -120,7 +120,7 @@ class Foo { } } y1() { - var lamda = (_this) => { + var lambda = (_this) => { }; } z1(_this) { diff --git a/tests/baselines/reference/collisionThisExpressionAndParameter.symbols b/tests/baselines/reference/collisionThisExpressionAndParameter.symbols index f022972b23aa4..53c14dbe89f01 100644 --- a/tests/baselines/reference/collisionThisExpressionAndParameter.symbols +++ b/tests/baselines/reference/collisionThisExpressionAndParameter.symbols @@ -21,8 +21,8 @@ class Foo { y() { >y : Symbol(Foo.y, Decl(collisionThisExpressionAndParameter.ts, 6, 5)) - var lamda = (_this: number) => { // Error ->lamda : Symbol(lamda, Decl(collisionThisExpressionAndParameter.ts, 8, 11)) + var lambda = (_this: number) => { // Error +>lambda : Symbol(lambda, Decl(collisionThisExpressionAndParameter.ts, 8, 11)) >_this : Symbol(_this, Decl(collisionThisExpressionAndParameter.ts, 8, 21)) return x => this; // New scope. So should inject new _this capture @@ -57,8 +57,8 @@ class Foo { y1() { >y1 : Symbol(Foo.y1, Decl(collisionThisExpressionAndParameter.ts, 22, 5)) - var lamda = (_this: number) => { // No Error ->lamda : Symbol(lamda, Decl(collisionThisExpressionAndParameter.ts, 24, 11)) + var lambda = (_this: number) => { // No Error +>lambda : Symbol(lambda, Decl(collisionThisExpressionAndParameter.ts, 24, 11)) >_this : Symbol(_this, Decl(collisionThisExpressionAndParameter.ts, 24, 21)) } } diff --git a/tests/baselines/reference/collisionThisExpressionAndParameter.types b/tests/baselines/reference/collisionThisExpressionAndParameter.types index fe3d1066117b4..afa392273370b 100644 --- a/tests/baselines/reference/collisionThisExpressionAndParameter.types +++ b/tests/baselines/reference/collisionThisExpressionAndParameter.types @@ -32,8 +32,8 @@ class Foo { >y : () => void > : ^^^^^^^^^^ - var lamda = (_this: number) => { // Error ->lamda : (_this: number) => (x: any) => this + var lambda = (_this: number) => { // Error +>lambda : (_this: number) => (x: any) => this > : ^ ^^ ^^^^^^ ^^^^^^^^^^^^ >(_this: number) => { // Error return x => this; // New scope. So should inject new _this capture } : (_this: number) => (x: any) => this > : ^ ^^ ^^^^^^ ^^^^^^^^^^^^ @@ -90,8 +90,8 @@ class Foo { >y1 : () => void > : ^^^^^^^^^^ - var lamda = (_this: number) => { // No Error ->lamda : (_this: number) => void + var lambda = (_this: number) => { // No Error +>lambda : (_this: number) => void > : ^ ^^ ^^^^^^^^^ >(_this: number) => { // No Error } : (_this: number) => void > : ^ ^^ ^^^^^^^^^ diff --git a/tests/baselines/reference/commentInMethodCall.errors.txt b/tests/baselines/reference/commentInMethodCall.errors.txt index 7345836a26c96..d9b781c25e999 100644 --- a/tests/baselines/reference/commentInMethodCall.errors.txt +++ b/tests/baselines/reference/commentInMethodCall.errors.txt @@ -2,7 +2,7 @@ commentInMethodCall.ts(3,1): error TS2454: Variable 's' is used before being ass ==== commentInMethodCall.ts (1 errors) ==== - //commment here + //comment here var s: string[]; s.map(// do something ~ diff --git a/tests/baselines/reference/commentInMethodCall.js b/tests/baselines/reference/commentInMethodCall.js index 6cccda7c73357..ad3f6e4e9811e 100644 --- a/tests/baselines/reference/commentInMethodCall.js +++ b/tests/baselines/reference/commentInMethodCall.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/commentInMethodCall.ts] //// //// [commentInMethodCall.ts] -//commment here +//comment here var s: string[]; s.map(// do something function () { }); @@ -9,7 +9,7 @@ s.map(// do something //// [commentInMethodCall.js] "use strict"; -//commment here +//comment here var s; s.map(// do something function () { }); diff --git a/tests/baselines/reference/commentInMethodCall.symbols b/tests/baselines/reference/commentInMethodCall.symbols index 6ebb8a476fbd9..6b07c7a0855ee 100644 --- a/tests/baselines/reference/commentInMethodCall.symbols +++ b/tests/baselines/reference/commentInMethodCall.symbols @@ -1,7 +1,7 @@ //// [tests/cases/compiler/commentInMethodCall.ts] //// === commentInMethodCall.ts === -//commment here +//comment here var s: string[]; >s : Symbol(s, Decl(commentInMethodCall.ts, 1, 3)) diff --git a/tests/baselines/reference/commentInMethodCall.types b/tests/baselines/reference/commentInMethodCall.types index 27d91df643226..202b2494fb925 100644 --- a/tests/baselines/reference/commentInMethodCall.types +++ b/tests/baselines/reference/commentInMethodCall.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/commentInMethodCall.ts] //// === commentInMethodCall.ts === -//commment here +//comment here var s: string[]; >s : string[] > : ^^^^^^^^ diff --git a/tests/baselines/reference/commentsClass(target=es2015).js b/tests/baselines/reference/commentsClass(target=es2015).js index e581678bacad2..ac6129c44e5e1 100644 --- a/tests/baselines/reference/commentsClass(target=es2015).js +++ b/tests/baselines/reference/commentsClass(target=es2015).js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/commentsClass.ts] //// //// [commentsClass.ts] -/** This is class c2 without constuctor*/ +/** This is class c2 without constructor*/ class c2 { } // trailing comment1 var i2 = new c2(); @@ -21,15 +21,15 @@ class c4 { } var i4 = new c4(); var i4_c = c4; -/** Class with statics*/ +/** Class with statistics*/ class c5 { static s1: number; } var i5 = new c5(); var i5_c = c5; -/// class with statics and constructor -class c6 { /// class with statics and constructor2 +/// class with statistics and constructor +class c6 { /// class with statistics and constructor2 /// s1 comment static s1: number; /// s1 comment2 /// constructor comment @@ -39,7 +39,7 @@ class c6 { /// class with statics and constructor2 var i6 = new c6(); var i6_c = c6; -// class with statics and constructor +// class with statistics and constructor class c7 { // s1 comment static s1: number; @@ -50,7 +50,7 @@ class c7 { var i7 = new c7(); var i7_c = c7; -/** class with statics and constructor +/** class with statistics and constructor */ class c8 { /** s1 comment */ @@ -76,7 +76,7 @@ class c9 { //// [commentsClass.js] "use strict"; -/** This is class c2 without constuctor*/ +/** This is class c2 without constructor*/ class c2 { } // trailing comment1 var i2 = new c2(); @@ -96,12 +96,12 @@ class c4 { } var i4 = new c4(); var i4_c = c4; -/** Class with statics*/ +/** Class with statistics*/ class c5 { } var i5 = new c5(); var i5_c = c5; -/// class with statics and constructor +/// class with statistics and constructor class c6 { /// constructor comment constructor() { @@ -109,7 +109,7 @@ class c6 { } var i6 = new c6(); var i6_c = c6; -// class with statics and constructor +// class with statistics and constructor class c7 { // constructor comment constructor() { @@ -117,7 +117,7 @@ class c7 { } var i7 = new c7(); var i7_c = c7; -/** class with statics and constructor +/** class with statistics and constructor */ class c8 { /** constructor comment @@ -138,7 +138,7 @@ class c9 { //// [commentsClass.d.ts] -/** This is class c2 without constuctor*/ +/** This is class c2 without constructor*/ declare class c2 { } declare var i2: c2; @@ -156,7 +156,7 @@ declare class c4 { } declare var i4: c4; declare var i4_c: typeof c4; -/** Class with statics*/ +/** Class with statistics*/ declare class c5 { static s1: number; } @@ -174,7 +174,7 @@ declare class c7 { } declare var i7: c7; declare var i7_c: typeof c7; -/** class with statics and constructor +/** class with statistics and constructor */ declare class c8 { /** s1 comment */ diff --git a/tests/baselines/reference/commentsClass(target=es2015).symbols b/tests/baselines/reference/commentsClass(target=es2015).symbols index c41e296482438..9160fc04f73dc 100644 --- a/tests/baselines/reference/commentsClass(target=es2015).symbols +++ b/tests/baselines/reference/commentsClass(target=es2015).symbols @@ -1,7 +1,7 @@ //// [tests/cases/compiler/commentsClass.ts] //// === commentsClass.ts === -/** This is class c2 without constuctor*/ +/** This is class c2 without constructor*/ class c2 { >c2 : Symbol(c2, Decl(commentsClass.ts, 0, 0)) @@ -45,7 +45,7 @@ var i4_c = c4; >i4_c : Symbol(i4_c, Decl(commentsClass.ts, 19, 3)) >c4 : Symbol(c4, Decl(commentsClass.ts, 11, 14)) -/** Class with statics*/ +/** Class with statistics*/ class c5 { >c5 : Symbol(c5, Decl(commentsClass.ts, 19, 14)) @@ -60,8 +60,8 @@ var i5_c = c5; >i5_c : Symbol(i5_c, Decl(commentsClass.ts, 25, 3)) >c5 : Symbol(c5, Decl(commentsClass.ts, 19, 14)) -/// class with statics and constructor -class c6 { /// class with statics and constructor2 +/// class with statistics and constructor +class c6 { /// class with statistics and constructor2 >c6 : Symbol(c6, Decl(commentsClass.ts, 25, 14)) /// s1 comment @@ -80,7 +80,7 @@ var i6_c = c6; >i6_c : Symbol(i6_c, Decl(commentsClass.ts, 36, 3)) >c6 : Symbol(c6, Decl(commentsClass.ts, 25, 14)) -// class with statics and constructor +// class with statistics and constructor class c7 { >c7 : Symbol(c7, Decl(commentsClass.ts, 36, 14)) @@ -100,7 +100,7 @@ var i7_c = c7; >i7_c : Symbol(i7_c, Decl(commentsClass.ts, 47, 3)) >c7 : Symbol(c7, Decl(commentsClass.ts, 36, 14)) -/** class with statics and constructor +/** class with statistics and constructor */ class c8 { >c8 : Symbol(c8, Decl(commentsClass.ts, 47, 14)) diff --git a/tests/baselines/reference/commentsClass(target=es2015).types b/tests/baselines/reference/commentsClass(target=es2015).types index 8d155a85f629c..b8112ac4acd21 100644 --- a/tests/baselines/reference/commentsClass(target=es2015).types +++ b/tests/baselines/reference/commentsClass(target=es2015).types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/commentsClass.ts] //// === commentsClass.ts === -/** This is class c2 without constuctor*/ +/** This is class c2 without constructor*/ class c2 { >c2 : c2 > : ^^ @@ -66,7 +66,7 @@ var i4_c = c4; >c4 : typeof c4 > : ^^^^^^^^^ -/** Class with statics*/ +/** Class with statistics*/ class c5 { >c5 : c5 > : ^^ @@ -89,8 +89,8 @@ var i5_c = c5; >c5 : typeof c5 > : ^^^^^^^^^ -/// class with statics and constructor -class c6 { /// class with statics and constructor2 +/// class with statistics and constructor +class c6 { /// class with statistics and constructor2 >c6 : c6 > : ^^ @@ -117,7 +117,7 @@ var i6_c = c6; >c6 : typeof c6 > : ^^^^^^^^^ -// class with statics and constructor +// class with statistics and constructor class c7 { >c7 : c7 > : ^^ @@ -145,7 +145,7 @@ var i7_c = c7; >c7 : typeof c7 > : ^^^^^^^^^ -/** class with statics and constructor +/** class with statistics and constructor */ class c8 { >c8 : c8 diff --git a/tests/baselines/reference/commentsClass(target=es5).errors.txt b/tests/baselines/reference/commentsClass(target=es5).errors.txt index 5a9cbf24c91b0..f74f301831603 100644 --- a/tests/baselines/reference/commentsClass(target=es5).errors.txt +++ b/tests/baselines/reference/commentsClass(target=es5).errors.txt @@ -3,7 +3,7 @@ error TS5107: Option 'target=ES5' is deprecated and will stop functioning in Typ !!! error TS5107: Option 'target=ES5' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error. ==== commentsClass.ts (0 errors) ==== - /** This is class c2 without constuctor*/ + /** This is class c2 without constructor*/ class c2 { } // trailing comment1 var i2 = new c2(); @@ -23,15 +23,15 @@ error TS5107: Option 'target=ES5' is deprecated and will stop functioning in Typ } var i4 = new c4(); var i4_c = c4; - /** Class with statics*/ + /** Class with statistics*/ class c5 { static s1: number; } var i5 = new c5(); var i5_c = c5; - /// class with statics and constructor - class c6 { /// class with statics and constructor2 + /// class with statistics and constructor + class c6 { /// class with statistics and constructor2 /// s1 comment static s1: number; /// s1 comment2 /// constructor comment @@ -41,7 +41,7 @@ error TS5107: Option 'target=ES5' is deprecated and will stop functioning in Typ var i6 = new c6(); var i6_c = c6; - // class with statics and constructor + // class with statistics and constructor class c7 { // s1 comment static s1: number; @@ -52,7 +52,7 @@ error TS5107: Option 'target=ES5' is deprecated and will stop functioning in Typ var i7 = new c7(); var i7_c = c7; - /** class with statics and constructor + /** class with statistics and constructor */ class c8 { /** s1 comment */ diff --git a/tests/baselines/reference/commentsClass(target=es5).js b/tests/baselines/reference/commentsClass(target=es5).js index 544ab8787e505..3791a8285d824 100644 --- a/tests/baselines/reference/commentsClass(target=es5).js +++ b/tests/baselines/reference/commentsClass(target=es5).js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/commentsClass.ts] //// //// [commentsClass.ts] -/** This is class c2 without constuctor*/ +/** This is class c2 without constructor*/ class c2 { } // trailing comment1 var i2 = new c2(); @@ -21,15 +21,15 @@ class c4 { } var i4 = new c4(); var i4_c = c4; -/** Class with statics*/ +/** Class with statistics*/ class c5 { static s1: number; } var i5 = new c5(); var i5_c = c5; -/// class with statics and constructor -class c6 { /// class with statics and constructor2 +/// class with statistics and constructor +class c6 { /// class with statistics and constructor2 /// s1 comment static s1: number; /// s1 comment2 /// constructor comment @@ -39,7 +39,7 @@ class c6 { /// class with statics and constructor2 var i6 = new c6(); var i6_c = c6; -// class with statics and constructor +// class with statistics and constructor class c7 { // s1 comment static s1: number; @@ -50,7 +50,7 @@ class c7 { var i7 = new c7(); var i7_c = c7; -/** class with statics and constructor +/** class with statistics and constructor */ class c8 { /** s1 comment */ @@ -76,7 +76,7 @@ class c9 { //// [commentsClass.js] "use strict"; -/** This is class c2 without constuctor*/ +/** This is class c2 without constructor*/ var c2 = /** @class */ (function () { function c2() { } @@ -101,7 +101,7 @@ var c4 = /** @class */ (function () { }()); var i4 = new c4(); var i4_c = c4; -/** Class with statics*/ +/** Class with statistics*/ var c5 = /** @class */ (function () { function c5() { } @@ -109,7 +109,7 @@ var c5 = /** @class */ (function () { }()); var i5 = new c5(); var i5_c = c5; -/// class with statics and constructor +/// class with statistics and constructor var c6 = /** @class */ (function () { /// constructor comment function c6() { @@ -118,7 +118,7 @@ var c6 = /** @class */ (function () { }()); var i6 = new c6(); var i6_c = c6; -// class with statics and constructor +// class with statistics and constructor var c7 = /** @class */ (function () { // constructor comment function c7() { @@ -127,7 +127,7 @@ var c7 = /** @class */ (function () { }()); var i7 = new c7(); var i7_c = c7; -/** class with statics and constructor +/** class with statistics and constructor */ var c8 = /** @class */ (function () { /** constructor comment @@ -150,7 +150,7 @@ var c9 = /** @class */ (function () { //// [commentsClass.d.ts] -/** This is class c2 without constuctor*/ +/** This is class c2 without constructor*/ declare class c2 { } declare var i2: c2; @@ -168,7 +168,7 @@ declare class c4 { } declare var i4: c4; declare var i4_c: typeof c4; -/** Class with statics*/ +/** Class with statistics*/ declare class c5 { static s1: number; } @@ -186,7 +186,7 @@ declare class c7 { } declare var i7: c7; declare var i7_c: typeof c7; -/** class with statics and constructor +/** class with statistics and constructor */ declare class c8 { /** s1 comment */ diff --git a/tests/baselines/reference/commentsClass(target=es5).symbols b/tests/baselines/reference/commentsClass(target=es5).symbols index c41e296482438..9160fc04f73dc 100644 --- a/tests/baselines/reference/commentsClass(target=es5).symbols +++ b/tests/baselines/reference/commentsClass(target=es5).symbols @@ -1,7 +1,7 @@ //// [tests/cases/compiler/commentsClass.ts] //// === commentsClass.ts === -/** This is class c2 without constuctor*/ +/** This is class c2 without constructor*/ class c2 { >c2 : Symbol(c2, Decl(commentsClass.ts, 0, 0)) @@ -45,7 +45,7 @@ var i4_c = c4; >i4_c : Symbol(i4_c, Decl(commentsClass.ts, 19, 3)) >c4 : Symbol(c4, Decl(commentsClass.ts, 11, 14)) -/** Class with statics*/ +/** Class with statistics*/ class c5 { >c5 : Symbol(c5, Decl(commentsClass.ts, 19, 14)) @@ -60,8 +60,8 @@ var i5_c = c5; >i5_c : Symbol(i5_c, Decl(commentsClass.ts, 25, 3)) >c5 : Symbol(c5, Decl(commentsClass.ts, 19, 14)) -/// class with statics and constructor -class c6 { /// class with statics and constructor2 +/// class with statistics and constructor +class c6 { /// class with statistics and constructor2 >c6 : Symbol(c6, Decl(commentsClass.ts, 25, 14)) /// s1 comment @@ -80,7 +80,7 @@ var i6_c = c6; >i6_c : Symbol(i6_c, Decl(commentsClass.ts, 36, 3)) >c6 : Symbol(c6, Decl(commentsClass.ts, 25, 14)) -// class with statics and constructor +// class with statistics and constructor class c7 { >c7 : Symbol(c7, Decl(commentsClass.ts, 36, 14)) @@ -100,7 +100,7 @@ var i7_c = c7; >i7_c : Symbol(i7_c, Decl(commentsClass.ts, 47, 3)) >c7 : Symbol(c7, Decl(commentsClass.ts, 36, 14)) -/** class with statics and constructor +/** class with statistics and constructor */ class c8 { >c8 : Symbol(c8, Decl(commentsClass.ts, 47, 14)) diff --git a/tests/baselines/reference/commentsClass(target=es5).types b/tests/baselines/reference/commentsClass(target=es5).types index 8d155a85f629c..b8112ac4acd21 100644 --- a/tests/baselines/reference/commentsClass(target=es5).types +++ b/tests/baselines/reference/commentsClass(target=es5).types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/commentsClass.ts] //// === commentsClass.ts === -/** This is class c2 without constuctor*/ +/** This is class c2 without constructor*/ class c2 { >c2 : c2 > : ^^ @@ -66,7 +66,7 @@ var i4_c = c4; >c4 : typeof c4 > : ^^^^^^^^^ -/** Class with statics*/ +/** Class with statistics*/ class c5 { >c5 : c5 > : ^^ @@ -89,8 +89,8 @@ var i5_c = c5; >c5 : typeof c5 > : ^^^^^^^^^ -/// class with statics and constructor -class c6 { /// class with statics and constructor2 +/// class with statistics and constructor +class c6 { /// class with statistics and constructor2 >c6 : c6 > : ^^ @@ -117,7 +117,7 @@ var i6_c = c6; >c6 : typeof c6 > : ^^^^^^^^^ -// class with statics and constructor +// class with statistics and constructor class c7 { >c7 : c7 > : ^^ @@ -145,7 +145,7 @@ var i7_c = c7; >c7 : typeof c7 > : ^^^^^^^^^ -/** class with statics and constructor +/** class with statistics and constructor */ class c8 { >c8 : c8 diff --git a/tests/baselines/reference/commentsCommentParsing(target=es2015).js b/tests/baselines/reference/commentsCommentParsing(target=es2015).js index d398fea166bcc..e0b64ebe8611b 100644 --- a/tests/baselines/reference/commentsCommentParsing(target=es2015).js +++ b/tests/baselines/reference/commentsCommentParsing(target=es2015).js @@ -30,7 +30,7 @@ jsDocMultiLine(); /** this is multiple line jsdoc stule comment *New line1 *New Line2*/ -/** Shoul mege this line as well +/** Shoul merge this line as well * and this too*/ /** Another this one too*/ function jsDocMultiLineMerge() { } @@ -180,7 +180,7 @@ jsDocMultiLine(); /** this is multiple line jsdoc stule comment *New line1 *New Line2*/ -/** Shoul mege this line as well +/** Shoul merge this line as well * and this too*/ /** Another this one too*/ function jsDocMultiLineMerge() { } @@ -302,7 +302,7 @@ declare function jsDocMultiLine(): void; /** this is multiple line jsdoc stule comment *New line1 *New Line2*/ -/** Shoul mege this line as well +/** Shoul merge this line as well * and this too*/ /** Another this one too*/ declare function jsDocMultiLineMerge(): void; /** jsdoc comment */ diff --git a/tests/baselines/reference/commentsCommentParsing(target=es2015).symbols b/tests/baselines/reference/commentsCommentParsing(target=es2015).symbols index f94664c82b60d..36d8ae1b7b0e2 100644 --- a/tests/baselines/reference/commentsCommentParsing(target=es2015).symbols +++ b/tests/baselines/reference/commentsCommentParsing(target=es2015).symbols @@ -38,7 +38,7 @@ jsDocMultiLine(); /** this is multiple line jsdoc stule comment *New line1 *New Line2*/ -/** Shoul mege this line as well +/** Shoul merge this line as well * and this too*/ /** Another this one too*/ function jsDocMultiLineMerge() { >jsDocMultiLineMerge : Symbol(jsDocMultiLineMerge, Decl(commentsCommentParsing.ts, 24, 17)) diff --git a/tests/baselines/reference/commentsCommentParsing(target=es2015).types b/tests/baselines/reference/commentsCommentParsing(target=es2015).types index 38ec3cb4e8d91..4edc87b7b745c 100644 --- a/tests/baselines/reference/commentsCommentParsing(target=es2015).types +++ b/tests/baselines/reference/commentsCommentParsing(target=es2015).types @@ -54,7 +54,7 @@ jsDocMultiLine(); /** this is multiple line jsdoc stule comment *New line1 *New Line2*/ -/** Shoul mege this line as well +/** Shoul merge this line as well * and this too*/ /** Another this one too*/ function jsDocMultiLineMerge() { >jsDocMultiLineMerge : () => void diff --git a/tests/baselines/reference/commentsCommentParsing(target=es5).errors.txt b/tests/baselines/reference/commentsCommentParsing(target=es5).errors.txt index 734a6cb8102d8..dc39f5c07c28d 100644 --- a/tests/baselines/reference/commentsCommentParsing(target=es5).errors.txt +++ b/tests/baselines/reference/commentsCommentParsing(target=es5).errors.txt @@ -32,7 +32,7 @@ error TS5107: Option 'target=ES5' is deprecated and will stop functioning in Typ /** this is multiple line jsdoc stule comment *New line1 *New Line2*/ - /** Shoul mege this line as well + /** Shoul merge this line as well * and this too*/ /** Another this one too*/ function jsDocMultiLineMerge() { } diff --git a/tests/baselines/reference/commentsCommentParsing(target=es5).js b/tests/baselines/reference/commentsCommentParsing(target=es5).js index 7ecc49bffd1e5..3ed134f5c84d8 100644 --- a/tests/baselines/reference/commentsCommentParsing(target=es5).js +++ b/tests/baselines/reference/commentsCommentParsing(target=es5).js @@ -30,7 +30,7 @@ jsDocMultiLine(); /** this is multiple line jsdoc stule comment *New line1 *New Line2*/ -/** Shoul mege this line as well +/** Shoul merge this line as well * and this too*/ /** Another this one too*/ function jsDocMultiLineMerge() { } @@ -180,7 +180,7 @@ jsDocMultiLine(); /** this is multiple line jsdoc stule comment *New line1 *New Line2*/ -/** Shoul mege this line as well +/** Shoul merge this line as well * and this too*/ /** Another this one too*/ function jsDocMultiLineMerge() { } @@ -305,7 +305,7 @@ declare function jsDocMultiLine(): void; /** this is multiple line jsdoc stule comment *New line1 *New Line2*/ -/** Shoul mege this line as well +/** Shoul merge this line as well * and this too*/ /** Another this one too*/ declare function jsDocMultiLineMerge(): void; /** jsdoc comment */ diff --git a/tests/baselines/reference/commentsCommentParsing(target=es5).symbols b/tests/baselines/reference/commentsCommentParsing(target=es5).symbols index f94664c82b60d..36d8ae1b7b0e2 100644 --- a/tests/baselines/reference/commentsCommentParsing(target=es5).symbols +++ b/tests/baselines/reference/commentsCommentParsing(target=es5).symbols @@ -38,7 +38,7 @@ jsDocMultiLine(); /** this is multiple line jsdoc stule comment *New line1 *New Line2*/ -/** Shoul mege this line as well +/** Shoul merge this line as well * and this too*/ /** Another this one too*/ function jsDocMultiLineMerge() { >jsDocMultiLineMerge : Symbol(jsDocMultiLineMerge, Decl(commentsCommentParsing.ts, 24, 17)) diff --git a/tests/baselines/reference/commentsCommentParsing(target=es5).types b/tests/baselines/reference/commentsCommentParsing(target=es5).types index 3780bfb75b1fb..5d64b32b1cccf 100644 --- a/tests/baselines/reference/commentsCommentParsing(target=es5).types +++ b/tests/baselines/reference/commentsCommentParsing(target=es5).types @@ -54,7 +54,7 @@ jsDocMultiLine(); /** this is multiple line jsdoc stule comment *New line1 *New Line2*/ -/** Shoul mege this line as well +/** Shoul merge this line as well * and this too*/ /** Another this one too*/ function jsDocMultiLineMerge() { >jsDocMultiLineMerge : () => void diff --git a/tests/baselines/reference/commentsInterface(target=es2015).js b/tests/baselines/reference/commentsInterface(target=es2015).js index 9f495ef26171f..9bed8ed622734 100644 --- a/tests/baselines/reference/commentsInterface(target=es2015).js +++ b/tests/baselines/reference/commentsInterface(target=es2015).js @@ -8,7 +8,7 @@ var i1_i: i1; interface nc_i1 { } var nc_i1_i: nc_i1; -/** this is interface 2 with memebers*/ +/** this is interface 2 with members*/ interface i2 { /** this is x*/ x: number; @@ -114,7 +114,7 @@ declare var i1_i: i1; interface nc_i1 { } declare var nc_i1_i: nc_i1; -/** this is interface 2 with memebers*/ +/** this is interface 2 with members*/ interface i2 { /** this is x*/ x: number; diff --git a/tests/baselines/reference/commentsInterface(target=es2015).symbols b/tests/baselines/reference/commentsInterface(target=es2015).symbols index 3a4b31d6a8edd..539a1a96a5c37 100644 --- a/tests/baselines/reference/commentsInterface(target=es2015).symbols +++ b/tests/baselines/reference/commentsInterface(target=es2015).symbols @@ -16,7 +16,7 @@ var nc_i1_i: nc_i1; >nc_i1_i : Symbol(nc_i1_i, Decl(commentsInterface.ts, 6, 3)) >nc_i1 : Symbol(nc_i1, Decl(commentsInterface.ts, 3, 13)) -/** this is interface 2 with memebers*/ +/** this is interface 2 with members*/ interface i2 { >i2 : Symbol(i2, Decl(commentsInterface.ts, 6, 19)) diff --git a/tests/baselines/reference/commentsInterface(target=es2015).types b/tests/baselines/reference/commentsInterface(target=es2015).types index 740c812054b8b..9b1d90da8186f 100644 --- a/tests/baselines/reference/commentsInterface(target=es2015).types +++ b/tests/baselines/reference/commentsInterface(target=es2015).types @@ -14,7 +14,7 @@ var nc_i1_i: nc_i1; >nc_i1_i : nc_i1 > : ^^^^^ -/** this is interface 2 with memebers*/ +/** this is interface 2 with members*/ interface i2 { /** this is x*/ x: number; diff --git a/tests/baselines/reference/commentsInterface(target=es5).errors.txt b/tests/baselines/reference/commentsInterface(target=es5).errors.txt index 4fdaf66dc6850..ad272b2436a83 100644 --- a/tests/baselines/reference/commentsInterface(target=es5).errors.txt +++ b/tests/baselines/reference/commentsInterface(target=es5).errors.txt @@ -10,7 +10,7 @@ error TS5107: Option 'target=ES5' is deprecated and will stop functioning in Typ interface nc_i1 { } var nc_i1_i: nc_i1; - /** this is interface 2 with memebers*/ + /** this is interface 2 with members*/ interface i2 { /** this is x*/ x: number; diff --git a/tests/baselines/reference/commentsInterface(target=es5).js b/tests/baselines/reference/commentsInterface(target=es5).js index 48aa5d370eeea..d58d25bca105c 100644 --- a/tests/baselines/reference/commentsInterface(target=es5).js +++ b/tests/baselines/reference/commentsInterface(target=es5).js @@ -8,7 +8,7 @@ var i1_i: i1; interface nc_i1 { } var nc_i1_i: nc_i1; -/** this is interface 2 with memebers*/ +/** this is interface 2 with members*/ interface i2 { /** this is x*/ x: number; @@ -114,7 +114,7 @@ declare var i1_i: i1; interface nc_i1 { } declare var nc_i1_i: nc_i1; -/** this is interface 2 with memebers*/ +/** this is interface 2 with members*/ interface i2 { /** this is x*/ x: number; diff --git a/tests/baselines/reference/commentsInterface(target=es5).symbols b/tests/baselines/reference/commentsInterface(target=es5).symbols index 3a4b31d6a8edd..539a1a96a5c37 100644 --- a/tests/baselines/reference/commentsInterface(target=es5).symbols +++ b/tests/baselines/reference/commentsInterface(target=es5).symbols @@ -16,7 +16,7 @@ var nc_i1_i: nc_i1; >nc_i1_i : Symbol(nc_i1_i, Decl(commentsInterface.ts, 6, 3)) >nc_i1 : Symbol(nc_i1, Decl(commentsInterface.ts, 3, 13)) -/** this is interface 2 with memebers*/ +/** this is interface 2 with members*/ interface i2 { >i2 : Symbol(i2, Decl(commentsInterface.ts, 6, 19)) diff --git a/tests/baselines/reference/commentsInterface(target=es5).types b/tests/baselines/reference/commentsInterface(target=es5).types index d669596b01f59..10e1dce2bbfea 100644 --- a/tests/baselines/reference/commentsInterface(target=es5).types +++ b/tests/baselines/reference/commentsInterface(target=es5).types @@ -14,7 +14,7 @@ var nc_i1_i: nc_i1; >nc_i1_i : nc_i1 > : ^^^^^ -/** this is interface 2 with memebers*/ +/** this is interface 2 with members*/ interface i2 { /** this is x*/ x: number; diff --git a/tests/baselines/reference/commentsOverloads(target=es2015).js b/tests/baselines/reference/commentsOverloads(target=es2015).js index fcc9b8e028920..c0d42d2f7aacf 100644 --- a/tests/baselines/reference/commentsOverloads(target=es2015).js +++ b/tests/baselines/reference/commentsOverloads(target=es2015).js @@ -118,7 +118,7 @@ class c { public prop5(a: number): number; /** prop5 2*/ public prop5(b: string): number; - /** Prop5 implementaion*/ + /** Prop5 implementation*/ public prop5(aorb: any) { return 10; } @@ -215,7 +215,7 @@ class c { prop4(aorb) { return 10; } - /** Prop5 implementaion*/ + /** Prop5 implementation*/ prop5(aorb) { return 10; } diff --git a/tests/baselines/reference/commentsOverloads(target=es2015).symbols b/tests/baselines/reference/commentsOverloads(target=es2015).symbols index 555612c980a57..27e5ebaef2f04 100644 --- a/tests/baselines/reference/commentsOverloads(target=es2015).symbols +++ b/tests/baselines/reference/commentsOverloads(target=es2015).symbols @@ -291,7 +291,7 @@ class c { >prop5 : Symbol(c.prop5, Decl(commentsOverloads.ts, 112, 5), Decl(commentsOverloads.ts, 114, 36), Decl(commentsOverloads.ts, 116, 36)) >b : Symbol(b, Decl(commentsOverloads.ts, 116, 17)) - /** Prop5 implementaion*/ + /** Prop5 implementation*/ public prop5(aorb: any) { >prop5 : Symbol(c.prop5, Decl(commentsOverloads.ts, 112, 5), Decl(commentsOverloads.ts, 114, 36), Decl(commentsOverloads.ts, 116, 36)) >aorb : Symbol(aorb, Decl(commentsOverloads.ts, 118, 17)) diff --git a/tests/baselines/reference/commentsOverloads(target=es2015).types b/tests/baselines/reference/commentsOverloads(target=es2015).types index 2ab32c9fb47df..56cdff81e07e1 100644 --- a/tests/baselines/reference/commentsOverloads(target=es2015).types +++ b/tests/baselines/reference/commentsOverloads(target=es2015).types @@ -421,7 +421,7 @@ class c { >b : string > : ^^^^^^ - /** Prop5 implementaion*/ + /** Prop5 implementation*/ public prop5(aorb: any) { >prop5 : { (a: number): number; (b: string): number; } > : ^^^ ^^ ^^^ ^^^ ^^ ^^^ ^^^ diff --git a/tests/baselines/reference/commentsOverloads(target=es5).errors.txt b/tests/baselines/reference/commentsOverloads(target=es5).errors.txt index aa04357c6a9af..44052094d2953 100644 --- a/tests/baselines/reference/commentsOverloads(target=es5).errors.txt +++ b/tests/baselines/reference/commentsOverloads(target=es5).errors.txt @@ -120,7 +120,7 @@ error TS5107: Option 'target=ES5' is deprecated and will stop functioning in Typ public prop5(a: number): number; /** prop5 2*/ public prop5(b: string): number; - /** Prop5 implementaion*/ + /** Prop5 implementation*/ public prop5(aorb: any) { return 10; } diff --git a/tests/baselines/reference/commentsOverloads(target=es5).js b/tests/baselines/reference/commentsOverloads(target=es5).js index fecff552d39e3..64b469fa292c9 100644 --- a/tests/baselines/reference/commentsOverloads(target=es5).js +++ b/tests/baselines/reference/commentsOverloads(target=es5).js @@ -118,7 +118,7 @@ class c { public prop5(a: number): number; /** prop5 2*/ public prop5(b: string): number; - /** Prop5 implementaion*/ + /** Prop5 implementation*/ public prop5(aorb: any) { return 10; } @@ -217,7 +217,7 @@ var c = /** @class */ (function () { c.prototype.prop4 = function (aorb) { return 10; }; - /** Prop5 implementaion*/ + /** Prop5 implementation*/ c.prototype.prop5 = function (aorb) { return 10; }; diff --git a/tests/baselines/reference/commentsOverloads(target=es5).symbols b/tests/baselines/reference/commentsOverloads(target=es5).symbols index 555612c980a57..27e5ebaef2f04 100644 --- a/tests/baselines/reference/commentsOverloads(target=es5).symbols +++ b/tests/baselines/reference/commentsOverloads(target=es5).symbols @@ -291,7 +291,7 @@ class c { >prop5 : Symbol(c.prop5, Decl(commentsOverloads.ts, 112, 5), Decl(commentsOverloads.ts, 114, 36), Decl(commentsOverloads.ts, 116, 36)) >b : Symbol(b, Decl(commentsOverloads.ts, 116, 17)) - /** Prop5 implementaion*/ + /** Prop5 implementation*/ public prop5(aorb: any) { >prop5 : Symbol(c.prop5, Decl(commentsOverloads.ts, 112, 5), Decl(commentsOverloads.ts, 114, 36), Decl(commentsOverloads.ts, 116, 36)) >aorb : Symbol(aorb, Decl(commentsOverloads.ts, 118, 17)) diff --git a/tests/baselines/reference/commentsOverloads(target=es5).types b/tests/baselines/reference/commentsOverloads(target=es5).types index de9a87e6279c1..c7ed6f11d79ef 100644 --- a/tests/baselines/reference/commentsOverloads(target=es5).types +++ b/tests/baselines/reference/commentsOverloads(target=es5).types @@ -430,7 +430,7 @@ class c { >b : string > : ^^^^^^ - /** Prop5 implementaion*/ + /** Prop5 implementation*/ public prop5(aorb: any) { >prop5 : { (a: number): number; (b: string): number; } > : ^^^ ^^ ^^^ ^^^ ^^ ^^^ ^^^ diff --git a/tests/baselines/reference/commentsVarDecl(target=es2015).errors.txt b/tests/baselines/reference/commentsVarDecl(target=es2015).errors.txt index 933b883b04768..e49881bed5bb6 100644 --- a/tests/baselines/reference/commentsVarDecl(target=es2015).errors.txt +++ b/tests/baselines/reference/commentsVarDecl(target=es2015).errors.txt @@ -21,7 +21,7 @@ commentsVarDecl.ts(42,6): error TS2454: Variable 'z2' is used before being assig /** comment line 2*/ var x = 70; /* multiline trailing comment this is multiline trailing comment */ - /** Triple slash comment on the assignment shouldnt be in .d.ts file*/ + /** Triple slash comment on the assignment shouldn't be in .d.ts file*/ x = myVariable; /** triple slash comment1*/ diff --git a/tests/baselines/reference/commentsVarDecl(target=es2015).js b/tests/baselines/reference/commentsVarDecl(target=es2015).js index a45ca80658c6b..5f2a3027f4323 100644 --- a/tests/baselines/reference/commentsVarDecl(target=es2015).js +++ b/tests/baselines/reference/commentsVarDecl(target=es2015).js @@ -19,7 +19,7 @@ var anotherAnotherVariable = 70; /* these are multiple trailing comments */ /* m /** comment line 2*/ var x = 70; /* multiline trailing comment this is multiline trailing comment */ -/** Triple slash comment on the assignment shouldnt be in .d.ts file*/ +/** Triple slash comment on the assignment shouldn't be in .d.ts file*/ x = myVariable; /** triple slash comment1*/ @@ -60,7 +60,7 @@ var anotherAnotherVariable = 70; /* these are multiple trailing comments */ /* m /** comment line 2*/ var x = 70; /* multiline trailing comment this is multiline trailing comment */ -/** Triple slash comment on the assignment shouldnt be in .d.ts file*/ +/** Triple slash comment on the assignment shouldn't be in .d.ts file*/ x = myVariable; /** triple slash comment1*/ /** jsdocstyle comment - only this comment should be in .d.ts file*/ diff --git a/tests/baselines/reference/commentsVarDecl(target=es2015).symbols b/tests/baselines/reference/commentsVarDecl(target=es2015).symbols index e98d2bff6feb6..ea63854408c33 100644 --- a/tests/baselines/reference/commentsVarDecl(target=es2015).symbols +++ b/tests/baselines/reference/commentsVarDecl(target=es2015).symbols @@ -25,7 +25,7 @@ var x = 70; /* multiline trailing comment >x : Symbol(x, Decl(commentsVarDecl.ts, 16, 3)) this is multiline trailing comment */ -/** Triple slash comment on the assignment shouldnt be in .d.ts file*/ +/** Triple slash comment on the assignment shouldn't be in .d.ts file*/ x = myVariable; >x : Symbol(x, Decl(commentsVarDecl.ts, 16, 3)) >myVariable : Symbol(myVariable, Decl(commentsVarDecl.ts, 1, 3)) diff --git a/tests/baselines/reference/commentsVarDecl(target=es2015).types b/tests/baselines/reference/commentsVarDecl(target=es2015).types index 08ddb0338d20e..7919ec2c754bf 100644 --- a/tests/baselines/reference/commentsVarDecl(target=es2015).types +++ b/tests/baselines/reference/commentsVarDecl(target=es2015).types @@ -40,7 +40,7 @@ var x = 70; /* multiline trailing comment > : ^^ this is multiline trailing comment */ -/** Triple slash comment on the assignment shouldnt be in .d.ts file*/ +/** Triple slash comment on the assignment shouldn't be in .d.ts file*/ x = myVariable; >x = myVariable : number > : ^^^^^^ diff --git a/tests/baselines/reference/commentsVarDecl(target=es5).errors.txt b/tests/baselines/reference/commentsVarDecl(target=es5).errors.txt index 7aaaef956eb59..30a60fb9c283f 100644 --- a/tests/baselines/reference/commentsVarDecl(target=es5).errors.txt +++ b/tests/baselines/reference/commentsVarDecl(target=es5).errors.txt @@ -23,7 +23,7 @@ commentsVarDecl.ts(42,6): error TS2454: Variable 'z2' is used before being assig /** comment line 2*/ var x = 70; /* multiline trailing comment this is multiline trailing comment */ - /** Triple slash comment on the assignment shouldnt be in .d.ts file*/ + /** Triple slash comment on the assignment shouldn't be in .d.ts file*/ x = myVariable; /** triple slash comment1*/ diff --git a/tests/baselines/reference/commentsVarDecl(target=es5).js b/tests/baselines/reference/commentsVarDecl(target=es5).js index 36a2305c0a1ba..576df744efe39 100644 --- a/tests/baselines/reference/commentsVarDecl(target=es5).js +++ b/tests/baselines/reference/commentsVarDecl(target=es5).js @@ -19,7 +19,7 @@ var anotherAnotherVariable = 70; /* these are multiple trailing comments */ /* m /** comment line 2*/ var x = 70; /* multiline trailing comment this is multiline trailing comment */ -/** Triple slash comment on the assignment shouldnt be in .d.ts file*/ +/** Triple slash comment on the assignment shouldn't be in .d.ts file*/ x = myVariable; /** triple slash comment1*/ @@ -60,7 +60,7 @@ var anotherAnotherVariable = 70; /* these are multiple trailing comments */ /* m /** comment line 2*/ var x = 70; /* multiline trailing comment this is multiline trailing comment */ -/** Triple slash comment on the assignment shouldnt be in .d.ts file*/ +/** Triple slash comment on the assignment shouldn't be in .d.ts file*/ x = myVariable; /** triple slash comment1*/ /** jsdocstyle comment - only this comment should be in .d.ts file*/ diff --git a/tests/baselines/reference/commentsVarDecl(target=es5).symbols b/tests/baselines/reference/commentsVarDecl(target=es5).symbols index e98d2bff6feb6..ea63854408c33 100644 --- a/tests/baselines/reference/commentsVarDecl(target=es5).symbols +++ b/tests/baselines/reference/commentsVarDecl(target=es5).symbols @@ -25,7 +25,7 @@ var x = 70; /* multiline trailing comment >x : Symbol(x, Decl(commentsVarDecl.ts, 16, 3)) this is multiline trailing comment */ -/** Triple slash comment on the assignment shouldnt be in .d.ts file*/ +/** Triple slash comment on the assignment shouldn't be in .d.ts file*/ x = myVariable; >x : Symbol(x, Decl(commentsVarDecl.ts, 16, 3)) >myVariable : Symbol(myVariable, Decl(commentsVarDecl.ts, 1, 3)) diff --git a/tests/baselines/reference/commentsVarDecl(target=es5).types b/tests/baselines/reference/commentsVarDecl(target=es5).types index 08ddb0338d20e..7919ec2c754bf 100644 --- a/tests/baselines/reference/commentsVarDecl(target=es5).types +++ b/tests/baselines/reference/commentsVarDecl(target=es5).types @@ -40,7 +40,7 @@ var x = 70; /* multiline trailing comment > : ^^ this is multiline trailing comment */ -/** Triple slash comment on the assignment shouldnt be in .d.ts file*/ +/** Triple slash comment on the assignment shouldn't be in .d.ts file*/ x = myVariable; >x = myVariable : number > : ^^^^^^ diff --git a/tests/baselines/reference/completionsCommentsClass.baseline b/tests/baselines/reference/completionsCommentsClass.baseline index f34ffa6886aac..1bc3393cdd84e 100644 --- a/tests/baselines/reference/completionsCommentsClass.baseline +++ b/tests/baselines/reference/completionsCommentsClass.baseline @@ -20,13 +20,13 @@ // } // var i4 = new c4(); // var i4_c = c4; -// /** Class with statics*/ +// /** Class with statistics*/ // class c5 { // static s1: number; // } // var i5 = new c5(); // var i5_c = c5; -// /** class with statics and constructor*/ +// /** class with statistics and constructor*/ // class c6 { // /** s1 comment*/ // static s1: number; @@ -344,7 +344,7 @@ ], "documentation": [ { - "text": "Class with statics", + "text": "Class with statistics", "kind": "text" } ] @@ -370,7 +370,7 @@ ], "documentation": [ { - "text": "class with statics and constructor", + "text": "class with statistics and constructor", "kind": "text" } ] diff --git a/tests/baselines/reference/completionsCommentsCommentParsing.baseline b/tests/baselines/reference/completionsCommentsCommentParsing.baseline index 3869899430dcc..defa6c63ed079 100644 --- a/tests/baselines/reference/completionsCommentsCommentParsing.baseline +++ b/tests/baselines/reference/completionsCommentsCommentParsing.baseline @@ -29,7 +29,7 @@ // /** multiple line jsdoc comments no longer merge // *New line1 // *New Line2*/ -// /** Shoul mege this line as well +// /** Shoul merge this line as well // * and this too*/ /** Another this one too*/ // function jsDocMultiLineMerge() { // } @@ -1149,7 +1149,7 @@ // * spanning on two lines and aligned perfectly // * @param b this is info about b // * spanning on two lines and aligned perfectly -// * spanning one more line alined perfectly +// * spanning one more line aligned perfectly // * spanning another line with more margin // * @param c this is info about b // * not aligned text about parameter will eat only one space @@ -2110,7 +2110,7 @@ "kind": "space" }, { - "text": "this is info about b\nspanning on two lines and aligned perfectly\nspanning one more line alined perfectly\n spanning another line with more margin", + "text": "this is info about b\nspanning on two lines and aligned perfectly\nspanning one more line aligned perfectly\n spanning another line with more margin", "kind": "text" } ] @@ -8068,7 +8068,7 @@ "kind": "space" }, { - "text": "this is info about b\nspanning on two lines and aligned perfectly\nspanning one more line alined perfectly\n spanning another line with more margin", + "text": "this is info about b\nspanning on two lines and aligned perfectly\nspanning one more line aligned perfectly\n spanning another line with more margin", "kind": "text" } ] @@ -15075,7 +15075,7 @@ "kind": "space" }, { - "text": "this is info about b\nspanning on two lines and aligned perfectly\nspanning one more line alined perfectly\n spanning another line with more margin", + "text": "this is info about b\nspanning on two lines and aligned perfectly\nspanning one more line aligned perfectly\n spanning another line with more margin", "kind": "text" } ] @@ -21094,7 +21094,7 @@ "kind": "space" }, { - "text": "this is info about b\nspanning on two lines and aligned perfectly\nspanning one more line alined perfectly\n spanning another line with more margin", + "text": "this is info about b\nspanning on two lines and aligned perfectly\nspanning one more line aligned perfectly\n spanning another line with more margin", "kind": "text" } ] @@ -27534,7 +27534,7 @@ "kind": "space" }, { - "text": "this is info about b\nspanning on two lines and aligned perfectly\nspanning one more line alined perfectly\n spanning another line with more margin", + "text": "this is info about b\nspanning on two lines and aligned perfectly\nspanning one more line aligned perfectly\n spanning another line with more margin", "kind": "text" } ] @@ -33492,7 +33492,7 @@ "kind": "space" }, { - "text": "this is info about b\nspanning on two lines and aligned perfectly\nspanning one more line alined perfectly\n spanning another line with more margin", + "text": "this is info about b\nspanning on two lines and aligned perfectly\nspanning one more line aligned perfectly\n spanning another line with more margin", "kind": "text" } ] @@ -40413,7 +40413,7 @@ "kind": "space" }, { - "text": "this is info about b\nspanning on two lines and aligned perfectly\nspanning one more line alined perfectly\n spanning another line with more margin", + "text": "this is info about b\nspanning on two lines and aligned perfectly\nspanning one more line aligned perfectly\n spanning another line with more margin", "kind": "text" } ] diff --git a/tests/baselines/reference/complicatedIndexedAccessKeyofReliesOnKeyofNeverUpperBound.errors.txt b/tests/baselines/reference/complicatedIndexedAccessKeyofReliesOnKeyofNeverUpperBound.errors.txt index 0ee31ce889f0b..fa8a502f31237 100644 --- a/tests/baselines/reference/complicatedIndexedAccessKeyofReliesOnKeyofNeverUpperBound.errors.txt +++ b/tests/baselines/reference/complicatedIndexedAccessKeyofReliesOnKeyofNeverUpperBound.errors.txt @@ -34,7 +34,7 @@ complicatedIndexedAccessKeyofReliesOnKeyofNeverUpperBound.ts(33,5): error TS2322 interface EmailChannel { id: string; type: 'email'; - addres: string; + address: string; } type Channel = TextChannel | EmailChannel; diff --git a/tests/baselines/reference/complicatedIndexedAccessKeyofReliesOnKeyofNeverUpperBound.js b/tests/baselines/reference/complicatedIndexedAccessKeyofReliesOnKeyofNeverUpperBound.js index f22221b3993b8..428b6c2564d34 100644 --- a/tests/baselines/reference/complicatedIndexedAccessKeyofReliesOnKeyofNeverUpperBound.js +++ b/tests/baselines/reference/complicatedIndexedAccessKeyofReliesOnKeyofNeverUpperBound.js @@ -10,7 +10,7 @@ interface TextChannel { interface EmailChannel { id: string; type: 'email'; - addres: string; + address: string; } type Channel = TextChannel | EmailChannel; diff --git a/tests/baselines/reference/complicatedIndexedAccessKeyofReliesOnKeyofNeverUpperBound.symbols b/tests/baselines/reference/complicatedIndexedAccessKeyofReliesOnKeyofNeverUpperBound.symbols index e1e1765ebd8bc..3b6f307db65fd 100644 --- a/tests/baselines/reference/complicatedIndexedAccessKeyofReliesOnKeyofNeverUpperBound.symbols +++ b/tests/baselines/reference/complicatedIndexedAccessKeyofReliesOnKeyofNeverUpperBound.symbols @@ -23,8 +23,8 @@ interface EmailChannel { type: 'email'; >type : Symbol(EmailChannel.type, Decl(complicatedIndexedAccessKeyofReliesOnKeyofNeverUpperBound.ts, 7, 15)) - addres: string; ->addres : Symbol(EmailChannel.addres, Decl(complicatedIndexedAccessKeyofReliesOnKeyofNeverUpperBound.ts, 8, 18)) + address: string; +>address : Symbol(EmailChannel.address, Decl(complicatedIndexedAccessKeyofReliesOnKeyofNeverUpperBound.ts, 8, 18)) } type Channel = TextChannel | EmailChannel; diff --git a/tests/baselines/reference/complicatedIndexedAccessKeyofReliesOnKeyofNeverUpperBound.types b/tests/baselines/reference/complicatedIndexedAccessKeyofReliesOnKeyofNeverUpperBound.types index 75cf0e8dbb3c5..6b4f56aed9a31 100644 --- a/tests/baselines/reference/complicatedIndexedAccessKeyofReliesOnKeyofNeverUpperBound.types +++ b/tests/baselines/reference/complicatedIndexedAccessKeyofReliesOnKeyofNeverUpperBound.types @@ -24,8 +24,8 @@ interface EmailChannel { >type : "email" > : ^^^^^^^ - addres: string; ->addres : string + address: string; +>address : string > : ^^^^^^ } diff --git a/tests/baselines/reference/compoundAssignmentLHSIsValue.errors.txt b/tests/baselines/reference/compoundAssignmentLHSIsValue.errors.txt index 329b9a26d48e3..3c0e9b14c61ac 100644 --- a/tests/baselines/reference/compoundAssignmentLHSIsValue.errors.txt +++ b/tests/baselines/reference/compoundAssignmentLHSIsValue.errors.txt @@ -264,7 +264,7 @@ compoundAssignmentLHSIsValue.ts(122,1): error TS2364: The left-hand side of an a ~~~~~ !!! error TS2364: The left-hand side of an assignment expression must be a variable or a property access. - // parentheses, the containted expression is value + // parentheses, the contained expression is value (this) *= value; ~~~~~~ !!! error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number', 'bigint' or an enum type. diff --git a/tests/baselines/reference/compoundAssignmentLHSIsValue.js b/tests/baselines/reference/compoundAssignmentLHSIsValue.js index 042bc14865bf0..8d7eb0aa6a369 100644 --- a/tests/baselines/reference/compoundAssignmentLHSIsValue.js +++ b/tests/baselines/reference/compoundAssignmentLHSIsValue.js @@ -94,7 +94,7 @@ function bar2() { } += value; foo() *= value; foo() += value; -// parentheses, the containted expression is value +// parentheses, the contained expression is value (this) *= value; (this) += value; (M) *= value; @@ -217,7 +217,7 @@ value; // function calls foo() *= value; foo() += value; -// parentheses, the containted expression is value +// parentheses, the contained expression is value (this) *= value; (this) += value; (M) *= value; diff --git a/tests/baselines/reference/compoundAssignmentLHSIsValue.symbols b/tests/baselines/reference/compoundAssignmentLHSIsValue.symbols index b3b3984a317d6..c6d36fb61ee40 100644 --- a/tests/baselines/reference/compoundAssignmentLHSIsValue.symbols +++ b/tests/baselines/reference/compoundAssignmentLHSIsValue.symbols @@ -218,7 +218,7 @@ foo() += value; >foo : Symbol(foo, Decl(compoundAssignmentLHSIsValue.ts, 17, 1)) >value : Symbol(value, Decl(compoundAssignmentLHSIsValue.ts, 1, 3)) -// parentheses, the containted expression is value +// parentheses, the contained expression is value (this) *= value; >this : Symbol(globalThis) >value : Symbol(value, Decl(compoundAssignmentLHSIsValue.ts, 1, 3)) diff --git a/tests/baselines/reference/compoundAssignmentLHSIsValue.types b/tests/baselines/reference/compoundAssignmentLHSIsValue.types index f0af86d23bd28..9d2bf4a80b257 100644 --- a/tests/baselines/reference/compoundAssignmentLHSIsValue.types +++ b/tests/baselines/reference/compoundAssignmentLHSIsValue.types @@ -461,7 +461,7 @@ foo() += value; >value : any > : ^^^ -// parentheses, the containted expression is value +// parentheses, the contained expression is value (this) *= value; >(this) *= value : number > : ^^^^^^ diff --git a/tests/baselines/reference/compoundExponentiationAssignmentLHSIsValue.errors.txt b/tests/baselines/reference/compoundExponentiationAssignmentLHSIsValue.errors.txt index fce7cd5bfe7e9..e4a00a883c55b 100644 --- a/tests/baselines/reference/compoundExponentiationAssignmentLHSIsValue.errors.txt +++ b/tests/baselines/reference/compoundExponentiationAssignmentLHSIsValue.errors.txt @@ -158,7 +158,7 @@ compoundExponentiationAssignmentLHSIsValue.ts(85,1): error TS2362: The left-hand ~~~~~ !!! error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number', 'bigint' or an enum type. - // parentheses, the containted expression is value + // parentheses, the contained expression is value (this) **= value; ~~~~~~ !!! error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number', 'bigint' or an enum type. diff --git a/tests/baselines/reference/compoundExponentiationAssignmentLHSIsValue.js b/tests/baselines/reference/compoundExponentiationAssignmentLHSIsValue.js index 41d3f079f71a3..4185856e2dc6b 100644 --- a/tests/baselines/reference/compoundExponentiationAssignmentLHSIsValue.js +++ b/tests/baselines/reference/compoundExponentiationAssignmentLHSIsValue.js @@ -71,7 +71,7 @@ function bar1() { } **= value; // function calls foo() **= value; -// parentheses, the containted expression is value +// parentheses, the contained expression is value (this) **= value; (M) **= value; (C) **= value; @@ -155,7 +155,7 @@ value; value; // function calls foo() = Math.pow(foo(), value); -// parentheses, the containted expression is value +// parentheses, the contained expression is value (this) = Math.pow((this), value); (M) = Math.pow((M), value); (C) = Math.pow((C), value); diff --git a/tests/baselines/reference/compoundExponentiationAssignmentLHSIsValue.symbols b/tests/baselines/reference/compoundExponentiationAssignmentLHSIsValue.symbols index d61f02b39c94e..654927bb4e0bb 100644 --- a/tests/baselines/reference/compoundExponentiationAssignmentLHSIsValue.symbols +++ b/tests/baselines/reference/compoundExponentiationAssignmentLHSIsValue.symbols @@ -136,7 +136,7 @@ foo() **= value; >foo : Symbol(foo, Decl(compoundExponentiationAssignmentLHSIsValue.ts, 14, 1)) >value : Symbol(value, Decl(compoundExponentiationAssignmentLHSIsValue.ts, 1, 3)) -// parentheses, the containted expression is value +// parentheses, the contained expression is value (this) **= value; >this : Symbol(globalThis) >value : Symbol(value, Decl(compoundExponentiationAssignmentLHSIsValue.ts, 1, 3)) diff --git a/tests/baselines/reference/compoundExponentiationAssignmentLHSIsValue.types b/tests/baselines/reference/compoundExponentiationAssignmentLHSIsValue.types index 066a506516f4d..3bfbca03b232e 100644 --- a/tests/baselines/reference/compoundExponentiationAssignmentLHSIsValue.types +++ b/tests/baselines/reference/compoundExponentiationAssignmentLHSIsValue.types @@ -265,7 +265,7 @@ foo() **= value; >value : any > : ^^^ -// parentheses, the containted expression is value +// parentheses, the contained expression is value (this) **= value; >(this) **= value : number > : ^^^^^^ diff --git a/tests/baselines/reference/conditionalOperatorConditionIsBooleanType.errors.txt b/tests/baselines/reference/conditionalOperatorConditionIsBooleanType.errors.txt index 2f7a225dd93d8..9cc66838a8753 100644 --- a/tests/baselines/reference/conditionalOperatorConditionIsBooleanType.errors.txt +++ b/tests/baselines/reference/conditionalOperatorConditionIsBooleanType.errors.txt @@ -161,7 +161,7 @@ conditionalOperatorConditionIsBooleanType.ts(61,74): error TS2454: Variable 'exp ~~~~~~~~~~~~ !!! error TS2454: Variable 'exprBoolean1' is used before being assigned. - //Results shoud be same as Expr1 and Expr2 + //Results should be same as Expr1 and Expr2 var resultIsAny1 = condBoolean ? exprAny1 : exprAny2; ~~~~~~~~~~~ !!! error TS2454: Variable 'condBoolean' is used before being assigned. diff --git a/tests/baselines/reference/conditionalOperatorConditionIsBooleanType.js b/tests/baselines/reference/conditionalOperatorConditionIsBooleanType.js index a1dde6622ef1a..1058c3cc93a40 100644 --- a/tests/baselines/reference/conditionalOperatorConditionIsBooleanType.js +++ b/tests/baselines/reference/conditionalOperatorConditionIsBooleanType.js @@ -40,7 +40,7 @@ null === undefined ? exprString1 : exprString2; true || false ? exprIsObject1 : exprIsObject2; null === undefined ? exprString1 : exprBoolean1; // union -//Results shoud be same as Expr1 and Expr2 +//Results should be same as Expr1 and Expr2 var resultIsAny1 = condBoolean ? exprAny1 : exprAny2; var resultIsBoolean1 = condBoolean ? exprBoolean1 : exprBoolean2; var resultIsNumber1 = condBoolean ? exprNumber1 : exprNumber2; @@ -99,7 +99,7 @@ typeof "123" == "string" ? exprBoolean1 : exprBoolean2; null === undefined ? exprString1 : exprString2; true || false ? exprIsObject1 : exprIsObject2; null === undefined ? exprString1 : exprBoolean1; // union -//Results shoud be same as Expr1 and Expr2 +//Results should be same as Expr1 and Expr2 var resultIsAny1 = condBoolean ? exprAny1 : exprAny2; var resultIsBoolean1 = condBoolean ? exprBoolean1 : exprBoolean2; var resultIsNumber1 = condBoolean ? exprNumber1 : exprNumber2; diff --git a/tests/baselines/reference/conditionalOperatorConditionIsBooleanType.symbols b/tests/baselines/reference/conditionalOperatorConditionIsBooleanType.symbols index d65056775b15e..e1d7cbd914ba6 100644 --- a/tests/baselines/reference/conditionalOperatorConditionIsBooleanType.symbols +++ b/tests/baselines/reference/conditionalOperatorConditionIsBooleanType.symbols @@ -120,7 +120,7 @@ null === undefined ? exprString1 : exprBoolean1; // union >exprString1 : Symbol(exprString1, Decl(conditionalOperatorConditionIsBooleanType.ts, 6, 3)) >exprBoolean1 : Symbol(exprBoolean1, Decl(conditionalOperatorConditionIsBooleanType.ts, 4, 3)) -//Results shoud be same as Expr1 and Expr2 +//Results should be same as Expr1 and Expr2 var resultIsAny1 = condBoolean ? exprAny1 : exprAny2; >resultIsAny1 : Symbol(resultIsAny1, Decl(conditionalOperatorConditionIsBooleanType.ts, 40, 3)) >condBoolean : Symbol(condBoolean, Decl(conditionalOperatorConditionIsBooleanType.ts, 1, 3)) diff --git a/tests/baselines/reference/conditionalOperatorConditionIsBooleanType.types b/tests/baselines/reference/conditionalOperatorConditionIsBooleanType.types index 87303a5f548ed..a014e1e61ebef 100644 --- a/tests/baselines/reference/conditionalOperatorConditionIsBooleanType.types +++ b/tests/baselines/reference/conditionalOperatorConditionIsBooleanType.types @@ -249,7 +249,7 @@ null === undefined ? exprString1 : exprBoolean1; // union >exprBoolean1 : boolean > : ^^^^^^^ -//Results shoud be same as Expr1 and Expr2 +//Results should be same as Expr1 and Expr2 var resultIsAny1 = condBoolean ? exprAny1 : exprAny2; >resultIsAny1 : any > : ^^^ diff --git a/tests/baselines/reference/conditionalOperatorConditionIsNumberType.errors.txt b/tests/baselines/reference/conditionalOperatorConditionIsNumberType.errors.txt index 8d09a80a995e5..b1f7d65a75d3c 100644 --- a/tests/baselines/reference/conditionalOperatorConditionIsNumberType.errors.txt +++ b/tests/baselines/reference/conditionalOperatorConditionIsNumberType.errors.txt @@ -55,7 +55,7 @@ conditionalOperatorConditionIsNumberType.ts(56,32): error TS2872: This kind of e foo() / array[1] ? exprIsObject1 : exprIsObject2; foo() ? exprString1 : exprBoolean1; // Union - //Results shoud be same as Expr1 and Expr2 + //Results should be same as Expr1 and Expr2 var resultIsAny1 = condNumber ? exprAny1 : exprAny2; var resultIsBoolean1 = condNumber ? exprBoolean1 : exprBoolean2; var resultIsNumber1 = condNumber ? exprNumber1 : exprNumber2; diff --git a/tests/baselines/reference/conditionalOperatorConditionIsNumberType.js b/tests/baselines/reference/conditionalOperatorConditionIsNumberType.js index 98c23b6455594..0293edbb6ceac 100644 --- a/tests/baselines/reference/conditionalOperatorConditionIsNumberType.js +++ b/tests/baselines/reference/conditionalOperatorConditionIsNumberType.js @@ -43,7 +43,7 @@ foo() ? exprString1 : exprString2; foo() / array[1] ? exprIsObject1 : exprIsObject2; foo() ? exprString1 : exprBoolean1; // Union -//Results shoud be same as Expr1 and Expr2 +//Results should be same as Expr1 and Expr2 var resultIsAny1 = condNumber ? exprAny1 : exprAny2; var resultIsBoolean1 = condNumber ? exprBoolean1 : exprBoolean2; var resultIsNumber1 = condNumber ? exprNumber1 : exprNumber2; @@ -91,7 +91,7 @@ var array = [1, 2, 3]; foo() ? exprString1 : exprString2; foo() / array[1] ? exprIsObject1 : exprIsObject2; foo() ? exprString1 : exprBoolean1; // Union -//Results shoud be same as Expr1 and Expr2 +//Results should be same as Expr1 and Expr2 var resultIsAny1 = condNumber ? exprAny1 : exprAny2; var resultIsBoolean1 = condNumber ? exprBoolean1 : exprBoolean2; var resultIsNumber1 = condNumber ? exprNumber1 : exprNumber2; diff --git a/tests/baselines/reference/conditionalOperatorConditionIsNumberType.symbols b/tests/baselines/reference/conditionalOperatorConditionIsNumberType.symbols index 54fe3d4cf5c4c..e6ab64ade57b4 100644 --- a/tests/baselines/reference/conditionalOperatorConditionIsNumberType.symbols +++ b/tests/baselines/reference/conditionalOperatorConditionIsNumberType.symbols @@ -130,7 +130,7 @@ foo() ? exprString1 : exprBoolean1; // Union >exprString1 : Symbol(exprString1, Decl(conditionalOperatorConditionIsNumberType.ts, 6, 11)) >exprBoolean1 : Symbol(exprBoolean1, Decl(conditionalOperatorConditionIsNumberType.ts, 4, 11)) -//Results shoud be same as Expr1 and Expr2 +//Results should be same as Expr1 and Expr2 var resultIsAny1 = condNumber ? exprAny1 : exprAny2; >resultIsAny1 : Symbol(resultIsAny1, Decl(conditionalOperatorConditionIsNumberType.ts, 43, 3)) >condNumber : Symbol(condNumber, Decl(conditionalOperatorConditionIsNumberType.ts, 1, 11)) diff --git a/tests/baselines/reference/conditionalOperatorConditionIsNumberType.types b/tests/baselines/reference/conditionalOperatorConditionIsNumberType.types index 96abc8f7047ff..ff8fb45e4467c 100644 --- a/tests/baselines/reference/conditionalOperatorConditionIsNumberType.types +++ b/tests/baselines/reference/conditionalOperatorConditionIsNumberType.types @@ -275,7 +275,7 @@ foo() ? exprString1 : exprBoolean1; // Union >exprBoolean1 : boolean > : ^^^^^^^ -//Results shoud be same as Expr1 and Expr2 +//Results should be same as Expr1 and Expr2 var resultIsAny1 = condNumber ? exprAny1 : exprAny2; >resultIsAny1 : any > : ^^^ diff --git a/tests/baselines/reference/conditionalOperatorConditionIsObjectType.errors.txt b/tests/baselines/reference/conditionalOperatorConditionIsObjectType.errors.txt index df84078324dc3..e11efaf6a2c36 100644 --- a/tests/baselines/reference/conditionalOperatorConditionIsObjectType.errors.txt +++ b/tests/baselines/reference/conditionalOperatorConditionIsObjectType.errors.txt @@ -76,7 +76,7 @@ conditionalOperatorConditionIsObjectType.ts(63,32): error TS1345: An expression condObject.valueOf() ? exprIsObject1 : exprIsObject2; new Date() ? exprString1 : exprBoolean1; // union - //Results shoud be same as Expr1 and Expr2 + //Results should be same as Expr1 and Expr2 var resultIsAny1 = condObject ? exprAny1 : exprAny2; var resultIsBoolean1 = condObject ? exprBoolean1 : exprBoolean2; var resultIsNumber1 = condObject ? exprNumber1 : exprNumber2; diff --git a/tests/baselines/reference/conditionalOperatorConditionIsObjectType.js b/tests/baselines/reference/conditionalOperatorConditionIsObjectType.js index d2fbcf0e4670b..69f2b50c98585 100644 --- a/tests/baselines/reference/conditionalOperatorConditionIsObjectType.js +++ b/tests/baselines/reference/conditionalOperatorConditionIsObjectType.js @@ -43,7 +43,7 @@ C.doIt() ? exprString1 : exprString2; condObject.valueOf() ? exprIsObject1 : exprIsObject2; new Date() ? exprString1 : exprBoolean1; // union -//Results shoud be same as Expr1 and Expr2 +//Results should be same as Expr1 and Expr2 var resultIsAny1 = condObject ? exprAny1 : exprAny2; var resultIsBoolean1 = condObject ? exprBoolean1 : exprBoolean2; var resultIsNumber1 = condObject ? exprNumber1 : exprNumber2; @@ -94,7 +94,7 @@ new C() ? exprNumber1 : exprNumber2; C.doIt() ? exprString1 : exprString2; condObject.valueOf() ? exprIsObject1 : exprIsObject2; new Date() ? exprString1 : exprBoolean1; // union -//Results shoud be same as Expr1 and Expr2 +//Results should be same as Expr1 and Expr2 var resultIsAny1 = condObject ? exprAny1 : exprAny2; var resultIsBoolean1 = condObject ? exprBoolean1 : exprBoolean2; var resultIsNumber1 = condObject ? exprNumber1 : exprNumber2; diff --git a/tests/baselines/reference/conditionalOperatorConditionIsObjectType.symbols b/tests/baselines/reference/conditionalOperatorConditionIsObjectType.symbols index 50085adc0c151..d9e3ed844b447 100644 --- a/tests/baselines/reference/conditionalOperatorConditionIsObjectType.symbols +++ b/tests/baselines/reference/conditionalOperatorConditionIsObjectType.symbols @@ -150,7 +150,7 @@ new Date() ? exprString1 : exprBoolean1; // union >exprString1 : Symbol(exprString1, Decl(conditionalOperatorConditionIsObjectType.ts, 6, 11)) >exprBoolean1 : Symbol(exprBoolean1, Decl(conditionalOperatorConditionIsObjectType.ts, 4, 11)) -//Results shoud be same as Expr1 and Expr2 +//Results should be same as Expr1 and Expr2 var resultIsAny1 = condObject ? exprAny1 : exprAny2; >resultIsAny1 : Symbol(resultIsAny1, Decl(conditionalOperatorConditionIsObjectType.ts, 43, 3)) >condObject : Symbol(condObject, Decl(conditionalOperatorConditionIsObjectType.ts, 1, 11)) diff --git a/tests/baselines/reference/conditionalOperatorConditionIsObjectType.types b/tests/baselines/reference/conditionalOperatorConditionIsObjectType.types index f801ed9ac81fe..c3329ceb008a8 100644 --- a/tests/baselines/reference/conditionalOperatorConditionIsObjectType.types +++ b/tests/baselines/reference/conditionalOperatorConditionIsObjectType.types @@ -311,7 +311,7 @@ new Date() ? exprString1 : exprBoolean1; // union >exprBoolean1 : boolean > : ^^^^^^^ -//Results shoud be same as Expr1 and Expr2 +//Results should be same as Expr1 and Expr2 var resultIsAny1 = condObject ? exprAny1 : exprAny2; >resultIsAny1 : any > : ^^^ diff --git a/tests/baselines/reference/conditionalOperatorConditoinIsAnyType.errors.txt b/tests/baselines/reference/conditionalOperatorConditoinIsAnyType.errors.txt index 5d2a019dabfa3..59f796f627d38 100644 --- a/tests/baselines/reference/conditionalOperatorConditoinIsAnyType.errors.txt +++ b/tests/baselines/reference/conditionalOperatorConditoinIsAnyType.errors.txt @@ -67,7 +67,7 @@ conditionalOperatorConditoinIsAnyType.ts(56,32): error TS2872: This kind of expr x.doSomeThing() ? exprIsObject1 : exprIsObject2; x.doSomeThing() ? exprString1 : exprBoolean1; // union - //Results shoud be same as Expr1 and Expr2 + //Results should be same as Expr1 and Expr2 var resultIsAny1 = condAny ? exprAny1 : exprAny2; var resultIsBoolean1 = condAny ? exprBoolean1 : exprBoolean2; var resultIsNumber1 = condAny ? exprNumber1 : exprNumber2; diff --git a/tests/baselines/reference/conditionalOperatorConditoinIsAnyType.js b/tests/baselines/reference/conditionalOperatorConditoinIsAnyType.js index d87680008c064..4fd966952d19d 100644 --- a/tests/baselines/reference/conditionalOperatorConditoinIsAnyType.js +++ b/tests/baselines/reference/conditionalOperatorConditoinIsAnyType.js @@ -41,7 +41,7 @@ x("x") ? exprString1 : exprString2; x.doSomeThing() ? exprIsObject1 : exprIsObject2; x.doSomeThing() ? exprString1 : exprBoolean1; // union -//Results shoud be same as Expr1 and Expr2 +//Results should be same as Expr1 and Expr2 var resultIsAny1 = condAny ? exprAny1 : exprAny2; var resultIsBoolean1 = condAny ? exprBoolean1 : exprBoolean2; var resultIsNumber1 = condAny ? exprNumber1 : exprNumber2; @@ -88,7 +88,7 @@ x(x) ? exprNumber1 : exprNumber2; x("x") ? exprString1 : exprString2; x.doSomeThing() ? exprIsObject1 : exprIsObject2; x.doSomeThing() ? exprString1 : exprBoolean1; // union -//Results shoud be same as Expr1 and Expr2 +//Results should be same as Expr1 and Expr2 var resultIsAny1 = condAny ? exprAny1 : exprAny2; var resultIsBoolean1 = condAny ? exprBoolean1 : exprBoolean2; var resultIsNumber1 = condAny ? exprNumber1 : exprNumber2; diff --git a/tests/baselines/reference/conditionalOperatorConditoinIsAnyType.symbols b/tests/baselines/reference/conditionalOperatorConditoinIsAnyType.symbols index 97503b778ed31..69ea394a56613 100644 --- a/tests/baselines/reference/conditionalOperatorConditoinIsAnyType.symbols +++ b/tests/baselines/reference/conditionalOperatorConditoinIsAnyType.symbols @@ -132,7 +132,7 @@ x.doSomeThing() ? exprString1 : exprBoolean1; // union >exprString1 : Symbol(exprString1, Decl(conditionalOperatorConditoinIsAnyType.ts, 7, 11)) >exprBoolean1 : Symbol(exprBoolean1, Decl(conditionalOperatorConditoinIsAnyType.ts, 5, 11)) -//Results shoud be same as Expr1 and Expr2 +//Results should be same as Expr1 and Expr2 var resultIsAny1 = condAny ? exprAny1 : exprAny2; >resultIsAny1 : Symbol(resultIsAny1, Decl(conditionalOperatorConditoinIsAnyType.ts, 41, 3)) >condAny : Symbol(condAny, Decl(conditionalOperatorConditoinIsAnyType.ts, 1, 11)) diff --git a/tests/baselines/reference/conditionalOperatorConditoinIsAnyType.types b/tests/baselines/reference/conditionalOperatorConditoinIsAnyType.types index 27a20a9c84807..1b7a2546d45c2 100644 --- a/tests/baselines/reference/conditionalOperatorConditoinIsAnyType.types +++ b/tests/baselines/reference/conditionalOperatorConditoinIsAnyType.types @@ -263,7 +263,7 @@ x.doSomeThing() ? exprString1 : exprBoolean1; // union >exprBoolean1 : boolean > : ^^^^^^^ -//Results shoud be same as Expr1 and Expr2 +//Results should be same as Expr1 and Expr2 var resultIsAny1 = condAny ? exprAny1 : exprAny2; >resultIsAny1 : any > : ^^^ diff --git a/tests/baselines/reference/conditionalOperatorConditoinIsStringType.errors.txt b/tests/baselines/reference/conditionalOperatorConditoinIsStringType.errors.txt index 5af5b518ef73d..65bb2e74339d8 100644 --- a/tests/baselines/reference/conditionalOperatorConditoinIsStringType.errors.txt +++ b/tests/baselines/reference/conditionalOperatorConditoinIsStringType.errors.txt @@ -72,7 +72,7 @@ conditionalOperatorConditoinIsStringType.ts(64,32): error TS2774: This condition array[1] ? exprIsObject1 : exprIsObject2; foo() ? exprString1 : exprBoolean1; // union - //Results shoud be same as Expr1 and Expr2 + //Results should be same as Expr1 and Expr2 var resultIsAny1 = condString ? exprAny1 : exprAny2; var resultIsBoolean1 = condString ? exprBoolean1 : exprBoolean2; var resultIsNumber1 = condString ? exprNumber1 : exprNumber2; diff --git a/tests/baselines/reference/conditionalOperatorConditoinIsStringType.js b/tests/baselines/reference/conditionalOperatorConditoinIsStringType.js index d4faf9c46b5a3..542a082ab5d34 100644 --- a/tests/baselines/reference/conditionalOperatorConditoinIsStringType.js +++ b/tests/baselines/reference/conditionalOperatorConditoinIsStringType.js @@ -43,7 +43,7 @@ foo() ? exprString1 : exprString2; array[1] ? exprIsObject1 : exprIsObject2; foo() ? exprString1 : exprBoolean1; // union -//Results shoud be same as Expr1 and Expr2 +//Results should be same as Expr1 and Expr2 var resultIsAny1 = condString ? exprAny1 : exprAny2; var resultIsBoolean1 = condString ? exprBoolean1 : exprBoolean2; var resultIsNumber1 = condString ? exprNumber1 : exprNumber2; @@ -92,7 +92,7 @@ condString + "string" ? exprNumber1 : exprNumber2; foo() ? exprString1 : exprString2; array[1] ? exprIsObject1 : exprIsObject2; foo() ? exprString1 : exprBoolean1; // union -//Results shoud be same as Expr1 and Expr2 +//Results should be same as Expr1 and Expr2 var resultIsAny1 = condString ? exprAny1 : exprAny2; var resultIsBoolean1 = condString ? exprBoolean1 : exprBoolean2; var resultIsNumber1 = condString ? exprNumber1 : exprNumber2; diff --git a/tests/baselines/reference/conditionalOperatorConditoinIsStringType.symbols b/tests/baselines/reference/conditionalOperatorConditoinIsStringType.symbols index dd18ada4b14d1..f528992cc8b7d 100644 --- a/tests/baselines/reference/conditionalOperatorConditoinIsStringType.symbols +++ b/tests/baselines/reference/conditionalOperatorConditoinIsStringType.symbols @@ -132,7 +132,7 @@ foo() ? exprString1 : exprBoolean1; // union >exprString1 : Symbol(exprString1, Decl(conditionalOperatorConditoinIsStringType.ts, 6, 11)) >exprBoolean1 : Symbol(exprBoolean1, Decl(conditionalOperatorConditoinIsStringType.ts, 4, 11)) -//Results shoud be same as Expr1 and Expr2 +//Results should be same as Expr1 and Expr2 var resultIsAny1 = condString ? exprAny1 : exprAny2; >resultIsAny1 : Symbol(resultIsAny1, Decl(conditionalOperatorConditoinIsStringType.ts, 43, 3)) >condString : Symbol(condString, Decl(conditionalOperatorConditoinIsStringType.ts, 1, 11)) diff --git a/tests/baselines/reference/conditionalOperatorConditoinIsStringType.types b/tests/baselines/reference/conditionalOperatorConditoinIsStringType.types index cd21e822bb8bd..d46dd8f9ce501 100644 --- a/tests/baselines/reference/conditionalOperatorConditoinIsStringType.types +++ b/tests/baselines/reference/conditionalOperatorConditoinIsStringType.types @@ -265,7 +265,7 @@ foo() ? exprString1 : exprBoolean1; // union >exprBoolean1 : boolean > : ^^^^^^^ -//Results shoud be same as Expr1 and Expr2 +//Results should be same as Expr1 and Expr2 var resultIsAny1 = condString ? exprAny1 : exprAny2; >resultIsAny1 : any > : ^^^ diff --git a/tests/baselines/reference/conditionalTypesSimplifyWhenTrivial.js b/tests/baselines/reference/conditionalTypesSimplifyWhenTrivial.js index 4d6889f49953c..f466ab8ed9809 100644 --- a/tests/baselines/reference/conditionalTypesSimplifyWhenTrivial.js +++ b/tests/baselines/reference/conditionalTypesSimplifyWhenTrivial.js @@ -19,7 +19,7 @@ function fn4(x: Extract) { x = y; } -declare var x: Extract; // Should be `numebr | string` and not `any` +declare var x: Extract; // Should be `number | string` and not `any` type ExtractWithDefault = T extends U ? T : D; diff --git a/tests/baselines/reference/conditionalTypesSimplifyWhenTrivial.symbols b/tests/baselines/reference/conditionalTypesSimplifyWhenTrivial.symbols index aab3afac7a903..013515bb29c31 100644 --- a/tests/baselines/reference/conditionalTypesSimplifyWhenTrivial.symbols +++ b/tests/baselines/reference/conditionalTypesSimplifyWhenTrivial.symbols @@ -67,7 +67,7 @@ function fn4(x: Extract) { >y : Symbol(y, Decl(conditionalTypesSimplifyWhenTrivial.ts, 14, 7)) } -declare var x: Extract; // Should be `numebr | string` and not `any` +declare var x: Extract; // Should be `number | string` and not `any` >x : Symbol(x, Decl(conditionalTypesSimplifyWhenTrivial.ts, 18, 11)) >Extract : Symbol(Extract, Decl(lib.es5.d.ts, --, --)) diff --git a/tests/baselines/reference/conditionalTypesSimplifyWhenTrivial.types b/tests/baselines/reference/conditionalTypesSimplifyWhenTrivial.types index 0fbd4d029befd..20d726f51c4e4 100644 --- a/tests/baselines/reference/conditionalTypesSimplifyWhenTrivial.types +++ b/tests/baselines/reference/conditionalTypesSimplifyWhenTrivial.types @@ -71,7 +71,7 @@ function fn4(x: Extract) { > : ^ } -declare var x: Extract; // Should be `numebr | string` and not `any` +declare var x: Extract; // Should be `number | string` and not `any` >x : string | number > : ^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/constDeclarations-ambient-errors.errors.txt b/tests/baselines/reference/constDeclarations-ambient-errors.errors.txt index ceaa5e8cde427..35cf6cc13e467 100644 --- a/tests/baselines/reference/constDeclarations-ambient-errors.errors.txt +++ b/tests/baselines/reference/constDeclarations-ambient-errors.errors.txt @@ -7,7 +7,7 @@ constDeclarations-ambient-errors.ts(8,24): error TS1039: Initializers are not al ==== constDeclarations-ambient-errors.ts (6 errors) ==== - // error: no intialization expected in ambient declarations + // error: no initialization expected in ambient declarations declare const c1: boolean = true; ~~~~ !!! error TS1039: Initializers are not allowed in ambient contexts. diff --git a/tests/baselines/reference/constDeclarations-ambient-errors.js b/tests/baselines/reference/constDeclarations-ambient-errors.js index 220913caa9814..87b028bf7e8e6 100644 --- a/tests/baselines/reference/constDeclarations-ambient-errors.js +++ b/tests/baselines/reference/constDeclarations-ambient-errors.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/constDeclarations-ambient-errors.ts] //// //// [constDeclarations-ambient-errors.ts] -// error: no intialization expected in ambient declarations +// error: no initialization expected in ambient declarations declare const c1: boolean = true; declare const c2: number = 0; declare const c3 = null, c4 :string = "", c5: any = 0; diff --git a/tests/baselines/reference/constDeclarations-ambient-errors.symbols b/tests/baselines/reference/constDeclarations-ambient-errors.symbols index dab90a4e5f641..396f6427f8c63 100644 --- a/tests/baselines/reference/constDeclarations-ambient-errors.symbols +++ b/tests/baselines/reference/constDeclarations-ambient-errors.symbols @@ -1,7 +1,7 @@ //// [tests/cases/compiler/constDeclarations-ambient-errors.ts] //// === constDeclarations-ambient-errors.ts === -// error: no intialization expected in ambient declarations +// error: no initialization expected in ambient declarations declare const c1: boolean = true; >c1 : Symbol(c1, Decl(constDeclarations-ambient-errors.ts, 1, 13)) diff --git a/tests/baselines/reference/constDeclarations-ambient-errors.types b/tests/baselines/reference/constDeclarations-ambient-errors.types index 0df7869b51627..997e90dd3b751 100644 --- a/tests/baselines/reference/constDeclarations-ambient-errors.types +++ b/tests/baselines/reference/constDeclarations-ambient-errors.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/constDeclarations-ambient-errors.ts] //// === constDeclarations-ambient-errors.ts === -// error: no intialization expected in ambient declarations +// error: no initialization expected in ambient declarations declare const c1: boolean = true; >c1 : boolean > : ^^^^^^^ diff --git a/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.errors.txt b/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.errors.txt index a7dae69e97d4b..023ab950ed513 100644 --- a/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.errors.txt +++ b/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.errors.txt @@ -289,7 +289,7 @@ constructorWithIncompleteTypeAnnotation.ts(261,1): error TS1128: Declaration or } /// - /// Test different statements. Including if-else,swith,foreach,(un)checked,lock,using,try-catch-finally + /// Test different statements. Including if-else,switch,foreach,(un)checked,lock,using,try-catch-finally /// /// /// diff --git a/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.js b/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.js index 3f83cdc46221d..dab065ed2ab5d 100644 --- a/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.js +++ b/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.js @@ -114,7 +114,7 @@ namespace TypeScriptAllInOne { } /// - /// Test different statements. Including if-else,swith,foreach,(un)checked,lock,using,try-catch-finally + /// Test different statements. Including if-else,switch,foreach,(un)checked,lock,using,try-catch-finally /// /// /// @@ -383,7 +383,7 @@ class BasicFeatures { return 0; } /// - /// Test different statements. Including if-else,swith,foreach,(un)checked,lock,using,try-catch-finally + /// Test different statements. Including if-else,switch,foreach,(un)checked,lock,using,try-catch-finally /// /// /// diff --git a/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.symbols b/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.symbols index aedba390a3368..ca11d1281d2bf 100644 --- a/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.symbols +++ b/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.symbols @@ -285,7 +285,7 @@ namespace TypeScriptAllInOne { } /// - /// Test different statements. Including if-else,swith,foreach,(un)checked,lock,using,try-catch-finally + /// Test different statements. Including if-else,switch,foreach,(un)checked,lock,using,try-catch-finally /// /// /// diff --git a/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.types b/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.types index 1b50ba086f429..21c4c88231ff0 100644 --- a/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.types +++ b/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.types @@ -682,7 +682,7 @@ namespace TypeScriptAllInOne { } /// - /// Test different statements. Including if-else,swith,foreach,(un)checked,lock,using,try-catch-finally + /// Test different statements. Including if-else,switch,foreach,(un)checked,lock,using,try-catch-finally /// /// /// diff --git a/tests/baselines/reference/contextuallyTypedByDiscriminableUnion2.symbols b/tests/baselines/reference/contextuallyTypedByDiscriminableUnion2.symbols index 9f68d9708cdf6..2d5d5e41df103 100644 --- a/tests/baselines/reference/contextuallyTypedByDiscriminableUnion2.symbols +++ b/tests/baselines/reference/contextuallyTypedByDiscriminableUnion2.symbols @@ -14,7 +14,7 @@ interface EnableA { >enableA : Symbol(EnableA.enableA, Decl(contextuallyTypedByDiscriminableUnion2.ts, 4, 19)) // this introduces a conflicting property with some of the other members of MyComponentProps - // making relevant final union members reduced nevers + // making relevant final union members reduced never readonly enableB: true; >enableB : Symbol(EnableA.enableB, Decl(contextuallyTypedByDiscriminableUnion2.ts, 5, 25)) } diff --git a/tests/baselines/reference/contextuallyTypedByDiscriminableUnion2.types b/tests/baselines/reference/contextuallyTypedByDiscriminableUnion2.types index 41b487e1103e5..5c42f4baf914e 100644 --- a/tests/baselines/reference/contextuallyTypedByDiscriminableUnion2.types +++ b/tests/baselines/reference/contextuallyTypedByDiscriminableUnion2.types @@ -17,7 +17,7 @@ interface EnableA { > : ^^^^ // this introduces a conflicting property with some of the other members of MyComponentProps - // making relevant final union members reduced nevers + // making relevant final union members reduced never readonly enableB: true; >enableB : true > : ^^^^ diff --git a/tests/baselines/reference/declFileWithErrorsInInputDeclarationFile.errors.txt b/tests/baselines/reference/declFileWithErrorsInInputDeclarationFile.errors.txt index dac66868a5172..5b740113c8fbc 100644 --- a/tests/baselines/reference/declFileWithErrorsInInputDeclarationFile.errors.txt +++ b/tests/baselines/reference/declFileWithErrorsInInputDeclarationFile.errors.txt @@ -6,7 +6,7 @@ declFile.d.ts(7,5): error TS1038: A 'declare' modifier cannot be used in an alre ==== client.ts (0 errors) ==== /// - var x = new M.C(); // Declaration file wont get emitted because there are errors in declaration file + var x = new M.C(); // Declaration file won't get emitted because there are errors in declaration file ==== declFile.d.ts (4 errors) ==== declare namespace M { diff --git a/tests/baselines/reference/declFileWithErrorsInInputDeclarationFile.js b/tests/baselines/reference/declFileWithErrorsInInputDeclarationFile.js index 4a6b5fa3d9d94..31bef59b12204 100644 --- a/tests/baselines/reference/declFileWithErrorsInInputDeclarationFile.js +++ b/tests/baselines/reference/declFileWithErrorsInInputDeclarationFile.js @@ -12,13 +12,13 @@ declare namespace M { //// [client.ts] /// -var x = new M.C(); // Declaration file wont get emitted because there are errors in declaration file +var x = new M.C(); // Declaration file won't get emitted because there are errors in declaration file //// [client.js] "use strict"; /// -var x = new M.C(); // Declaration file wont get emitted because there are errors in declaration file +var x = new M.C(); // Declaration file won't get emitted because there are errors in declaration file //// [client.d.ts] diff --git a/tests/baselines/reference/declFileWithErrorsInInputDeclarationFile.symbols b/tests/baselines/reference/declFileWithErrorsInInputDeclarationFile.symbols index 7042e03eea9f6..8ed07d66a97f9 100644 --- a/tests/baselines/reference/declFileWithErrorsInInputDeclarationFile.symbols +++ b/tests/baselines/reference/declFileWithErrorsInInputDeclarationFile.symbols @@ -2,7 +2,7 @@ === client.ts === /// -var x = new M.C(); // Declaration file wont get emitted because there are errors in declaration file +var x = new M.C(); // Declaration file won't get emitted because there are errors in declaration file >x : Symbol(x, Decl(client.ts, 1, 3)) >M.C : Symbol(M.C, Decl(declFile.d.ts, 4, 27)) >M : Symbol(M, Decl(declFile.d.ts, 0, 0)) diff --git a/tests/baselines/reference/declFileWithErrorsInInputDeclarationFile.types b/tests/baselines/reference/declFileWithErrorsInInputDeclarationFile.types index e1699677a1444..c9af4debdc360 100644 --- a/tests/baselines/reference/declFileWithErrorsInInputDeclarationFile.types +++ b/tests/baselines/reference/declFileWithErrorsInInputDeclarationFile.types @@ -2,7 +2,7 @@ === client.ts === /// -var x = new M.C(); // Declaration file wont get emitted because there are errors in declaration file +var x = new M.C(); // Declaration file won't get emitted because there are errors in declaration file >x : M.C > : ^^^ >new M.C() : M.C diff --git a/tests/baselines/reference/declFileWithErrorsInInputDeclarationFileWithOut.errors.txt b/tests/baselines/reference/declFileWithErrorsInInputDeclarationFileWithOut.errors.txt index 41fc7268d4aeb..b36dff2d76101 100644 --- a/tests/baselines/reference/declFileWithErrorsInInputDeclarationFileWithOut.errors.txt +++ b/tests/baselines/reference/declFileWithErrorsInInputDeclarationFileWithOut.errors.txt @@ -8,7 +8,7 @@ declFile.d.ts(7,5): error TS1038: A 'declare' modifier cannot be used in an alre !!! error TS5101: Option 'outFile' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error. ==== client.ts (0 errors) ==== /// - var x = new M.C(); // Declaration file wont get emitted because there are errors in declaration file + var x = new M.C(); // Declaration file won't get emitted because there are errors in declaration file ==== declFile.d.ts (4 errors) ==== declare namespace M { diff --git a/tests/baselines/reference/declFileWithErrorsInInputDeclarationFileWithOut.js b/tests/baselines/reference/declFileWithErrorsInInputDeclarationFileWithOut.js index 6469886bb9967..e62e91daed736 100644 --- a/tests/baselines/reference/declFileWithErrorsInInputDeclarationFileWithOut.js +++ b/tests/baselines/reference/declFileWithErrorsInInputDeclarationFileWithOut.js @@ -12,13 +12,13 @@ declare namespace M { //// [client.ts] /// -var x = new M.C(); // Declaration file wont get emitted because there are errors in declaration file +var x = new M.C(); // Declaration file won't get emitted because there are errors in declaration file //// [out.js] "use strict"; /// -var x = new M.C(); // Declaration file wont get emitted because there are errors in declaration file +var x = new M.C(); // Declaration file won't get emitted because there are errors in declaration file //// [out.d.ts] diff --git a/tests/baselines/reference/declFileWithErrorsInInputDeclarationFileWithOut.symbols b/tests/baselines/reference/declFileWithErrorsInInputDeclarationFileWithOut.symbols index f77dd680a4c9c..c2fbfe8a8f892 100644 --- a/tests/baselines/reference/declFileWithErrorsInInputDeclarationFileWithOut.symbols +++ b/tests/baselines/reference/declFileWithErrorsInInputDeclarationFileWithOut.symbols @@ -2,7 +2,7 @@ === client.ts === /// -var x = new M.C(); // Declaration file wont get emitted because there are errors in declaration file +var x = new M.C(); // Declaration file won't get emitted because there are errors in declaration file >x : Symbol(x, Decl(client.ts, 1, 3)) >M.C : Symbol(M.C, Decl(declFile.d.ts, 4, 27)) >M : Symbol(M, Decl(declFile.d.ts, 0, 0)) diff --git a/tests/baselines/reference/declFileWithErrorsInInputDeclarationFileWithOut.types b/tests/baselines/reference/declFileWithErrorsInInputDeclarationFileWithOut.types index 1528d5f05a087..00e736ba0a5ef 100644 --- a/tests/baselines/reference/declFileWithErrorsInInputDeclarationFileWithOut.types +++ b/tests/baselines/reference/declFileWithErrorsInInputDeclarationFileWithOut.types @@ -2,7 +2,7 @@ === client.ts === /// -var x = new M.C(); // Declaration file wont get emitted because there are errors in declaration file +var x = new M.C(); // Declaration file won't get emitted because there are errors in declaration file >x : M.C > : ^^^ >new M.C() : M.C diff --git a/tests/baselines/reference/declarationEmitBindingPatternsFunctionExpr.js b/tests/baselines/reference/declarationEmitBindingPatternsFunctionExpr.js index 63b46cfc5fa9e..961060ffb6466 100644 --- a/tests/baselines/reference/declarationEmitBindingPatternsFunctionExpr.js +++ b/tests/baselines/reference/declarationEmitBindingPatternsFunctionExpr.js @@ -5,7 +5,7 @@ type Named = { name: string } // Tempting to remove alias if unused let notReferenced = ({ name: alias }: Named) => { } -// Resons we can't remove aliases that are not used in the function signature: +// Reasons we can't remove aliases that are not used in the function signature: // 1.Causes duplicate identifier if we remove alias const duplicateIndetifiers = ({ name: alias, name: alias2 }: Named) => { } @@ -20,7 +20,7 @@ const shadowedVariable = ({ value: alias }: { value: string }): typeof value => "use strict"; // Tempting to remove alias if unused let notReferenced = ({ name: alias }) => { }; -// Resons we can't remove aliases that are not used in the function signature: +// Reasons we can't remove aliases that are not used in the function signature: // 1.Causes duplicate identifier if we remove alias const duplicateIndetifiers = ({ name: alias, name: alias2 }) => { }; const duplicateIndetifiers2 = (name, { name: alias }) => { }; diff --git a/tests/baselines/reference/declarationEmitBindingPatternsFunctionExpr.symbols b/tests/baselines/reference/declarationEmitBindingPatternsFunctionExpr.symbols index 51b5dc159420f..0d53a0913ad79 100644 --- a/tests/baselines/reference/declarationEmitBindingPatternsFunctionExpr.symbols +++ b/tests/baselines/reference/declarationEmitBindingPatternsFunctionExpr.symbols @@ -12,7 +12,7 @@ let notReferenced = ({ name: alias }: Named) => { } >alias : Symbol(alias, Decl(declarationEmitBindingPatternsFunctionExpr.ts, 2, 22)) >Named : Symbol(Named, Decl(declarationEmitBindingPatternsFunctionExpr.ts, 0, 0)) -// Resons we can't remove aliases that are not used in the function signature: +// Reasons we can't remove aliases that are not used in the function signature: // 1.Causes duplicate identifier if we remove alias const duplicateIndetifiers = ({ name: alias, name: alias2 }: Named) => { } diff --git a/tests/baselines/reference/declarationEmitBindingPatternsFunctionExpr.types b/tests/baselines/reference/declarationEmitBindingPatternsFunctionExpr.types index 227e6da8414fe..483cf19a49496 100644 --- a/tests/baselines/reference/declarationEmitBindingPatternsFunctionExpr.types +++ b/tests/baselines/reference/declarationEmitBindingPatternsFunctionExpr.types @@ -18,7 +18,7 @@ let notReferenced = ({ name: alias }: Named) => { } >alias : string > : ^^^^^^ -// Resons we can't remove aliases that are not used in the function signature: +// Reasons we can't remove aliases that are not used in the function signature: // 1.Causes duplicate identifier if we remove alias const duplicateIndetifiers = ({ name: alias, name: alias2 }: Named) => { } diff --git a/tests/baselines/reference/declarationEmitBindingPatternsUnused.errors.txt b/tests/baselines/reference/declarationEmitBindingPatternsUnused.errors.txt index 0dc2e5589942d..ad95cb5b6ba1b 100644 --- a/tests/baselines/reference/declarationEmitBindingPatternsUnused.errors.txt +++ b/tests/baselines/reference/declarationEmitBindingPatternsUnused.errors.txt @@ -9,7 +9,7 @@ declarationEmitBindingPatternsUnused.ts(108,12): error TS2842: 'alias' is an unu ==== declarationEmitBindingPatternsUnused.ts (6 errors) ==== type Named = { name: string } - // Resons we can't remove aliases that are not used in the function signature: + // Reasons we can't remove aliases that are not used in the function signature: // 1.Causes duplicate identifier if we remove alias function duplicateIndetifiers({ name: alias, name: alias2 }: Named) { } diff --git a/tests/baselines/reference/declarationEmitBindingPatternsUnused.js b/tests/baselines/reference/declarationEmitBindingPatternsUnused.js index a81027c2f78ee..946674f168c9b 100644 --- a/tests/baselines/reference/declarationEmitBindingPatternsUnused.js +++ b/tests/baselines/reference/declarationEmitBindingPatternsUnused.js @@ -3,7 +3,7 @@ //// [declarationEmitBindingPatternsUnused.ts] type Named = { name: string } -// Resons we can't remove aliases that are not used in the function signature: +// Reasons we can't remove aliases that are not used in the function signature: // 1.Causes duplicate identifier if we remove alias function duplicateIndetifiers({ name: alias, name: alias2 }: Named) { } @@ -125,7 +125,7 @@ interface ReferencedInSignartureInterface { //// [declarationEmitBindingPatternsUnused.js] "use strict"; -// Resons we can't remove aliases that are not used in the function signature: +// Reasons we can't remove aliases that are not used in the function signature: // 1.Causes duplicate identifier if we remove alias function duplicateIndetifiers({ name: alias, name: alias2 }) { } function duplicateIndetifiers2(name, { name: alias }) { } diff --git a/tests/baselines/reference/declarationEmitBindingPatternsUnused.symbols b/tests/baselines/reference/declarationEmitBindingPatternsUnused.symbols index 4e0d43f0dc7ce..8a380fa7b45dd 100644 --- a/tests/baselines/reference/declarationEmitBindingPatternsUnused.symbols +++ b/tests/baselines/reference/declarationEmitBindingPatternsUnused.symbols @@ -5,7 +5,7 @@ type Named = { name: string } >Named : Symbol(Named, Decl(declarationEmitBindingPatternsUnused.ts, 0, 0)) >name : Symbol(name, Decl(declarationEmitBindingPatternsUnused.ts, 0, 14)) -// Resons we can't remove aliases that are not used in the function signature: +// Reasons we can't remove aliases that are not used in the function signature: // 1.Causes duplicate identifier if we remove alias function duplicateIndetifiers({ name: alias, name: alias2 }: Named) { } diff --git a/tests/baselines/reference/declarationEmitBindingPatternsUnused.types b/tests/baselines/reference/declarationEmitBindingPatternsUnused.types index 3f68149ee430a..8e29c6874263a 100644 --- a/tests/baselines/reference/declarationEmitBindingPatternsUnused.types +++ b/tests/baselines/reference/declarationEmitBindingPatternsUnused.types @@ -7,7 +7,7 @@ type Named = { name: string } >name : string > : ^^^^^^ -// Resons we can't remove aliases that are not used in the function signature: +// Reasons we can't remove aliases that are not used in the function signature: // 1.Causes duplicate identifier if we remove alias function duplicateIndetifiers({ name: alias, name: alias2 }: Named) { } diff --git a/tests/baselines/reference/declarationEmitObjectAssignedDefaultExport.errors.txt b/tests/baselines/reference/declarationEmitObjectAssignedDefaultExport.errors.txt index 8396aee5921c5..772a76791deb4 100644 --- a/tests/baselines/reference/declarationEmitObjectAssignedDefaultExport.errors.txt +++ b/tests/baselines/reference/declarationEmitObjectAssignedDefaultExport.errors.txt @@ -2,11 +2,11 @@ index.ts(7,1): error TS2883: The inferred type of 'default' cannot be named with ==== node_modules/styled-components/node_modules/hoist-non-react-statics/index.d.ts (0 errors) ==== - interface Statics { + interface Statistics { "$$whatever": string; } declare namespace hoistNonReactStatics { - type NonReactStatics = {[X in Exclude]: T[X]} + type NonReactStatics = {[X in Exclude]: T[X]} } export = hoistNonReactStatics; ==== node_modules/styled-components/index.d.ts (0 errors) ==== diff --git a/tests/baselines/reference/declarationEmitObjectAssignedDefaultExport.js b/tests/baselines/reference/declarationEmitObjectAssignedDefaultExport.js index 5847f5e532fbf..cbf9c5b1092e1 100644 --- a/tests/baselines/reference/declarationEmitObjectAssignedDefaultExport.js +++ b/tests/baselines/reference/declarationEmitObjectAssignedDefaultExport.js @@ -1,11 +1,11 @@ //// [tests/cases/compiler/declarationEmitObjectAssignedDefaultExport.ts] //// //// [index.d.ts] -interface Statics { +interface Statistics { "$$whatever": string; } declare namespace hoistNonReactStatics { - type NonReactStatics = {[X in Exclude]: T[X]} + type NonReactStatics = {[X in Exclude]: T[X]} } export = hoistNonReactStatics; //// [index.d.ts] diff --git a/tests/baselines/reference/declarationEmitObjectAssignedDefaultExport.symbols b/tests/baselines/reference/declarationEmitObjectAssignedDefaultExport.symbols index dd780a891cf78..3484c985a25aa 100644 --- a/tests/baselines/reference/declarationEmitObjectAssignedDefaultExport.symbols +++ b/tests/baselines/reference/declarationEmitObjectAssignedDefaultExport.symbols @@ -1,22 +1,22 @@ //// [tests/cases/compiler/declarationEmitObjectAssignedDefaultExport.ts] //// === node_modules/styled-components/node_modules/hoist-non-react-statics/index.d.ts === -interface Statics { ->Statics : Symbol(Statics, Decl(index.d.ts, 0, 0)) +interface Statistics { +>Statistics : Symbol(Statistics, Decl(index.d.ts, 0, 0)) "$$whatever": string; ->"$$whatever" : Symbol(Statics["$$whatever"], Decl(index.d.ts, 0, 19)) +>"$$whatever" : Symbol(Statistics["$$whatever"], Decl(index.d.ts, 0, 19)) } declare namespace hoistNonReactStatics { >hoistNonReactStatics : Symbol(hoistNonReactStatics, Decl(index.d.ts, 2, 1)) - type NonReactStatics = {[X in Exclude]: T[X]} + type NonReactStatics = {[X in Exclude]: T[X]} >NonReactStatics : Symbol(NonReactStatics, Decl(index.d.ts, 3, 40)) >T : Symbol(T, Decl(index.d.ts, 4, 25)) >X : Symbol(X, Decl(index.d.ts, 4, 32)) >Exclude : Symbol(Exclude, Decl(lib.es5.d.ts, --, --)) >T : Symbol(T, Decl(index.d.ts, 4, 25)) ->Statics : Symbol(Statics, Decl(index.d.ts, 0, 0)) +>Statistics : Symbol(Statistics, Decl(index.d.ts, 0, 0)) >T : Symbol(T, Decl(index.d.ts, 4, 25)) >X : Symbol(X, Decl(index.d.ts, 4, 32)) } diff --git a/tests/baselines/reference/declarationEmitObjectAssignedDefaultExport.types b/tests/baselines/reference/declarationEmitObjectAssignedDefaultExport.types index 5a3cc01b9a127..334a84a81205c 100644 --- a/tests/baselines/reference/declarationEmitObjectAssignedDefaultExport.types +++ b/tests/baselines/reference/declarationEmitObjectAssignedDefaultExport.types @@ -1,13 +1,13 @@ //// [tests/cases/compiler/declarationEmitObjectAssignedDefaultExport.ts] //// === node_modules/styled-components/node_modules/hoist-non-react-statics/index.d.ts === -interface Statics { +interface Statistics { "$$whatever": string; >"$$whatever" : string > : ^^^^^^ } declare namespace hoistNonReactStatics { - type NonReactStatics = {[X in Exclude]: T[X]} + type NonReactStatics = {[X in Exclude]: T[X]} >NonReactStatics : NonReactStatics > : ^^^^^^^^^^^^^^^^^^ } diff --git a/tests/baselines/reference/declarationEmitSimpleComputedNames1.js b/tests/baselines/reference/declarationEmitSimpleComputedNames1.js index 317aaefcdc557..735688f5a3189 100644 --- a/tests/baselines/reference/declarationEmitSimpleComputedNames1.js +++ b/tests/baselines/reference/declarationEmitSimpleComputedNames1.js @@ -2,7 +2,7 @@ //// [declarationEmitSimpleComputedNames1.ts] export const fieldName = Math.random() > 0.5 ? "f1" : "f2"; -export const conatainer = { +export const container = { [fieldName]() { return "result"; } @@ -36,9 +36,9 @@ export const instanceLookup = (new Holder())["some" + "thing"]; //// [declarationEmitSimpleComputedNames1.js] "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -exports.instanceLookup = exports.staticLookup = exports.Holder = exports.conatainer = exports.fieldName = void 0; +exports.instanceLookup = exports.staticLookup = exports.Holder = exports.container = exports.fieldName = void 0; exports.fieldName = Math.random() > 0.5 ? "f1" : "f2"; -exports.conatainer = { +exports.container = { [exports.fieldName]() { return "result"; } @@ -70,7 +70,7 @@ exports.instanceLookup = (new Holder())["some" + "thing"]; //// [declarationEmitSimpleComputedNames1.d.ts] export declare const fieldName: string; -export declare const conatainer: { +export declare const container: { [fieldName]: () => string; }; declare const classFieldName: string; diff --git a/tests/baselines/reference/declarationEmitSimpleComputedNames1.symbols b/tests/baselines/reference/declarationEmitSimpleComputedNames1.symbols index 1259837be73d3..2c05bb48a5de6 100644 --- a/tests/baselines/reference/declarationEmitSimpleComputedNames1.symbols +++ b/tests/baselines/reference/declarationEmitSimpleComputedNames1.symbols @@ -7,8 +7,8 @@ export const fieldName = Math.random() > 0.5 ? "f1" : "f2"; >Math : Symbol(Math, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --)) >random : Symbol(Math.random, Decl(lib.es5.d.ts, --, --)) -export const conatainer = { ->conatainer : Symbol(conatainer, Decl(declarationEmitSimpleComputedNames1.ts, 1, 12)) +export const container = { +>container : Symbol(container, Decl(declarationEmitSimpleComputedNames1.ts, 1, 12)) [fieldName]() { >[fieldName] : Symbol([fieldName], Decl(declarationEmitSimpleComputedNames1.ts, 1, 27)) diff --git a/tests/baselines/reference/declarationEmitSimpleComputedNames1.types b/tests/baselines/reference/declarationEmitSimpleComputedNames1.types index 773301e49e9d7..c2b71f2bcf5ae 100644 --- a/tests/baselines/reference/declarationEmitSimpleComputedNames1.types +++ b/tests/baselines/reference/declarationEmitSimpleComputedNames1.types @@ -23,8 +23,8 @@ export const fieldName = Math.random() > 0.5 ? "f1" : "f2"; >"f2" : "f2" > : ^^^^ -export const conatainer = { ->conatainer : { [fieldName]: () => string; } +export const container = { +>container : { [fieldName]: () => string; } > : ^^ ^^^^^^^^^^^^ ^^ >{ [fieldName]() { return "result"; }} : { [fieldName]: () => string; } > : ^^ ^^^^^^^^^^^^ ^^ diff --git a/tests/baselines/reference/declareDottedModuleName.js b/tests/baselines/reference/declareDottedModuleName.js index 7d909005aed97..77f27af2c7694 100644 --- a/tests/baselines/reference/declareDottedModuleName.js +++ b/tests/baselines/reference/declareDottedModuleName.js @@ -2,7 +2,7 @@ //// [declareDottedModuleName.ts] namespace M { - namespace P.Q { } // This shouldnt be emitted + namespace P.Q { } // This shouldn't be emitted } namespace M { diff --git a/tests/baselines/reference/declareDottedModuleName.symbols b/tests/baselines/reference/declareDottedModuleName.symbols index 312a45e461d7c..3c2173f9452d1 100644 --- a/tests/baselines/reference/declareDottedModuleName.symbols +++ b/tests/baselines/reference/declareDottedModuleName.symbols @@ -4,7 +4,7 @@ namespace M { >M : Symbol(M, Decl(declareDottedModuleName.ts, 0, 0), Decl(declareDottedModuleName.ts, 2, 1)) - namespace P.Q { } // This shouldnt be emitted + namespace P.Q { } // This shouldn't be emitted >P : Symbol(P, Decl(declareDottedModuleName.ts, 0, 13)) >Q : Symbol(Q, Decl(declareDottedModuleName.ts, 1, 16)) } diff --git a/tests/baselines/reference/declareDottedModuleName.types b/tests/baselines/reference/declareDottedModuleName.types index d60ae6bc6d54e..6050b21570b66 100644 --- a/tests/baselines/reference/declareDottedModuleName.types +++ b/tests/baselines/reference/declareDottedModuleName.types @@ -3,7 +3,7 @@ === declareDottedModuleName.ts === namespace M { - namespace P.Q { } // This shouldnt be emitted + namespace P.Q { } // This shouldn't be emitted } namespace M { diff --git a/tests/baselines/reference/decrementOperatorWithAnyOtherType.js b/tests/baselines/reference/decrementOperatorWithAnyOtherType.js index 7bf58f9d293c4..087699164270c 100644 --- a/tests/baselines/reference/decrementOperatorWithAnyOtherType.js +++ b/tests/baselines/reference/decrementOperatorWithAnyOtherType.js @@ -35,7 +35,7 @@ var ResultIsNumber11 = obj.y--; var ResultIsNumber12 = objA.a--; var ResultIsNumber13 = M.n--; -// miss assignment opertors +// miss assignment operators --ANY; --ANY1; --ANY2[0]; @@ -79,7 +79,7 @@ var ResultIsNumber10 = obj.x--; var ResultIsNumber11 = obj.y--; var ResultIsNumber12 = objA.a--; var ResultIsNumber13 = M.n--; -// miss assignment opertors +// miss assignment operators --ANY; --ANY1; --ANY2[0]; diff --git a/tests/baselines/reference/decrementOperatorWithAnyOtherType.symbols b/tests/baselines/reference/decrementOperatorWithAnyOtherType.symbols index c424934e1e444..2c4ac0c8c61b6 100644 --- a/tests/baselines/reference/decrementOperatorWithAnyOtherType.symbols +++ b/tests/baselines/reference/decrementOperatorWithAnyOtherType.symbols @@ -107,7 +107,7 @@ var ResultIsNumber13 = M.n--; >M : Symbol(M, Decl(decrementOperatorWithAnyOtherType.ts, 8, 1)) >n : Symbol(M.n, Decl(decrementOperatorWithAnyOtherType.ts, 10, 14)) -// miss assignment opertors +// miss assignment operators --ANY; >ANY : Symbol(ANY, Decl(decrementOperatorWithAnyOtherType.ts, 2, 3)) diff --git a/tests/baselines/reference/decrementOperatorWithAnyOtherType.types b/tests/baselines/reference/decrementOperatorWithAnyOtherType.types index 2b038fd879da2..b43a5d8ad62fe 100644 --- a/tests/baselines/reference/decrementOperatorWithAnyOtherType.types +++ b/tests/baselines/reference/decrementOperatorWithAnyOtherType.types @@ -195,7 +195,7 @@ var ResultIsNumber13 = M.n--; >n : any > : ^^^ -// miss assignment opertors +// miss assignment operators --ANY; >--ANY : number > : ^^^^^^ diff --git a/tests/baselines/reference/deeplyDependentLargeArrayMutation2.symbols b/tests/baselines/reference/deeplyDependentLargeArrayMutation2.symbols index f06794d0aefe9..11128aa30fe91 100644 --- a/tests/baselines/reference/deeplyDependentLargeArrayMutation2.symbols +++ b/tests/baselines/reference/deeplyDependentLargeArrayMutation2.symbols @@ -4,7 +4,7 @@ // Looking at this test and thinking "that's silly, nobody would write code like that" and thinking it's OK to break this test? // You'd be wrong - https://raw.githubusercontent.com/archilogic-com/3dio-js/master/build/3dio.js and plenty of other codebases // have js code exactly like this! This pattern (even at this size!) with a few more embellishments is a common way to encode -// polygons or verticies into a buffer from a formulaic object definition! So while this is a lot more regular than a real piece +// polygons or vertices into a buffer from a formulaic object definition! So while this is a lot more regular than a real piece // of code, this is still representative of a common pattern. function build() { >build : Symbol(build, Decl(foo.js, 0, 0)) diff --git a/tests/baselines/reference/deeplyDependentLargeArrayMutation2.types b/tests/baselines/reference/deeplyDependentLargeArrayMutation2.types index a8456254b4e37..bd2244309ccc5 100644 --- a/tests/baselines/reference/deeplyDependentLargeArrayMutation2.types +++ b/tests/baselines/reference/deeplyDependentLargeArrayMutation2.types @@ -4,7 +4,7 @@ // Looking at this test and thinking "that's silly, nobody would write code like that" and thinking it's OK to break this test? // You'd be wrong - https://raw.githubusercontent.com/archilogic-com/3dio-js/master/build/3dio.js and plenty of other codebases // have js code exactly like this! This pattern (even at this size!) with a few more embellishments is a common way to encode -// polygons or verticies into a buffer from a formulaic object definition! So while this is a lot more regular than a real piece +// polygons or vertices into a buffer from a formulaic object definition! So while this is a lot more regular than a real piece // of code, this is still representative of a common pattern. function build() { >build : () => any[] diff --git a/tests/baselines/reference/derivedInterfaceIncompatibleWithBaseIndexer.errors.txt b/tests/baselines/reference/derivedInterfaceIncompatibleWithBaseIndexer.errors.txt index e0e6b8787277b..0339b1078a72b 100644 --- a/tests/baselines/reference/derivedInterfaceIncompatibleWithBaseIndexer.errors.txt +++ b/tests/baselines/reference/derivedInterfaceIncompatibleWithBaseIndexer.errors.txt @@ -41,7 +41,7 @@ derivedInterfaceIncompatibleWithBaseIndexer.ts(24,5): error TS2411: Property '1' !!! error TS2411: Property 'foo' of type '() => { x: number; }' is not assignable to 'string' index type '{ x: number; }'. } - // satisifies string indexer but not numeric indexer + // satisfies string indexer but not numeric indexer interface Derived5 extends Base { 1: { x: number } // error ~ diff --git a/tests/baselines/reference/derivedInterfaceIncompatibleWithBaseIndexer.js b/tests/baselines/reference/derivedInterfaceIncompatibleWithBaseIndexer.js index 1dae7ab886ecc..1375891b14beb 100644 --- a/tests/baselines/reference/derivedInterfaceIncompatibleWithBaseIndexer.js +++ b/tests/baselines/reference/derivedInterfaceIncompatibleWithBaseIndexer.js @@ -22,7 +22,7 @@ interface Derived4 extends Base { foo(): { x: number } // error } -// satisifies string indexer but not numeric indexer +// satisfies string indexer but not numeric indexer interface Derived5 extends Base { 1: { x: number } // error } diff --git a/tests/baselines/reference/derivedInterfaceIncompatibleWithBaseIndexer.symbols b/tests/baselines/reference/derivedInterfaceIncompatibleWithBaseIndexer.symbols index 49e157665af84..39a64288014c9 100644 --- a/tests/baselines/reference/derivedInterfaceIncompatibleWithBaseIndexer.symbols +++ b/tests/baselines/reference/derivedInterfaceIncompatibleWithBaseIndexer.symbols @@ -50,7 +50,7 @@ interface Derived4 extends Base { >x : Symbol(x, Decl(derivedInterfaceIncompatibleWithBaseIndexer.ts, 18, 12)) } -// satisifies string indexer but not numeric indexer +// satisfies string indexer but not numeric indexer interface Derived5 extends Base { >Derived5 : Symbol(Derived5, Decl(derivedInterfaceIncompatibleWithBaseIndexer.ts, 19, 1), Decl(derivedInterfaceIncompatibleWithBaseIndexer.ts, 24, 1)) >Base : Symbol(Base, Decl(derivedInterfaceIncompatibleWithBaseIndexer.ts, 0, 0)) diff --git a/tests/baselines/reference/derivedInterfaceIncompatibleWithBaseIndexer.types b/tests/baselines/reference/derivedInterfaceIncompatibleWithBaseIndexer.types index 12cec82c8f57c..a49416ee11819 100644 --- a/tests/baselines/reference/derivedInterfaceIncompatibleWithBaseIndexer.types +++ b/tests/baselines/reference/derivedInterfaceIncompatibleWithBaseIndexer.types @@ -49,7 +49,7 @@ interface Derived4 extends Base { > : ^^^^^^ } -// satisifies string indexer but not numeric indexer +// satisfies string indexer but not numeric indexer interface Derived5 extends Base { 1: { x: number } // error >1 : { x: number; } diff --git a/tests/baselines/reference/destructuringControlFlow.errors.txt b/tests/baselines/reference/destructuringControlFlow.errors.txt index db98ab8d4091f..2bb40b5065188 100644 --- a/tests/baselines/reference/destructuringControlFlow.errors.txt +++ b/tests/baselines/reference/destructuringControlFlow.errors.txt @@ -41,7 +41,7 @@ destructuringControlFlow.ts(40,1): error TS18048: 'value' is possibly 'undefined ({ ["x"]: x } = 0); // Error ~~~ !!! error TS2339: Property 'x' does not exist on type 'Number'. - ({ ["x" + ""]: x } = 0); // Errpr + ({ ["x" + ""]: x } = 0); // Error ~~~~~~~~ !!! error TS2537: Type 'Number' has no matching index signature for type 'string'. } diff --git a/tests/baselines/reference/destructuringControlFlow.js b/tests/baselines/reference/destructuringControlFlow.js index ba5018b5a6b42..6ab3a2f27e4e6 100644 --- a/tests/baselines/reference/destructuringControlFlow.js +++ b/tests/baselines/reference/destructuringControlFlow.js @@ -33,7 +33,7 @@ function f4() { let x: boolean; ({ x } = 0); // Error ({ ["x"]: x } = 0); // Error - ({ ["x" + ""]: x } = 0); // Errpr + ({ ["x" + ""]: x } = 0); // Error } // Repro from #31770 @@ -74,7 +74,7 @@ function f4() { let x; ({ x } = 0); // Error ({ ["x"]: x } = 0); // Error - ({ ["x" + ""]: x } = 0); // Errpr + ({ ["x" + ""]: x } = 0); // Error } let [key, value] = ["foo"]; value.toUpperCase(); // Error diff --git a/tests/baselines/reference/destructuringControlFlow.symbols b/tests/baselines/reference/destructuringControlFlow.symbols index f43214286e04c..1c76847358680 100644 --- a/tests/baselines/reference/destructuringControlFlow.symbols +++ b/tests/baselines/reference/destructuringControlFlow.symbols @@ -119,7 +119,7 @@ function f4() { >"x" : Symbol(["x"], Decl(destructuringControlFlow.ts, 31, 6)) >x : Symbol(x, Decl(destructuringControlFlow.ts, 29, 7)) - ({ ["x" + ""]: x } = 0); // Errpr + ({ ["x" + ""]: x } = 0); // Error >["x" + ""] : Symbol(["x" + ""], Decl(destructuringControlFlow.ts, 32, 6)) >x : Symbol(x, Decl(destructuringControlFlow.ts, 29, 7)) } diff --git a/tests/baselines/reference/destructuringControlFlow.types b/tests/baselines/reference/destructuringControlFlow.types index 053f79fdf6504..ba07b4081a6d8 100644 --- a/tests/baselines/reference/destructuringControlFlow.types +++ b/tests/baselines/reference/destructuringControlFlow.types @@ -241,7 +241,7 @@ function f4() { >0 : 0 > : ^ - ({ ["x" + ""]: x } = 0); // Errpr + ({ ["x" + ""]: x } = 0); // Error >({ ["x" + ""]: x } = 0) : 0 > : ^ >{ ["x" + ""]: x } = 0 : 0 diff --git a/tests/baselines/reference/destructuringTypeGuardFlow.js b/tests/baselines/reference/destructuringTypeGuardFlow.js index 1128772e35d78..b6894e82194d3 100644 --- a/tests/baselines/reference/destructuringTypeGuardFlow.js +++ b/tests/baselines/reference/destructuringTypeGuardFlow.js @@ -17,7 +17,7 @@ if (aFoo.bar && aFoo.nested.b) { const right: number = aFoo.bar; const wrong: number = bar; const another: string = baz; - const aAgain: number = a; + const again: number = a; const bAgain: string = text; } @@ -33,7 +33,7 @@ if (bBar.elem2 && bBar.elem2.bar && bBar.elem2.nested.b) { const right: number = bBar.elem2.bar; const wrong: number = bar; const another: string = baz; - const aAgain: number = a; + const again: number = a; const bAgain: string = text; } @@ -46,7 +46,7 @@ if (aFoo.bar && aFoo.nested.b) { const right = aFoo.bar; const wrong = bar; const another = baz; - const aAgain = a; + const again = a; const bAgain = text; } const bBar = { elem1: 7, elem2: aFoo }; @@ -55,6 +55,6 @@ if (bBar.elem2 && bBar.elem2.bar && bBar.elem2.nested.b) { const right = bBar.elem2.bar; const wrong = bar; const another = baz; - const aAgain = a; + const again = a; const bAgain = text; } diff --git a/tests/baselines/reference/destructuringTypeGuardFlow.symbols b/tests/baselines/reference/destructuringTypeGuardFlow.symbols index bc324104d5c55..263e43e9f8f5c 100644 --- a/tests/baselines/reference/destructuringTypeGuardFlow.symbols +++ b/tests/baselines/reference/destructuringTypeGuardFlow.symbols @@ -63,8 +63,8 @@ if (aFoo.bar && aFoo.nested.b) { >another : Symbol(another, Decl(destructuringTypeGuardFlow.ts, 15, 7)) >baz : Symbol(baz, Decl(destructuringTypeGuardFlow.ts, 12, 14)) - const aAgain: number = a; ->aAgain : Symbol(aAgain, Decl(destructuringTypeGuardFlow.ts, 16, 7)) + const again: number = a; +>again : Symbol(again, Decl(destructuringTypeGuardFlow.ts, 16, 7)) >a : Symbol(a, Decl(destructuringTypeGuardFlow.ts, 12, 29)) const bAgain: string = text; @@ -134,8 +134,8 @@ if (bBar.elem2 && bBar.elem2.bar && bBar.elem2.nested.b) { >another : Symbol(another, Decl(destructuringTypeGuardFlow.ts, 31, 7)) >baz : Symbol(baz, Decl(destructuringTypeGuardFlow.ts, 28, 14)) - const aAgain: number = a; ->aAgain : Symbol(aAgain, Decl(destructuringTypeGuardFlow.ts, 32, 7)) + const again: number = a; +>again : Symbol(again, Decl(destructuringTypeGuardFlow.ts, 32, 7)) >a : Symbol(a, Decl(destructuringTypeGuardFlow.ts, 28, 29)) const bAgain: string = text; diff --git a/tests/baselines/reference/destructuringTypeGuardFlow.types b/tests/baselines/reference/destructuringTypeGuardFlow.types index 1b80b443cb905..93cdfa770016e 100644 --- a/tests/baselines/reference/destructuringTypeGuardFlow.types +++ b/tests/baselines/reference/destructuringTypeGuardFlow.types @@ -111,8 +111,8 @@ if (aFoo.bar && aFoo.nested.b) { >baz : string > : ^^^^^^ - const aAgain: number = a; ->aAgain : number + const again: number = a; +>again : number > : ^^^^^^ >a : number > : ^^^^^^ @@ -234,8 +234,8 @@ if (bBar.elem2 && bBar.elem2.bar && bBar.elem2.nested.b) { >baz : string > : ^^^^^^ - const aAgain: number = a; ->aAgain : number + const again: number = a; +>again : number > : ^^^^^^ >a : number > : ^^^^^^ diff --git a/tests/baselines/reference/doNotElaborateAssignabilityToTypeParameters(target=es5).js b/tests/baselines/reference/doNotElaborateAssignabilityToTypeParameters(target=es5).js index 5fd52beedd632..72cf642ce5764 100644 --- a/tests/baselines/reference/doNotElaborateAssignabilityToTypeParameters(target=es5).js +++ b/tests/baselines/reference/doNotElaborateAssignabilityToTypeParameters(target=es5).js @@ -26,7 +26,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge }); }; var __generator = (this && this.__generator) || function (thisArg, body) { - var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); + var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, tries: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; function verb(n) { return function (v) { return step([n, v]); }; } function step(op) { @@ -38,14 +38,14 @@ var __generator = (this && this.__generator) || function (thisArg, body) { case 0: case 1: t = op; break; case 4: _.label++; return { value: op[1], done: false }; case 5: _.label++; y = op[1]; op = [0]; continue; - case 7: op = _.ops.pop(); _.trys.pop(); continue; + case 7: op = _.ops.pop(); _.tries.pop(); continue; default: - if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } + if (!(t = _.tries, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } if (t[2]) _.ops.pop(); - _.trys.pop(); continue; + _.tries.pop(); continue; } op = body.call(thisArg, _); } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } diff --git a/tests/baselines/reference/emitter.asyncGenerators.classMethods.es5(target=es5).js b/tests/baselines/reference/emitter.asyncGenerators.classMethods.es5(target=es5).js index 23a3065261b9a..9d16a9fec8434 100644 --- a/tests/baselines/reference/emitter.asyncGenerators.classMethods.es5(target=es5).js +++ b/tests/baselines/reference/emitter.asyncGenerators.classMethods.es5(target=es5).js @@ -63,7 +63,7 @@ class C9 extends B9 { //// [C1.js] "use strict"; var __generator = (this && this.__generator) || function (thisArg, body) { - var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); + var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, tries: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; function verb(n) { return function (v) { return step([n, v]); }; } function step(op) { @@ -75,14 +75,14 @@ var __generator = (this && this.__generator) || function (thisArg, body) { case 0: case 1: t = op; break; case 4: _.label++; return { value: op[1], done: false }; case 5: _.label++; y = op[1]; op = [0]; continue; - case 7: op = _.ops.pop(); _.trys.pop(); continue; + case 7: op = _.ops.pop(); _.tries.pop(); continue; default: - if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } + if (!(t = _.tries, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } if (t[2]) _.ops.pop(); - _.trys.pop(); continue; + _.tries.pop(); continue; } op = body.call(thisArg, _); } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } @@ -117,7 +117,7 @@ var C1 = /** @class */ (function () { //// [C2.js] "use strict"; var __generator = (this && this.__generator) || function (thisArg, body) { - var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); + var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, tries: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; function verb(n) { return function (v) { return step([n, v]); }; } function step(op) { @@ -129,14 +129,14 @@ var __generator = (this && this.__generator) || function (thisArg, body) { case 0: case 1: t = op; break; case 4: _.label++; return { value: op[1], done: false }; case 5: _.label++; y = op[1]; op = [0]; continue; - case 7: op = _.ops.pop(); _.trys.pop(); continue; + case 7: op = _.ops.pop(); _.tries.pop(); continue; default: - if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } + if (!(t = _.tries, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } if (t[2]) _.ops.pop(); - _.trys.pop(); continue; + _.tries.pop(); continue; } op = body.call(thisArg, _); } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } @@ -178,7 +178,7 @@ var C2 = /** @class */ (function () { //// [C3.js] "use strict"; var __generator = (this && this.__generator) || function (thisArg, body) { - var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); + var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, tries: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; function verb(n) { return function (v) { return step([n, v]); }; } function step(op) { @@ -190,14 +190,14 @@ var __generator = (this && this.__generator) || function (thisArg, body) { case 0: case 1: t = op; break; case 4: _.label++; return { value: op[1], done: false }; case 5: _.label++; y = op[1]; op = [0]; continue; - case 7: op = _.ops.pop(); _.trys.pop(); continue; + case 7: op = _.ops.pop(); _.tries.pop(); continue; default: - if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } + if (!(t = _.tries, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } if (t[2]) _.ops.pop(); - _.trys.pop(); continue; + _.tries.pop(); continue; } op = body.call(thisArg, _); } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } @@ -239,7 +239,7 @@ var C3 = /** @class */ (function () { //// [C4.js] "use strict"; var __generator = (this && this.__generator) || function (thisArg, body) { - var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); + var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, tries: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; function verb(n) { return function (v) { return step([n, v]); }; } function step(op) { @@ -251,14 +251,14 @@ var __generator = (this && this.__generator) || function (thisArg, body) { case 0: case 1: t = op; break; case 4: _.label++; return { value: op[1], done: false }; case 5: _.label++; y = op[1]; op = [0]; continue; - case 7: op = _.ops.pop(); _.trys.pop(); continue; + case 7: op = _.ops.pop(); _.tries.pop(); continue; default: - if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } + if (!(t = _.tries, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } if (t[2]) _.ops.pop(); - _.trys.pop(); continue; + _.tries.pop(); continue; } op = body.call(thisArg, _); } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } @@ -323,7 +323,7 @@ var C4 = /** @class */ (function () { //// [C5.js] "use strict"; var __generator = (this && this.__generator) || function (thisArg, body) { - var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); + var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, tries: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; function verb(n) { return function (v) { return step([n, v]); }; } function step(op) { @@ -335,14 +335,14 @@ var __generator = (this && this.__generator) || function (thisArg, body) { case 0: case 1: t = op; break; case 4: _.label++; return { value: op[1], done: false }; case 5: _.label++; y = op[1]; op = [0]; continue; - case 7: op = _.ops.pop(); _.trys.pop(); continue; + case 7: op = _.ops.pop(); _.tries.pop(); continue; default: - if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } + if (!(t = _.tries, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } if (t[2]) _.ops.pop(); - _.trys.pop(); continue; + _.tries.pop(); continue; } op = body.call(thisArg, _); } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } @@ -415,7 +415,7 @@ var C5 = /** @class */ (function () { //// [C6.js] "use strict"; var __generator = (this && this.__generator) || function (thisArg, body) { - var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); + var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, tries: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; function verb(n) { return function (v) { return step([n, v]); }; } function step(op) { @@ -427,14 +427,14 @@ var __generator = (this && this.__generator) || function (thisArg, body) { case 0: case 1: t = op; break; case 4: _.label++; return { value: op[1], done: false }; case 5: _.label++; y = op[1]; op = [0]; continue; - case 7: op = _.ops.pop(); _.trys.pop(); continue; + case 7: op = _.ops.pop(); _.tries.pop(); continue; default: - if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } + if (!(t = _.tries, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } if (t[2]) _.ops.pop(); - _.trys.pop(); continue; + _.tries.pop(); continue; } op = body.call(thisArg, _); } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } @@ -475,7 +475,7 @@ var C6 = /** @class */ (function () { //// [C7.js] "use strict"; var __generator = (this && this.__generator) || function (thisArg, body) { - var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); + var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, tries: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; function verb(n) { return function (v) { return step([n, v]); }; } function step(op) { @@ -487,14 +487,14 @@ var __generator = (this && this.__generator) || function (thisArg, body) { case 0: case 1: t = op; break; case 4: _.label++; return { value: op[1], done: false }; case 5: _.label++; y = op[1]; op = [0]; continue; - case 7: op = _.ops.pop(); _.trys.pop(); continue; + case 7: op = _.ops.pop(); _.tries.pop(); continue; default: - if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } + if (!(t = _.tries, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } if (t[2]) _.ops.pop(); - _.trys.pop(); continue; + _.tries.pop(); continue; } op = body.call(thisArg, _); } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } @@ -532,7 +532,7 @@ var C7 = /** @class */ (function () { //// [C8.js] "use strict"; var __generator = (this && this.__generator) || function (thisArg, body) { - var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); + var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, tries: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; function verb(n) { return function (v) { return step([n, v]); }; } function step(op) { @@ -544,14 +544,14 @@ var __generator = (this && this.__generator) || function (thisArg, body) { case 0: case 1: t = op; break; case 4: _.label++; return { value: op[1], done: false }; case 5: _.label++; y = op[1]; op = [0]; continue; - case 7: op = _.ops.pop(); _.trys.pop(); continue; + case 7: op = _.ops.pop(); _.tries.pop(); continue; default: - if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } + if (!(t = _.tries, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } if (t[2]) _.ops.pop(); - _.trys.pop(); continue; + _.tries.pop(); continue; } op = body.call(thisArg, _); } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } @@ -604,7 +604,7 @@ var __extends = (this && this.__extends) || (function () { }; })(); var __generator = (this && this.__generator) || function (thisArg, body) { - var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); + var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, tries: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; function verb(n) { return function (v) { return step([n, v]); }; } function step(op) { @@ -616,14 +616,14 @@ var __generator = (this && this.__generator) || function (thisArg, body) { case 0: case 1: t = op; break; case 4: _.label++; return { value: op[1], done: false }; case 5: _.label++; y = op[1]; op = [0]; continue; - case 7: op = _.ops.pop(); _.trys.pop(); continue; + case 7: op = _.ops.pop(); _.tries.pop(); continue; default: - if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } + if (!(t = _.tries, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } if (t[2]) _.ops.pop(); - _.trys.pop(); continue; + _.tries.pop(); continue; } op = body.call(thisArg, _); } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } diff --git a/tests/baselines/reference/emitter.asyncGenerators.functionDeclarations.es5(target=es5).js b/tests/baselines/reference/emitter.asyncGenerators.functionDeclarations.es5(target=es5).js index ba085d7ae90df..4753a697a23f3 100644 --- a/tests/baselines/reference/emitter.asyncGenerators.functionDeclarations.es5(target=es5).js +++ b/tests/baselines/reference/emitter.asyncGenerators.functionDeclarations.es5(target=es5).js @@ -32,7 +32,7 @@ async function * f7() { //// [F1.js] "use strict"; var __generator = (this && this.__generator) || function (thisArg, body) { - var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); + var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, tries: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; function verb(n) { return function (v) { return step([n, v]); }; } function step(op) { @@ -44,14 +44,14 @@ var __generator = (this && this.__generator) || function (thisArg, body) { case 0: case 1: t = op; break; case 4: _.label++; return { value: op[1], done: false }; case 5: _.label++; y = op[1]; op = [0]; continue; - case 7: op = _.ops.pop(); _.trys.pop(); continue; + case 7: op = _.ops.pop(); _.tries.pop(); continue; default: - if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } + if (!(t = _.tries, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } if (t[2]) _.ops.pop(); - _.trys.pop(); continue; + _.tries.pop(); continue; } op = body.call(thisArg, _); } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } @@ -81,7 +81,7 @@ function f1() { //// [F2.js] "use strict"; var __generator = (this && this.__generator) || function (thisArg, body) { - var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); + var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, tries: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; function verb(n) { return function (v) { return step([n, v]); }; } function step(op) { @@ -93,14 +93,14 @@ var __generator = (this && this.__generator) || function (thisArg, body) { case 0: case 1: t = op; break; case 4: _.label++; return { value: op[1], done: false }; case 5: _.label++; y = op[1]; op = [0]; continue; - case 7: op = _.ops.pop(); _.trys.pop(); continue; + case 7: op = _.ops.pop(); _.tries.pop(); continue; default: - if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } + if (!(t = _.tries, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } if (t[2]) _.ops.pop(); - _.trys.pop(); continue; + _.tries.pop(); continue; } op = body.call(thisArg, _); } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } @@ -137,7 +137,7 @@ function f2() { //// [F3.js] "use strict"; var __generator = (this && this.__generator) || function (thisArg, body) { - var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); + var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, tries: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; function verb(n) { return function (v) { return step([n, v]); }; } function step(op) { @@ -149,14 +149,14 @@ var __generator = (this && this.__generator) || function (thisArg, body) { case 0: case 1: t = op; break; case 4: _.label++; return { value: op[1], done: false }; case 5: _.label++; y = op[1]; op = [0]; continue; - case 7: op = _.ops.pop(); _.trys.pop(); continue; + case 7: op = _.ops.pop(); _.tries.pop(); continue; default: - if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } + if (!(t = _.tries, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } if (t[2]) _.ops.pop(); - _.trys.pop(); continue; + _.tries.pop(); continue; } op = body.call(thisArg, _); } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } @@ -193,7 +193,7 @@ function f3() { //// [F4.js] "use strict"; var __generator = (this && this.__generator) || function (thisArg, body) { - var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); + var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, tries: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; function verb(n) { return function (v) { return step([n, v]); }; } function step(op) { @@ -205,14 +205,14 @@ var __generator = (this && this.__generator) || function (thisArg, body) { case 0: case 1: t = op; break; case 4: _.label++; return { value: op[1], done: false }; case 5: _.label++; y = op[1]; op = [0]; continue; - case 7: op = _.ops.pop(); _.trys.pop(); continue; + case 7: op = _.ops.pop(); _.tries.pop(); continue; default: - if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } + if (!(t = _.tries, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } if (t[2]) _.ops.pop(); - _.trys.pop(); continue; + _.tries.pop(); continue; } op = body.call(thisArg, _); } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } @@ -272,7 +272,7 @@ function f4() { //// [F5.js] "use strict"; var __generator = (this && this.__generator) || function (thisArg, body) { - var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); + var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, tries: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; function verb(n) { return function (v) { return step([n, v]); }; } function step(op) { @@ -284,14 +284,14 @@ var __generator = (this && this.__generator) || function (thisArg, body) { case 0: case 1: t = op; break; case 4: _.label++; return { value: op[1], done: false }; case 5: _.label++; y = op[1]; op = [0]; continue; - case 7: op = _.ops.pop(); _.trys.pop(); continue; + case 7: op = _.ops.pop(); _.tries.pop(); continue; default: - if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } + if (!(t = _.tries, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } if (t[2]) _.ops.pop(); - _.trys.pop(); continue; + _.tries.pop(); continue; } op = body.call(thisArg, _); } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } @@ -359,7 +359,7 @@ function f5() { //// [F6.js] "use strict"; var __generator = (this && this.__generator) || function (thisArg, body) { - var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); + var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, tries: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; function verb(n) { return function (v) { return step([n, v]); }; } function step(op) { @@ -371,14 +371,14 @@ var __generator = (this && this.__generator) || function (thisArg, body) { case 0: case 1: t = op; break; case 4: _.label++; return { value: op[1], done: false }; case 5: _.label++; y = op[1]; op = [0]; continue; - case 7: op = _.ops.pop(); _.trys.pop(); continue; + case 7: op = _.ops.pop(); _.tries.pop(); continue; default: - if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } + if (!(t = _.tries, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } if (t[2]) _.ops.pop(); - _.trys.pop(); continue; + _.tries.pop(); continue; } op = body.call(thisArg, _); } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } @@ -414,7 +414,7 @@ function f6() { //// [F7.js] "use strict"; var __generator = (this && this.__generator) || function (thisArg, body) { - var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); + var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, tries: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; function verb(n) { return function (v) { return step([n, v]); }; } function step(op) { @@ -426,14 +426,14 @@ var __generator = (this && this.__generator) || function (thisArg, body) { case 0: case 1: t = op; break; case 4: _.label++; return { value: op[1], done: false }; case 5: _.label++; y = op[1]; op = [0]; continue; - case 7: op = _.ops.pop(); _.trys.pop(); continue; + case 7: op = _.ops.pop(); _.tries.pop(); continue; default: - if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } + if (!(t = _.tries, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } if (t[2]) _.ops.pop(); - _.trys.pop(); continue; + _.tries.pop(); continue; } op = body.call(thisArg, _); } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } diff --git a/tests/baselines/reference/emitter.asyncGenerators.functionExpressions.es5(target=es5).js b/tests/baselines/reference/emitter.asyncGenerators.functionExpressions.es5(target=es5).js index 94653f74a81a2..474399f8999df 100644 --- a/tests/baselines/reference/emitter.asyncGenerators.functionExpressions.es5(target=es5).js +++ b/tests/baselines/reference/emitter.asyncGenerators.functionExpressions.es5(target=es5).js @@ -32,7 +32,7 @@ const f7 = async function * () { //// [F1.js] "use strict"; var __generator = (this && this.__generator) || function (thisArg, body) { - var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); + var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, tries: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; function verb(n) { return function (v) { return step([n, v]); }; } function step(op) { @@ -44,14 +44,14 @@ var __generator = (this && this.__generator) || function (thisArg, body) { case 0: case 1: t = op; break; case 4: _.label++; return { value: op[1], done: false }; case 5: _.label++; y = op[1]; op = [0]; continue; - case 7: op = _.ops.pop(); _.trys.pop(); continue; + case 7: op = _.ops.pop(); _.tries.pop(); continue; default: - if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } + if (!(t = _.tries, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } if (t[2]) _.ops.pop(); - _.trys.pop(); continue; + _.tries.pop(); continue; } op = body.call(thisArg, _); } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } @@ -81,7 +81,7 @@ var f1 = function () { //// [F2.js] "use strict"; var __generator = (this && this.__generator) || function (thisArg, body) { - var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); + var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, tries: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; function verb(n) { return function (v) { return step([n, v]); }; } function step(op) { @@ -93,14 +93,14 @@ var __generator = (this && this.__generator) || function (thisArg, body) { case 0: case 1: t = op; break; case 4: _.label++; return { value: op[1], done: false }; case 5: _.label++; y = op[1]; op = [0]; continue; - case 7: op = _.ops.pop(); _.trys.pop(); continue; + case 7: op = _.ops.pop(); _.tries.pop(); continue; default: - if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } + if (!(t = _.tries, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } if (t[2]) _.ops.pop(); - _.trys.pop(); continue; + _.tries.pop(); continue; } op = body.call(thisArg, _); } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } @@ -137,7 +137,7 @@ var f2 = function () { //// [F3.js] "use strict"; var __generator = (this && this.__generator) || function (thisArg, body) { - var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); + var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, tries: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; function verb(n) { return function (v) { return step([n, v]); }; } function step(op) { @@ -149,14 +149,14 @@ var __generator = (this && this.__generator) || function (thisArg, body) { case 0: case 1: t = op; break; case 4: _.label++; return { value: op[1], done: false }; case 5: _.label++; y = op[1]; op = [0]; continue; - case 7: op = _.ops.pop(); _.trys.pop(); continue; + case 7: op = _.ops.pop(); _.tries.pop(); continue; default: - if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } + if (!(t = _.tries, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } if (t[2]) _.ops.pop(); - _.trys.pop(); continue; + _.tries.pop(); continue; } op = body.call(thisArg, _); } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } @@ -193,7 +193,7 @@ var f3 = function () { //// [F4.js] "use strict"; var __generator = (this && this.__generator) || function (thisArg, body) { - var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); + var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, tries: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; function verb(n) { return function (v) { return step([n, v]); }; } function step(op) { @@ -205,14 +205,14 @@ var __generator = (this && this.__generator) || function (thisArg, body) { case 0: case 1: t = op; break; case 4: _.label++; return { value: op[1], done: false }; case 5: _.label++; y = op[1]; op = [0]; continue; - case 7: op = _.ops.pop(); _.trys.pop(); continue; + case 7: op = _.ops.pop(); _.tries.pop(); continue; default: - if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } + if (!(t = _.tries, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } if (t[2]) _.ops.pop(); - _.trys.pop(); continue; + _.tries.pop(); continue; } op = body.call(thisArg, _); } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } @@ -272,7 +272,7 @@ var f4 = function () { //// [F5.js] "use strict"; var __generator = (this && this.__generator) || function (thisArg, body) { - var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); + var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, tries: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; function verb(n) { return function (v) { return step([n, v]); }; } function step(op) { @@ -284,14 +284,14 @@ var __generator = (this && this.__generator) || function (thisArg, body) { case 0: case 1: t = op; break; case 4: _.label++; return { value: op[1], done: false }; case 5: _.label++; y = op[1]; op = [0]; continue; - case 7: op = _.ops.pop(); _.trys.pop(); continue; + case 7: op = _.ops.pop(); _.tries.pop(); continue; default: - if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } + if (!(t = _.tries, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } if (t[2]) _.ops.pop(); - _.trys.pop(); continue; + _.tries.pop(); continue; } op = body.call(thisArg, _); } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } @@ -359,7 +359,7 @@ var f5 = function () { //// [F6.js] "use strict"; var __generator = (this && this.__generator) || function (thisArg, body) { - var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); + var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, tries: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; function verb(n) { return function (v) { return step([n, v]); }; } function step(op) { @@ -371,14 +371,14 @@ var __generator = (this && this.__generator) || function (thisArg, body) { case 0: case 1: t = op; break; case 4: _.label++; return { value: op[1], done: false }; case 5: _.label++; y = op[1]; op = [0]; continue; - case 7: op = _.ops.pop(); _.trys.pop(); continue; + case 7: op = _.ops.pop(); _.tries.pop(); continue; default: - if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } + if (!(t = _.tries, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } if (t[2]) _.ops.pop(); - _.trys.pop(); continue; + _.tries.pop(); continue; } op = body.call(thisArg, _); } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } @@ -414,7 +414,7 @@ var f6 = function () { //// [F7.js] "use strict"; var __generator = (this && this.__generator) || function (thisArg, body) { - var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); + var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, tries: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; function verb(n) { return function (v) { return step([n, v]); }; } function step(op) { @@ -426,14 +426,14 @@ var __generator = (this && this.__generator) || function (thisArg, body) { case 0: case 1: t = op; break; case 4: _.label++; return { value: op[1], done: false }; case 5: _.label++; y = op[1]; op = [0]; continue; - case 7: op = _.ops.pop(); _.trys.pop(); continue; + case 7: op = _.ops.pop(); _.tries.pop(); continue; default: - if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } + if (!(t = _.tries, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } if (t[2]) _.ops.pop(); - _.trys.pop(); continue; + _.tries.pop(); continue; } op = body.call(thisArg, _); } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } diff --git a/tests/baselines/reference/emitter.asyncGenerators.objectLiteralMethods.es5(target=es5).js b/tests/baselines/reference/emitter.asyncGenerators.objectLiteralMethods.es5(target=es5).js index 4cf06b6c773a4..c689c1a4b4e81 100644 --- a/tests/baselines/reference/emitter.asyncGenerators.objectLiteralMethods.es5(target=es5).js +++ b/tests/baselines/reference/emitter.asyncGenerators.objectLiteralMethods.es5(target=es5).js @@ -46,7 +46,7 @@ const o7 = { //// [O1.js] "use strict"; var __generator = (this && this.__generator) || function (thisArg, body) { - var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); + var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, tries: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; function verb(n) { return function (v) { return step([n, v]); }; } function step(op) { @@ -58,14 +58,14 @@ var __generator = (this && this.__generator) || function (thisArg, body) { case 0: case 1: t = op; break; case 4: _.label++; return { value: op[1], done: false }; case 5: _.label++; y = op[1]; op = [0]; continue; - case 7: op = _.ops.pop(); _.trys.pop(); continue; + case 7: op = _.ops.pop(); _.tries.pop(); continue; default: - if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } + if (!(t = _.tries, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } if (t[2]) _.ops.pop(); - _.trys.pop(); continue; + _.tries.pop(); continue; } op = body.call(thisArg, _); } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } @@ -97,7 +97,7 @@ var o1 = { //// [O2.js] "use strict"; var __generator = (this && this.__generator) || function (thisArg, body) { - var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); + var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, tries: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; function verb(n) { return function (v) { return step([n, v]); }; } function step(op) { @@ -109,14 +109,14 @@ var __generator = (this && this.__generator) || function (thisArg, body) { case 0: case 1: t = op; break; case 4: _.label++; return { value: op[1], done: false }; case 5: _.label++; y = op[1]; op = [0]; continue; - case 7: op = _.ops.pop(); _.trys.pop(); continue; + case 7: op = _.ops.pop(); _.tries.pop(); continue; default: - if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } + if (!(t = _.tries, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } if (t[2]) _.ops.pop(); - _.trys.pop(); continue; + _.tries.pop(); continue; } op = body.call(thisArg, _); } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } @@ -155,7 +155,7 @@ var o2 = { //// [O3.js] "use strict"; var __generator = (this && this.__generator) || function (thisArg, body) { - var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); + var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, tries: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; function verb(n) { return function (v) { return step([n, v]); }; } function step(op) { @@ -167,14 +167,14 @@ var __generator = (this && this.__generator) || function (thisArg, body) { case 0: case 1: t = op; break; case 4: _.label++; return { value: op[1], done: false }; case 5: _.label++; y = op[1]; op = [0]; continue; - case 7: op = _.ops.pop(); _.trys.pop(); continue; + case 7: op = _.ops.pop(); _.tries.pop(); continue; default: - if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } + if (!(t = _.tries, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } if (t[2]) _.ops.pop(); - _.trys.pop(); continue; + _.tries.pop(); continue; } op = body.call(thisArg, _); } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } @@ -213,7 +213,7 @@ var o3 = { //// [O4.js] "use strict"; var __generator = (this && this.__generator) || function (thisArg, body) { - var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); + var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, tries: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; function verb(n) { return function (v) { return step([n, v]); }; } function step(op) { @@ -225,14 +225,14 @@ var __generator = (this && this.__generator) || function (thisArg, body) { case 0: case 1: t = op; break; case 4: _.label++; return { value: op[1], done: false }; case 5: _.label++; y = op[1]; op = [0]; continue; - case 7: op = _.ops.pop(); _.trys.pop(); continue; + case 7: op = _.ops.pop(); _.tries.pop(); continue; default: - if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } + if (!(t = _.tries, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } if (t[2]) _.ops.pop(); - _.trys.pop(); continue; + _.tries.pop(); continue; } op = body.call(thisArg, _); } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } @@ -294,7 +294,7 @@ var o4 = { //// [O5.js] "use strict"; var __generator = (this && this.__generator) || function (thisArg, body) { - var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); + var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, tries: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; function verb(n) { return function (v) { return step([n, v]); }; } function step(op) { @@ -306,14 +306,14 @@ var __generator = (this && this.__generator) || function (thisArg, body) { case 0: case 1: t = op; break; case 4: _.label++; return { value: op[1], done: false }; case 5: _.label++; y = op[1]; op = [0]; continue; - case 7: op = _.ops.pop(); _.trys.pop(); continue; + case 7: op = _.ops.pop(); _.tries.pop(); continue; default: - if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } + if (!(t = _.tries, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } if (t[2]) _.ops.pop(); - _.trys.pop(); continue; + _.tries.pop(); continue; } op = body.call(thisArg, _); } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } @@ -383,7 +383,7 @@ var o5 = { //// [O6.js] "use strict"; var __generator = (this && this.__generator) || function (thisArg, body) { - var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); + var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, tries: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; function verb(n) { return function (v) { return step([n, v]); }; } function step(op) { @@ -395,14 +395,14 @@ var __generator = (this && this.__generator) || function (thisArg, body) { case 0: case 1: t = op; break; case 4: _.label++; return { value: op[1], done: false }; case 5: _.label++; y = op[1]; op = [0]; continue; - case 7: op = _.ops.pop(); _.trys.pop(); continue; + case 7: op = _.ops.pop(); _.tries.pop(); continue; default: - if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } + if (!(t = _.tries, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } if (t[2]) _.ops.pop(); - _.trys.pop(); continue; + _.tries.pop(); continue; } op = body.call(thisArg, _); } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } @@ -440,7 +440,7 @@ var o6 = { //// [O7.js] "use strict"; var __generator = (this && this.__generator) || function (thisArg, body) { - var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); + var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, tries: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; function verb(n) { return function (v) { return step([n, v]); }; } function step(op) { @@ -452,14 +452,14 @@ var __generator = (this && this.__generator) || function (thisArg, body) { case 0: case 1: t = op; break; case 4: _.label++; return { value: op[1], done: false }; case 5: _.label++; y = op[1]; op = [0]; continue; - case 7: op = _.ops.pop(); _.trys.pop(); continue; + case 7: op = _.ops.pop(); _.tries.pop(); continue; default: - if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } + if (!(t = _.tries, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } if (t[2]) _.ops.pop(); - _.trys.pop(); continue; + _.tries.pop(); continue; } op = body.call(thisArg, _); } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } diff --git a/tests/baselines/reference/emitter.forAwait(target=es5).js b/tests/baselines/reference/emitter.forAwait(target=es5).js index b006d59a25706..ff4a8d588fbf1 100644 --- a/tests/baselines/reference/emitter.forAwait(target=es5).js +++ b/tests/baselines/reference/emitter.forAwait(target=es5).js @@ -62,7 +62,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge }); }; var __generator = (this && this.__generator) || function (thisArg, body) { - var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); + var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, tries: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; function verb(n) { return function (v) { return step([n, v]); }; } function step(op) { @@ -74,14 +74,14 @@ var __generator = (this && this.__generator) || function (thisArg, body) { case 0: case 1: t = op; break; case 4: _.label++; return { value: op[1], done: false }; case 5: _.label++; y = op[1]; op = [0]; continue; - case 7: op = _.ops.pop(); _.trys.pop(); continue; + case 7: op = _.ops.pop(); _.tries.pop(); continue; default: - if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } + if (!(t = _.tries, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } if (t[2]) _.ops.pop(); - _.trys.pop(); continue; + _.tries.pop(); continue; } op = body.call(thisArg, _); } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } @@ -102,7 +102,7 @@ function f1() { return __generator(this, function (_e) { switch (_e.label) { case 0: - _e.trys.push([0, 5, 6, 11]); + _e.tries.push([0, 5, 6, 11]); _a = true, y_1 = __asyncValues(y); _e.label = 1; case 1: return [4 /*yield*/, y_1.next()]; @@ -121,7 +121,7 @@ function f1() { e_1 = { error: e_1_1 }; return [3 /*break*/, 11]; case 6: - _e.trys.push([6, , 9, 10]); + _e.tries.push([6, , 9, 10]); if (!(!_a && !_b && (_c = y_1.return))) return [3 /*break*/, 8]; return [4 /*yield*/, _c.call(y_1)]; case 7: @@ -149,7 +149,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge }); }; var __generator = (this && this.__generator) || function (thisArg, body) { - var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); + var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, tries: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; function verb(n) { return function (v) { return step([n, v]); }; } function step(op) { @@ -161,14 +161,14 @@ var __generator = (this && this.__generator) || function (thisArg, body) { case 0: case 1: t = op; break; case 4: _.label++; return { value: op[1], done: false }; case 5: _.label++; y = op[1]; op = [0]; continue; - case 7: op = _.ops.pop(); _.trys.pop(); continue; + case 7: op = _.ops.pop(); _.tries.pop(); continue; default: - if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } + if (!(t = _.tries, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } if (t[2]) _.ops.pop(); - _.trys.pop(); continue; + _.tries.pop(); continue; } op = body.call(thisArg, _); } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } @@ -189,7 +189,7 @@ function f2() { return __generator(this, function (_e) { switch (_e.label) { case 0: - _e.trys.push([0, 5, 6, 11]); + _e.tries.push([0, 5, 6, 11]); _a = true, y_1 = __asyncValues(y); _e.label = 1; case 1: return [4 /*yield*/, y_1.next()]; @@ -208,7 +208,7 @@ function f2() { e_1 = { error: e_1_1 }; return [3 /*break*/, 11]; case 6: - _e.trys.push([6, , 9, 10]); + _e.tries.push([6, , 9, 10]); if (!(!_a && !_b && (_c = y_1.return))) return [3 /*break*/, 8]; return [4 /*yield*/, _c.call(y_1)]; case 7: @@ -227,7 +227,7 @@ function f2() { //// [file3.js] "use strict"; var __generator = (this && this.__generator) || function (thisArg, body) { - var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); + var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, tries: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; function verb(n) { return function (v) { return step([n, v]); }; } function step(op) { @@ -239,14 +239,14 @@ var __generator = (this && this.__generator) || function (thisArg, body) { case 0: case 1: t = op; break; case 4: _.label++; return { value: op[1], done: false }; case 5: _.label++; y = op[1]; op = [0]; continue; - case 7: op = _.ops.pop(); _.trys.pop(); continue; + case 7: op = _.ops.pop(); _.tries.pop(); continue; default: - if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } + if (!(t = _.tries, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } if (t[2]) _.ops.pop(); - _.trys.pop(); continue; + _.tries.pop(); continue; } op = body.call(thisArg, _); } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } @@ -280,7 +280,7 @@ function f3() { return __generator(this, function (_e) { switch (_e.label) { case 0: - _e.trys.push([0, 5, 6, 11]); + _e.tries.push([0, 5, 6, 11]); _a = true, y_1 = __asyncValues(y); _e.label = 1; case 1: return [4 /*yield*/, __await(y_1.next())]; @@ -299,7 +299,7 @@ function f3() { e_1 = { error: e_1_1 }; return [3 /*break*/, 11]; case 6: - _e.trys.push([6, , 9, 10]); + _e.tries.push([6, , 9, 10]); if (!(!_a && !_b && (_c = y_1.return))) return [3 /*break*/, 8]; return [4 /*yield*/, __await(_c.call(y_1))]; case 7: @@ -318,7 +318,7 @@ function f3() { //// [file4.js] "use strict"; var __generator = (this && this.__generator) || function (thisArg, body) { - var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); + var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, tries: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; function verb(n) { return function (v) { return step([n, v]); }; } function step(op) { @@ -330,14 +330,14 @@ var __generator = (this && this.__generator) || function (thisArg, body) { case 0: case 1: t = op; break; case 4: _.label++; return { value: op[1], done: false }; case 5: _.label++; y = op[1]; op = [0]; continue; - case 7: op = _.ops.pop(); _.trys.pop(); continue; + case 7: op = _.ops.pop(); _.tries.pop(); continue; default: - if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } + if (!(t = _.tries, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } if (t[2]) _.ops.pop(); - _.trys.pop(); continue; + _.tries.pop(); continue; } op = body.call(thisArg, _); } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } @@ -371,7 +371,7 @@ function f4() { return __generator(this, function (_e) { switch (_e.label) { case 0: - _e.trys.push([0, 5, 6, 11]); + _e.tries.push([0, 5, 6, 11]); _a = true, y_1 = __asyncValues(y); _e.label = 1; case 1: return [4 /*yield*/, __await(y_1.next())]; @@ -390,7 +390,7 @@ function f4() { e_1 = { error: e_1_1 }; return [3 /*break*/, 11]; case 6: - _e.trys.push([6, , 9, 10]); + _e.tries.push([6, , 9, 10]); if (!(!_a && !_b && (_c = y_1.return))) return [3 /*break*/, 8]; return [4 /*yield*/, __await(_c.call(y_1))]; case 7: @@ -418,7 +418,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge }); }; var __generator = (this && this.__generator) || function (thisArg, body) { - var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); + var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, tries: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; function verb(n) { return function (v) { return step([n, v]); }; } function step(op) { @@ -430,14 +430,14 @@ var __generator = (this && this.__generator) || function (thisArg, body) { case 0: case 1: t = op; break; case 4: _.label++; return { value: op[1], done: false }; case 5: _.label++; y = op[1]; op = [0]; continue; - case 7: op = _.ops.pop(); _.trys.pop(); continue; + case 7: op = _.ops.pop(); _.tries.pop(); continue; default: - if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } + if (!(t = _.tries, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } if (t[2]) _.ops.pop(); - _.trys.pop(); continue; + _.tries.pop(); continue; } op = body.call(thisArg, _); } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } @@ -459,7 +459,7 @@ function f5() { return __generator(this, function (_e) { switch (_e.label) { case 0: - _e.trys.push([0, 5, 6, 11]); + _e.tries.push([0, 5, 6, 11]); _a = true, y_1 = __asyncValues(y); _e.label = 1; case 1: return [4 /*yield*/, y_1.next()]; @@ -478,7 +478,7 @@ function f5() { e_1 = { error: e_1_1 }; return [3 /*break*/, 11]; case 6: - _e.trys.push([6, , 9, 10]); + _e.tries.push([6, , 9, 10]); if (!(!_a && !_b && (_c = y_1.return))) return [3 /*break*/, 8]; return [4 /*yield*/, _c.call(y_1)]; case 7: @@ -497,7 +497,7 @@ function f5() { //// [file6.js] "use strict"; var __generator = (this && this.__generator) || function (thisArg, body) { - var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); + var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, tries: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; function verb(n) { return function (v) { return step([n, v]); }; } function step(op) { @@ -509,14 +509,14 @@ var __generator = (this && this.__generator) || function (thisArg, body) { case 0: case 1: t = op; break; case 4: _.label++; return { value: op[1], done: false }; case 5: _.label++; y = op[1]; op = [0]; continue; - case 7: op = _.ops.pop(); _.trys.pop(); continue; + case 7: op = _.ops.pop(); _.tries.pop(); continue; default: - if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } + if (!(t = _.tries, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } if (t[2]) _.ops.pop(); - _.trys.pop(); continue; + _.tries.pop(); continue; } op = body.call(thisArg, _); } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } @@ -551,7 +551,7 @@ function f6() { return __generator(this, function (_e) { switch (_e.label) { case 0: - _e.trys.push([0, 5, 6, 11]); + _e.tries.push([0, 5, 6, 11]); _a = true, y_1 = __asyncValues(y); _e.label = 1; case 1: return [4 /*yield*/, __await(y_1.next())]; @@ -570,7 +570,7 @@ function f6() { e_1 = { error: e_1_1 }; return [3 /*break*/, 11]; case 6: - _e.trys.push([6, , 9, 10]); + _e.tries.push([6, , 9, 10]); if (!(!_a && !_b && (_c = y_1.return))) return [3 /*break*/, 8]; return [4 /*yield*/, __await(_c.call(y_1))]; case 7: @@ -589,7 +589,7 @@ function f6() { //// [file7.js] "use strict"; var __generator = (this && this.__generator) || function (thisArg, body) { - var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); + var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, tries: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; function verb(n) { return function (v) { return step([n, v]); }; } function step(op) { @@ -601,14 +601,14 @@ var __generator = (this && this.__generator) || function (thisArg, body) { case 0: case 1: t = op; break; case 4: _.label++; return { value: op[1], done: false }; case 5: _.label++; y = op[1]; op = [0]; continue; - case 7: op = _.ops.pop(); _.trys.pop(); continue; + case 7: op = _.ops.pop(); _.tries.pop(); continue; default: - if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } + if (!(t = _.tries, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } if (t[2]) _.ops.pop(); - _.trys.pop(); continue; + _.tries.pop(); continue; } op = body.call(thisArg, _); } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } @@ -643,7 +643,7 @@ function f7() { return __generator(this, function (_e) { switch (_e.label) { case 0: - _e.trys.push([0, 5, 6, 11]); + _e.tries.push([0, 5, 6, 11]); _a = true, y_1 = (e_1 = void 0, __asyncValues(y)); _e.label = 1; case 1: return [4 /*yield*/, __await(y_1.next())]; @@ -662,7 +662,7 @@ function f7() { e_1 = { error: e_1_1 }; return [3 /*break*/, 11]; case 6: - _e.trys.push([6, , 9, 10]); + _e.tries.push([6, , 9, 10]); if (!(!_a && !_b && (_c = y_1.return))) return [3 /*break*/, 8]; return [4 /*yield*/, __await(_c.call(y_1))]; case 7: diff --git a/tests/baselines/reference/enumBasics.js b/tests/baselines/reference/enumBasics.js index 88cac58f505d3..8e6d6cd8d444e 100644 --- a/tests/baselines/reference/enumBasics.js +++ b/tests/baselines/reference/enumBasics.js @@ -64,7 +64,7 @@ enum E8 { B = 'foo'['foo'] } -//Enum with computed member intializer of same enum type +//Enum with computed member initializer of same enum type enum E9 { A, B = A @@ -144,7 +144,7 @@ var E8; (function (E8) { E8[E8["B"] = 'foo'['foo']] = "B"; })(E8 || (E8 = {})); -//Enum with computed member intializer of same enum type +//Enum with computed member initializer of same enum type var E9; (function (E9) { E9[E9["A"] = 0] = "A"; diff --git a/tests/baselines/reference/enumBasics.symbols b/tests/baselines/reference/enumBasics.symbols index 8996e7625512d..d368b2ea623df 100644 --- a/tests/baselines/reference/enumBasics.symbols +++ b/tests/baselines/reference/enumBasics.symbols @@ -142,7 +142,7 @@ enum E8 { >B : Symbol(E8.B, Decl(enumBasics.ts, 59, 9)) } -//Enum with computed member intializer of same enum type +//Enum with computed member initializer of same enum type enum E9 { >E9 : Symbol(E9, Decl(enumBasics.ts, 61, 1)) diff --git a/tests/baselines/reference/enumBasics.types b/tests/baselines/reference/enumBasics.types index e777513397428..39dc19a9a1c80 100644 --- a/tests/baselines/reference/enumBasics.types +++ b/tests/baselines/reference/enumBasics.types @@ -231,7 +231,7 @@ enum E8 { > : ^^^^^ } -//Enum with computed member intializer of same enum type +//Enum with computed member initializer of same enum type enum E9 { >E9 : E9 > : ^^ diff --git a/tests/baselines/reference/enumClassification.js b/tests/baselines/reference/enumClassification.js index d06ed87ad7046..345e26e0cd222 100644 --- a/tests/baselines/reference/enumClassification.js +++ b/tests/baselines/reference/enumClassification.js @@ -1,7 +1,7 @@ //// [tests/cases/conformance/enums/enumClassification.ts] //// //// [enumClassification.ts] -// An enum type where each member has no initializer or an initializer that specififes +// An enum type where each member has no initializer or an initializer that specifies // a numeric literal, a string literal, or a single identifier naming another member in // the enum type is classified as a literal enum type. An enum type that doesn't adhere // to this pattern is classified as a numeric enum type. @@ -83,7 +83,7 @@ enum E20 { //// [enumClassification.js] "use strict"; -// An enum type where each member has no initializer or an initializer that specififes +// An enum type where each member has no initializer or an initializer that specifies // a numeric literal, a string literal, or a single identifier naming another member in // the enum type is classified as a literal enum type. An enum type that doesn't adhere // to this pattern is classified as a numeric enum type. diff --git a/tests/baselines/reference/enumClassification.symbols b/tests/baselines/reference/enumClassification.symbols index 1fdc466173bd7..bd47908535a41 100644 --- a/tests/baselines/reference/enumClassification.symbols +++ b/tests/baselines/reference/enumClassification.symbols @@ -1,7 +1,7 @@ //// [tests/cases/conformance/enums/enumClassification.ts] //// === enumClassification.ts === -// An enum type where each member has no initializer or an initializer that specififes +// An enum type where each member has no initializer or an initializer that specifies // a numeric literal, a string literal, or a single identifier naming another member in // the enum type is classified as a literal enum type. An enum type that doesn't adhere // to this pattern is classified as a numeric enum type. diff --git a/tests/baselines/reference/enumClassification.types b/tests/baselines/reference/enumClassification.types index e0eb8c4c75a01..d48574cca400b 100644 --- a/tests/baselines/reference/enumClassification.types +++ b/tests/baselines/reference/enumClassification.types @@ -1,7 +1,7 @@ //// [tests/cases/conformance/enums/enumClassification.ts] //// === enumClassification.ts === -// An enum type where each member has no initializer or an initializer that specififes +// An enum type where each member has no initializer or an initializer that specifies // a numeric literal, a string literal, or a single identifier naming another member in // the enum type is classified as a literal enum type. An enum type that doesn't adhere // to this pattern is classified as a numeric enum type. diff --git a/tests/baselines/reference/enumErrors.errors.txt b/tests/baselines/reference/enumErrors.errors.txt index 052cd3e3aa303..43dcb7b319948 100644 --- a/tests/baselines/reference/enumErrors.errors.txt +++ b/tests/baselines/reference/enumErrors.errors.txt @@ -53,14 +53,14 @@ enumErrors.ts(53,33): error TS2452: An enum member cannot have a numeric name. B = A } - //Enum with computed member intializer of different enum type + //Enum with computed member initializer of different enum type // Bug 707850: This should be allowed enum E10 { A = E9.A, B = E9.B } - // Enum with computed member intializer of other types + // Enum with computed member initializer of other types enum E11 { A = true, ~~~~ diff --git a/tests/baselines/reference/enumErrors.js b/tests/baselines/reference/enumErrors.js index daf5579e0c6be..458b915fbeab4 100644 --- a/tests/baselines/reference/enumErrors.js +++ b/tests/baselines/reference/enumErrors.js @@ -17,14 +17,14 @@ enum E9 { B = A } -//Enum with computed member intializer of different enum type +//Enum with computed member initializer of different enum type // Bug 707850: This should be allowed enum E10 { A = E9.A, B = E9.B } -// Enum with computed member intializer of other types +// Enum with computed member initializer of other types enum E11 { A = true, B = new Date(), @@ -81,14 +81,14 @@ var E9; E9[E9["A"] = 0] = "A"; E9[E9["B"] = 0] = "B"; })(E9 || (E9 = {})); -//Enum with computed member intializer of different enum type +//Enum with computed member initializer of different enum type // Bug 707850: This should be allowed var E10; (function (E10) { E10[E10["A"] = 0] = "A"; E10[E10["B"] = 0] = "B"; })(E10 || (E10 = {})); -// Enum with computed member intializer of other types +// Enum with computed member initializer of other types var E11; (function (E11) { E11[E11["A"] = true] = "A"; diff --git a/tests/baselines/reference/enumErrors.symbols b/tests/baselines/reference/enumErrors.symbols index 4a1287ada5a0e..8ced64fb99416 100644 --- a/tests/baselines/reference/enumErrors.symbols +++ b/tests/baselines/reference/enumErrors.symbols @@ -34,7 +34,7 @@ enum E9 { >A : Symbol(E9.A, Decl(enumErrors.ts, 11, 9)) } -//Enum with computed member intializer of different enum type +//Enum with computed member initializer of different enum type // Bug 707850: This should be allowed enum E10 { >E10 : Symbol(E10, Decl(enumErrors.ts, 14, 1)) @@ -52,7 +52,7 @@ enum E10 { >B : Symbol(E9.B, Decl(enumErrors.ts, 12, 6)) } -// Enum with computed member intializer of other types +// Enum with computed member initializer of other types enum E11 { >E11 : Symbol(E11, Decl(enumErrors.ts, 21, 1)) diff --git a/tests/baselines/reference/enumErrors.types b/tests/baselines/reference/enumErrors.types index 0242a02738b91..04bae2527722a 100644 --- a/tests/baselines/reference/enumErrors.types +++ b/tests/baselines/reference/enumErrors.types @@ -52,7 +52,7 @@ enum E9 { > : ^^ } -//Enum with computed member intializer of different enum type +//Enum with computed member initializer of different enum type // Bug 707850: This should be allowed enum E10 { >E10 : E10 @@ -79,7 +79,7 @@ enum E10 { > : ^^ } -// Enum with computed member intializer of other types +// Enum with computed member initializer of other types enum E11 { >E11 : E11 > : ^^^ diff --git a/tests/baselines/reference/enumMemberNameNonIdentifier.js b/tests/baselines/reference/enumMemberNameNonIdentifier.js index d5a9c2266e29a..87027aaec055c 100644 --- a/tests/baselines/reference/enumMemberNameNonIdentifier.js +++ b/tests/baselines/reference/enumMemberNameNonIdentifier.js @@ -6,7 +6,7 @@ export const enum E { "hyphen-member" = 1, "123startsWithNumber" = 2, "has space" = 3, - // Greek Capital Yot (U+037F) - valid identifier in ES2015+ but NOT in ES5 + // Greek Capital Yacht (U+037F) - valid identifier in ES2015+ but NOT in ES5 Ϳ = 4, } diff --git a/tests/baselines/reference/enumMemberNameNonIdentifier.symbols b/tests/baselines/reference/enumMemberNameNonIdentifier.symbols index 0c3029032c598..35ce5c8aade50 100644 --- a/tests/baselines/reference/enumMemberNameNonIdentifier.symbols +++ b/tests/baselines/reference/enumMemberNameNonIdentifier.symbols @@ -16,7 +16,7 @@ export const enum E { "has space" = 3, >"has space" : Symbol(E["has space"], Decl(enumMemberNameNonIdentifier.ts, 3, 30)) - // Greek Capital Yot (U+037F) - valid identifier in ES2015+ but NOT in ES5 + // Greek Capital Yacht (U+037F) - valid identifier in ES2015+ but NOT in ES5 Ϳ = 4, >Ϳ : Symbol(E.Ϳ, Decl(enumMemberNameNonIdentifier.ts, 4, 20)) } diff --git a/tests/baselines/reference/enumMemberNameNonIdentifier.types b/tests/baselines/reference/enumMemberNameNonIdentifier.types index 4199dba7f6eb9..c145a13150aad 100644 --- a/tests/baselines/reference/enumMemberNameNonIdentifier.types +++ b/tests/baselines/reference/enumMemberNameNonIdentifier.types @@ -29,7 +29,7 @@ export const enum E { >3 : 3 > : ^ - // Greek Capital Yot (U+037F) - valid identifier in ES2015+ but NOT in ES5 + // Greek Capital Yacht (U+037F) - valid identifier in ES2015+ but NOT in ES5 Ϳ = 4, >Ϳ : E.Ϳ > : ^^^ diff --git a/tests/baselines/reference/erasableSyntaxOnly.errors.txt b/tests/baselines/reference/erasableSyntaxOnly.errors.txt index c17f25519f196..4f9140e5adcfa 100644 --- a/tests/baselines/reference/erasableSyntaxOnly.errors.txt +++ b/tests/baselines/reference/erasableSyntaxOnly.errors.txt @@ -76,7 +76,7 @@ index.ts(94,1): error TS1294: This syntax is not allowed when 'erasableSyntaxOnl constructor(foo: string) { } } - // Note for implementors: This should not be an error + // Note for implementers: This should not be an error // as this entire namespace block is fully erased namespace NotInstantiated { export interface JustAType { } diff --git a/tests/baselines/reference/erasableSyntaxOnly.js b/tests/baselines/reference/erasableSyntaxOnly.js index c4948375eb3fc..abadb6b41cbbc 100644 --- a/tests/baselines/reference/erasableSyntaxOnly.js +++ b/tests/baselines/reference/erasableSyntaxOnly.js @@ -38,7 +38,7 @@ class MyClassOk { constructor(foo: string) { } } -// Note for implementors: This should not be an error +// Note for implementers: This should not be an error // as this entire namespace block is fully erased namespace NotInstantiated { export interface JustAType { } diff --git a/tests/baselines/reference/erasableSyntaxOnly.symbols b/tests/baselines/reference/erasableSyntaxOnly.symbols index 659c5df9d59fc..ea5052e9d430e 100644 --- a/tests/baselines/reference/erasableSyntaxOnly.symbols +++ b/tests/baselines/reference/erasableSyntaxOnly.symbols @@ -64,7 +64,7 @@ class MyClassOk { >foo : Symbol(foo, Decl(index.ts, 34, 16)) } -// Note for implementors: This should not be an error +// Note for implementers: This should not be an error // as this entire namespace block is fully erased namespace NotInstantiated { >NotInstantiated : Symbol(NotInstantiated, Decl(index.ts, 35, 1)) diff --git a/tests/baselines/reference/erasableSyntaxOnly.types b/tests/baselines/reference/erasableSyntaxOnly.types index dc64a94d46e7a..3c520f5416121 100644 --- a/tests/baselines/reference/erasableSyntaxOnly.types +++ b/tests/baselines/reference/erasableSyntaxOnly.types @@ -90,7 +90,7 @@ class MyClassOk { > : ^^^^^^ } -// Note for implementors: This should not be an error +// Note for implementers: This should not be an error // as this entire namespace block is fully erased namespace NotInstantiated { export interface JustAType { } diff --git a/tests/baselines/reference/errorsInGenericTypeReference.errors.txt b/tests/baselines/reference/errorsInGenericTypeReference.errors.txt index 9ea6c47ef9ac8..55d083a477504 100644 --- a/tests/baselines/reference/errorsInGenericTypeReference.errors.txt +++ b/tests/baselines/reference/errorsInGenericTypeReference.errors.txt @@ -68,7 +68,7 @@ errorsInGenericTypeReference.ts(68,24): error TS2304: Cannot find name 'V'. !!! error TS2304: Cannot find name 'V'. - // in paramter types + // in parameter types function testFunction2(p: Foo<{ x: V }>) { }// error: could not find symbol V ~ !!! error TS2304: Cannot find name 'V'. diff --git a/tests/baselines/reference/errorsInGenericTypeReference.js b/tests/baselines/reference/errorsInGenericTypeReference.js index 30b975f755970..186396da36d56 100644 --- a/tests/baselines/reference/errorsInGenericTypeReference.js +++ b/tests/baselines/reference/errorsInGenericTypeReference.js @@ -33,7 +33,7 @@ class testClass3 { function testFunction1(): Foo<{ x: V }> { return null; } // error: could not find symbol V -// in paramter types +// in parameter types function testFunction2(p: Foo<{ x: V }>) { }// error: could not find symbol V @@ -95,7 +95,7 @@ class testClass3 { } // in function return type annotation function testFunction1() { return null; } // error: could not find symbol V -// in paramter types +// in parameter types function testFunction2(p) { } // error: could not find symbol V // in var type annotation var f; // error: could not find symbol V diff --git a/tests/baselines/reference/errorsInGenericTypeReference.symbols b/tests/baselines/reference/errorsInGenericTypeReference.symbols index d7496ea0c3153..84007a70114a5 100644 --- a/tests/baselines/reference/errorsInGenericTypeReference.symbols +++ b/tests/baselines/reference/errorsInGenericTypeReference.symbols @@ -81,7 +81,7 @@ function testFunction1(): Foo<{ x: V }> { return null; } // error: could not fin >V : Symbol(V) -// in paramter types +// in parameter types function testFunction2(p: Foo<{ x: V }>) { }// error: could not find symbol V >testFunction2 : Symbol(testFunction2, Decl(errorsInGenericTypeReference.ts, 29, 56)) >p : Symbol(p, Decl(errorsInGenericTypeReference.ts, 33, 23)) diff --git a/tests/baselines/reference/errorsInGenericTypeReference.types b/tests/baselines/reference/errorsInGenericTypeReference.types index c159268c6c1fe..629722f93c2f5 100644 --- a/tests/baselines/reference/errorsInGenericTypeReference.types +++ b/tests/baselines/reference/errorsInGenericTypeReference.types @@ -95,7 +95,7 @@ function testFunction1(): Foo<{ x: V }> { return null; } // error: could not fin > : ^ -// in paramter types +// in parameter types function testFunction2(p: Foo<{ x: V }>) { }// error: could not find symbol V >testFunction2 : (p: Foo<{ x: V; }>) => void > : ^ ^^ ^^^^^^^^^ diff --git a/tests/baselines/reference/es5-asyncFunction(target=es5).js b/tests/baselines/reference/es5-asyncFunction(target=es5).js index aea68ba0b26f8..f7aca42cd2211 100644 --- a/tests/baselines/reference/es5-asyncFunction(target=es5).js +++ b/tests/baselines/reference/es5-asyncFunction(target=es5).js @@ -22,7 +22,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge }); }; var __generator = (this && this.__generator) || function (thisArg, body) { - var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); + var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, tries: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; function verb(n) { return function (v) { return step([n, v]); }; } function step(op) { @@ -34,14 +34,14 @@ var __generator = (this && this.__generator) || function (thisArg, body) { case 0: case 1: t = op; break; case 4: _.label++; return { value: op[1], done: false }; case 5: _.label++; y = op[1]; op = [0]; continue; - case 7: op = _.ops.pop(); _.trys.pop(); continue; + case 7: op = _.ops.pop(); _.tries.pop(); continue; default: - if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } + if (!(t = _.tries, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } if (t[2]) _.ops.pop(); - _.trys.pop(); continue; + _.tries.pop(); continue; } op = body.call(thisArg, _); } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } diff --git a/tests/baselines/reference/es5-asyncFunctionLongObjectLiteral(target=es5).js b/tests/baselines/reference/es5-asyncFunctionLongObjectLiteral(target=es5).js index 3a895d4d3f3d6..45655844bb0c4 100644 --- a/tests/baselines/reference/es5-asyncFunctionLongObjectLiteral(target=es5).js +++ b/tests/baselines/reference/es5-asyncFunctionLongObjectLiteral(target=es5).js @@ -42,7 +42,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge }); }; var __generator = (this && this.__generator) || function (thisArg, body) { - var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); + var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, tries: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; function verb(n) { return function (v) { return step([n, v]); }; } function step(op) { @@ -54,14 +54,14 @@ var __generator = (this && this.__generator) || function (thisArg, body) { case 0: case 1: t = op; break; case 4: _.label++; return { value: op[1], done: false }; case 5: _.label++; y = op[1]; op = [0]; continue; - case 7: op = _.ops.pop(); _.trys.pop(); continue; + case 7: op = _.ops.pop(); _.tries.pop(); continue; default: - if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } + if (!(t = _.tries, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } if (t[2]) _.ops.pop(); - _.trys.pop(); continue; + _.tries.pop(); continue; } op = body.call(thisArg, _); } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } diff --git a/tests/baselines/reference/es5-asyncFunctionTryStatements(target=es5).js b/tests/baselines/reference/es5-asyncFunctionTryStatements(target=es5).js index 08556135b3e52..a9fa591e7a27d 100644 --- a/tests/baselines/reference/es5-asyncFunctionTryStatements(target=es5).js +++ b/tests/baselines/reference/es5-asyncFunctionTryStatements(target=es5).js @@ -146,7 +146,7 @@ function tryCatch1() { return __generator(this, function (_a) { switch (_a.label) { case 0: - _a.trys.push([0, 2, , 3]); + _a.tries.push([0, 2, , 3]); return [4 /*yield*/, x]; case 1: _a.sent(); @@ -166,7 +166,7 @@ function tryCatch2() { return __generator(this, function (_a) { switch (_a.label) { case 0: - _a.trys.push([0, 1, , 3]); + _a.tries.push([0, 1, , 3]); x; return [3 /*break*/, 3]; case 1: @@ -186,7 +186,7 @@ function tryCatch3() { return __generator(this, function (_a) { switch (_a.label) { case 0: - _a.trys.push([0, 2, , 3]); + _a.tries.push([0, 2, , 3]); return [4 /*yield*/, x]; case 1: _a.sent(); @@ -219,7 +219,7 @@ function tryFinally1() { return __generator(this, function (_a) { switch (_a.label) { case 0: - _a.trys.push([0, , 2, 3]); + _a.tries.push([0, , 2, 3]); return [4 /*yield*/, x]; case 1: _a.sent(); @@ -238,7 +238,7 @@ function tryFinally2() { return __generator(this, function (_a) { switch (_a.label) { case 0: - _a.trys.push([0, , 1, 3]); + _a.tries.push([0, , 1, 3]); x; return [3 /*break*/, 3]; case 1: return [4 /*yield*/, y]; @@ -273,7 +273,7 @@ function tryCatchFinally1() { return __generator(this, function (_a) { switch (_a.label) { case 0: - _a.trys.push([0, 2, 3, 4]); + _a.tries.push([0, 2, 3, 4]); return [4 /*yield*/, x]; case 1: _a.sent(); @@ -296,7 +296,7 @@ function tryCatchFinally2() { return __generator(this, function (_a) { switch (_a.label) { case 0: - _a.trys.push([0, 1, 3, 4]); + _a.tries.push([0, 1, 3, 4]); x; return [3 /*break*/, 4]; case 1: @@ -319,7 +319,7 @@ function tryCatchFinally3() { return __generator(this, function (_a) { switch (_a.label) { case 0: - _a.trys.push([0, 1, 2, 4]); + _a.tries.push([0, 1, 2, 4]); x; return [3 /*break*/, 4]; case 1: diff --git a/tests/baselines/reference/es5-importHelpersAsyncFunctions(target=es5).js b/tests/baselines/reference/es5-importHelpersAsyncFunctions(target=es5).js index 73d01b409b26b..01ba24ececb66 100644 --- a/tests/baselines/reference/es5-importHelpersAsyncFunctions(target=es5).js +++ b/tests/baselines/reference/es5-importHelpersAsyncFunctions(target=es5).js @@ -41,7 +41,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge }); }; var __generator = (this && this.__generator) || function (thisArg, body) { - var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); + var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, tries: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; function verb(n) { return function (v) { return step([n, v]); }; } function step(op) { @@ -53,14 +53,14 @@ var __generator = (this && this.__generator) || function (thisArg, body) { case 0: case 1: t = op; break; case 4: _.label++; return { value: op[1], done: false }; case 5: _.label++; y = op[1]; op = [0]; continue; - case 7: op = _.ops.pop(); _.trys.pop(); continue; + case 7: op = _.ops.pop(); _.tries.pop(); continue; default: - if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } + if (!(t = _.tries, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } if (t[2]) _.ops.pop(); - _.trys.pop(); continue; + _.tries.pop(); continue; } op = body.call(thisArg, _); } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } diff --git a/tests/baselines/reference/es6ClassTest2.js b/tests/baselines/reference/es6ClassTest2.js index 5c1d4809909dd..4f62e3c31cb62 100644 --- a/tests/baselines/reference/es6ClassTest2.js +++ b/tests/baselines/reference/es6ClassTest2.js @@ -111,7 +111,7 @@ class SuperChild extends SuperParent { } } -class Statics { +class Statistics { static foo = 1; static bar: string; @@ -120,7 +120,7 @@ class Statics { } } -var stat = new Statics(); +var stat = new Statistics(); interface IFoo { x: number; @@ -249,13 +249,13 @@ class SuperChild extends SuperParent { super.c(); } } -class Statics { +class Statistics { static baz() { return ""; } } -Statics.foo = 1; -var stat = new Statics(); +Statistics.foo = 1; +var stat = new Statistics(); class ImplementsInterface { constructor() { this.x = 1; diff --git a/tests/baselines/reference/es6ClassTest2.symbols b/tests/baselines/reference/es6ClassTest2.symbols index 7a8c9feeaea8f..6d57637859551 100644 --- a/tests/baselines/reference/es6ClassTest2.symbols +++ b/tests/baselines/reference/es6ClassTest2.symbols @@ -252,25 +252,25 @@ class SuperChild extends SuperParent { } } -class Statics { ->Statics : Symbol(Statics, Decl(es6ClassTest2.ts, 108, 1)) +class Statistics { +>Statistics : Symbol(Statistics, Decl(es6ClassTest2.ts, 108, 1)) static foo = 1; ->foo : Symbol(Statics.foo, Decl(es6ClassTest2.ts, 110, 15)) +>foo : Symbol(Statistics.foo, Decl(es6ClassTest2.ts, 110, 15)) static bar: string; ->bar : Symbol(Statics.bar, Decl(es6ClassTest2.ts, 111, 19)) +>bar : Symbol(Statistics.bar, Decl(es6ClassTest2.ts, 111, 19)) static baz() { ->baz : Symbol(Statics.baz, Decl(es6ClassTest2.ts, 112, 23)) +>baz : Symbol(Statistics.baz, Decl(es6ClassTest2.ts, 112, 23)) return ""; } } -var stat = new Statics(); +var stat = new Statistics(); >stat : Symbol(stat, Decl(es6ClassTest2.ts, 119, 3)) ->Statics : Symbol(Statics, Decl(es6ClassTest2.ts, 108, 1)) +>Statistics : Symbol(Statistics, Decl(es6ClassTest2.ts, 108, 1)) interface IFoo { >IFoo : Symbol(IFoo, Decl(es6ClassTest2.ts, 119, 25)) diff --git a/tests/baselines/reference/es6ClassTest2.types b/tests/baselines/reference/es6ClassTest2.types index 0c12479039a9a..dd0665b3fdb8b 100644 --- a/tests/baselines/reference/es6ClassTest2.types +++ b/tests/baselines/reference/es6ClassTest2.types @@ -459,8 +459,8 @@ class SuperChild extends SuperParent { } } -class Statics { ->Statics : Statics +class Statistics { +>Statistics : Statistics > : ^^^^^^^ static foo = 1; @@ -483,12 +483,12 @@ class Statics { } } -var stat = new Statics(); ->stat : Statics +var stat = new Statistics(); +>stat : Statistics > : ^^^^^^^ ->new Statics() : Statics +>new Statistics() : Statistics > : ^^^^^^^ ->Statics : typeof Statics +>Statistics : typeof Statistics > : ^^^^^^^^^^^^^^ interface IFoo { diff --git a/tests/baselines/reference/es6ImportNamedImportMergeErrors.errors.txt b/tests/baselines/reference/es6ImportNamedImportMergeErrors.errors.txt index 2ce9d760e12f6..08a6c3e4876fe 100644 --- a/tests/baselines/reference/es6ImportNamedImportMergeErrors.errors.txt +++ b/tests/baselines/reference/es6ImportNamedImportMergeErrors.errors.txt @@ -12,9 +12,9 @@ es6ImportNamedImportMergeErrors_1.ts(10,16): error TS2300: Duplicate identifier ==== es6ImportNamedImportMergeErrors_1.ts (4 errors) ==== import { a } from "./es6ImportNamedImportMergeErrors_0"; - interface a { } // shouldnt be error + interface a { } // shouldn't be error import { x as x1 } from "./es6ImportNamedImportMergeErrors_0"; - interface x1 { } // shouldnt be error + interface x1 { } // shouldn't be error import { x } from "./es6ImportNamedImportMergeErrors_0"; // should be error ~ !!! error TS2440: Import declaration conflicts with local declaration of 'x'. diff --git a/tests/baselines/reference/es6ImportNamedImportMergeErrors.js b/tests/baselines/reference/es6ImportNamedImportMergeErrors.js index 7d0595448f5db..2a050d2ab87f8 100644 --- a/tests/baselines/reference/es6ImportNamedImportMergeErrors.js +++ b/tests/baselines/reference/es6ImportNamedImportMergeErrors.js @@ -8,9 +8,9 @@ export var z1 = a; //// [es6ImportNamedImportMergeErrors_1.ts] import { a } from "./es6ImportNamedImportMergeErrors_0"; -interface a { } // shouldnt be error +interface a { } // shouldn't be error import { x as x1 } from "./es6ImportNamedImportMergeErrors_0"; -interface x1 { } // shouldnt be error +interface x1 { } // shouldn't be error import { x } from "./es6ImportNamedImportMergeErrors_0"; // should be error var x = 10; import { x as x44 } from "./es6ImportNamedImportMergeErrors_0"; // should be error diff --git a/tests/baselines/reference/es6ImportNamedImportMergeErrors.symbols b/tests/baselines/reference/es6ImportNamedImportMergeErrors.symbols index 4e6feb464b778..f23458ca01994 100644 --- a/tests/baselines/reference/es6ImportNamedImportMergeErrors.symbols +++ b/tests/baselines/reference/es6ImportNamedImportMergeErrors.symbols @@ -20,14 +20,14 @@ export var z1 = a; import { a } from "./es6ImportNamedImportMergeErrors_0"; >a : Symbol(a, Decl(es6ImportNamedImportMergeErrors_1.ts, 0, 8), Decl(es6ImportNamedImportMergeErrors_1.ts, 0, 56)) -interface a { } // shouldnt be error +interface a { } // shouldn't be error >a : Symbol(a, Decl(es6ImportNamedImportMergeErrors_1.ts, 0, 8), Decl(es6ImportNamedImportMergeErrors_1.ts, 0, 56)) import { x as x1 } from "./es6ImportNamedImportMergeErrors_0"; >x : Symbol(x1, Decl(es6ImportNamedImportMergeErrors_0.ts, 1, 10)) >x1 : Symbol(x1, Decl(es6ImportNamedImportMergeErrors_1.ts, 2, 8), Decl(es6ImportNamedImportMergeErrors_1.ts, 2, 62)) -interface x1 { } // shouldnt be error +interface x1 { } // shouldn't be error >x1 : Symbol(x1, Decl(es6ImportNamedImportMergeErrors_1.ts, 2, 8), Decl(es6ImportNamedImportMergeErrors_1.ts, 2, 62)) import { x } from "./es6ImportNamedImportMergeErrors_0"; // should be error diff --git a/tests/baselines/reference/es6ImportNamedImportMergeErrors.types b/tests/baselines/reference/es6ImportNamedImportMergeErrors.types index 29abe2764d616..c2c2fd011fcc1 100644 --- a/tests/baselines/reference/es6ImportNamedImportMergeErrors.types +++ b/tests/baselines/reference/es6ImportNamedImportMergeErrors.types @@ -30,14 +30,14 @@ import { a } from "./es6ImportNamedImportMergeErrors_0"; >a : number > : ^^^^^^ -interface a { } // shouldnt be error +interface a { } // shouldn't be error import { x as x1 } from "./es6ImportNamedImportMergeErrors_0"; >x : number > : ^^^^^^ >x1 : number > : ^^^^^^ -interface x1 { } // shouldnt be error +interface x1 { } // shouldn't be error import { x } from "./es6ImportNamedImportMergeErrors_0"; // should be error >x : number > : ^^^^^^ diff --git a/tests/baselines/reference/es6ImportNamedImportWithTypesAndValues.js b/tests/baselines/reference/es6ImportNamedImportWithTypesAndValues.js index e75659b661452..45f31bc2d2b19 100644 --- a/tests/baselines/reference/es6ImportNamedImportWithTypesAndValues.js +++ b/tests/baselines/reference/es6ImportNamedImportWithTypesAndValues.js @@ -15,7 +15,7 @@ export class C2 implements I2 { } //// [client.ts] -import { C, I, C2 } from "./server"; // Shouldnt emit I and C2 into the js file and emit C and I in .d.ts file +import { C, I, C2 } from "./server"; // Shouldn't emit I and C2 into the js file and emit C and I in .d.ts file export type cValInterface = I; export var cVal = new C(); @@ -39,7 +39,7 @@ exports.C2 = C2; "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.cVal = void 0; -const server_1 = require("./server"); // Shouldnt emit I and C2 into the js file and emit C and I in .d.ts file +const server_1 = require("./server"); // Shouldn't emit I and C2 into the js file and emit C and I in .d.ts file exports.cVal = new server_1.C(); diff --git a/tests/baselines/reference/es6ImportNamedImportWithTypesAndValues.symbols b/tests/baselines/reference/es6ImportNamedImportWithTypesAndValues.symbols index bbdd5fb963974..1d60cf7ba60cb 100644 --- a/tests/baselines/reference/es6ImportNamedImportWithTypesAndValues.symbols +++ b/tests/baselines/reference/es6ImportNamedImportWithTypesAndValues.symbols @@ -29,7 +29,7 @@ export class C2 implements I2 { } === client.ts === -import { C, I, C2 } from "./server"; // Shouldnt emit I and C2 into the js file and emit C and I in .d.ts file +import { C, I, C2 } from "./server"; // Shouldn't emit I and C2 into the js file and emit C and I in .d.ts file >C : Symbol(C, Decl(client.ts, 0, 8)) >I : Symbol(I, Decl(client.ts, 0, 11)) >C2 : Symbol(C2, Decl(client.ts, 0, 14)) diff --git a/tests/baselines/reference/es6ImportNamedImportWithTypesAndValues.types b/tests/baselines/reference/es6ImportNamedImportWithTypesAndValues.types index ee36a610d0c9b..0ab63e9d9265c 100644 --- a/tests/baselines/reference/es6ImportNamedImportWithTypesAndValues.types +++ b/tests/baselines/reference/es6ImportNamedImportWithTypesAndValues.types @@ -33,7 +33,7 @@ export class C2 implements I2 { } === client.ts === -import { C, I, C2 } from "./server"; // Shouldnt emit I and C2 into the js file and emit C and I in .d.ts file +import { C, I, C2 } from "./server"; // Shouldn't emit I and C2 into the js file and emit C and I in .d.ts file >C : typeof C > : ^^^^^^^^ >I : any diff --git a/tests/baselines/reference/escapedIdentifiers.errors.txt b/tests/baselines/reference/escapedIdentifiers.errors.txt index d8ab744fd248c..1f908684f93d6 100644 --- a/tests/baselines/reference/escapedIdentifiers.errors.txt +++ b/tests/baselines/reference/escapedIdentifiers.errors.txt @@ -100,7 +100,7 @@ escapedIdentifiers.ts(40,12): error TS2564: Property 'foo2' has no initializer a constructorTestObject.arg\u0033 = true; constructorTestObject.arg4 = 2; - // Lables + // Labels l\u0061bel1: while (false) diff --git a/tests/baselines/reference/escapedIdentifiers.js b/tests/baselines/reference/escapedIdentifiers.js index b5dec17a2f43a..7e62d983689bb 100644 --- a/tests/baselines/reference/escapedIdentifiers.js +++ b/tests/baselines/reference/escapedIdentifiers.js @@ -91,7 +91,7 @@ constructorTestObject.arg2 = 'string'; constructorTestObject.arg\u0033 = true; constructorTestObject.arg4 = 2; -// Lables +// Labels l\u0061bel1: while (false) @@ -192,7 +192,7 @@ constructorTestObject.arg\u0031 = 1; constructorTestObject.arg2 = 'string'; constructorTestObject.arg\u0033 = true; constructorTestObject.arg4 = 2; -// Lables +// Labels l\u0061bel1: while (false) { while (false) continue label1; // it will go to next iteration of outer loop diff --git a/tests/baselines/reference/escapedIdentifiers.symbols b/tests/baselines/reference/escapedIdentifiers.symbols index acefacf43c13e..e58fc21453b11 100644 --- a/tests/baselines/reference/escapedIdentifiers.symbols +++ b/tests/baselines/reference/escapedIdentifiers.symbols @@ -231,7 +231,7 @@ constructorTestObject.arg4 = 2; >constructorTestObject : Symbol(constructorTestObject, Decl(escapedIdentifiers.ts, 84, 3)) >arg4 : Symbol(constructorTestClass.arg4, Decl(escapedIdentifiers.ts, 81, 88)) -// Lables +// Labels l\u0061bel1: while (false) diff --git a/tests/baselines/reference/escapedIdentifiers.types b/tests/baselines/reference/escapedIdentifiers.types index 1dc9de2b70a31..5132a24c984cc 100644 --- a/tests/baselines/reference/escapedIdentifiers.types +++ b/tests/baselines/reference/escapedIdentifiers.types @@ -454,7 +454,7 @@ constructorTestObject.arg4 = 2; >2 : 2 > : ^ -// Lables +// Labels l\u0061bel1: >l\u0061bel1 : any diff --git a/tests/baselines/reference/everyTypeWithAnnotationAndInitializer.errors.txt b/tests/baselines/reference/everyTypeWithAnnotationAndInitializer.errors.txt index 5d8783bf3416b..fd9aed05c3457 100644 --- a/tests/baselines/reference/everyTypeWithAnnotationAndInitializer.errors.txt +++ b/tests/baselines/reference/everyTypeWithAnnotationAndInitializer.errors.txt @@ -40,7 +40,7 @@ everyTypeWithAnnotationAndInitializer.ts(19,9): error TS2564: Property 'name' ha export function F2(x: number): string { return x.toString(); } } - var aNumber: number = 9.9; + var a number: number = 9.9; var aString: string = 'this is a string'; var aDate: Date = new Date(12); var anObject: Object = new Object(); diff --git a/tests/baselines/reference/everyTypeWithAnnotationAndInitializer.js b/tests/baselines/reference/everyTypeWithAnnotationAndInitializer.js index 16c4bec67d920..4c71e1f3bc3b0 100644 --- a/tests/baselines/reference/everyTypeWithAnnotationAndInitializer.js +++ b/tests/baselines/reference/everyTypeWithAnnotationAndInitializer.js @@ -25,7 +25,7 @@ namespace M { export function F2(x: number): string { return x.toString(); } } -var aNumber: number = 9.9; +var a number: number = 9.9; var aString: string = 'this is a string'; var aDate: Date = new Date(12); var anObject: Object = new Object(); @@ -65,7 +65,7 @@ var M; function F2(x) { return x.toString(); } M.F2 = F2; })(M || (M = {})); -var aNumber = 9.9; +var a number = 9.9; var aString = 'this is a string'; var aDate = new Date(12); var anObject = new Object(); diff --git a/tests/baselines/reference/everyTypeWithAnnotationAndInitializer.symbols b/tests/baselines/reference/everyTypeWithAnnotationAndInitializer.symbols index 6c00b19dbc376..cc5d4394d157e 100644 --- a/tests/baselines/reference/everyTypeWithAnnotationAndInitializer.symbols +++ b/tests/baselines/reference/everyTypeWithAnnotationAndInitializer.symbols @@ -58,8 +58,8 @@ namespace M { >toString : Symbol(Number.toString, Decl(lib.es5.d.ts, --, --)) } -var aNumber: number = 9.9; ->aNumber : Symbol(aNumber, Decl(everyTypeWithAnnotationAndInitializer.ts, 24, 3)) +var a number: number = 9.9; +>a number : Symbol(a number, Decl(everyTypeWithAnnotationAndInitializer.ts, 24, 3)) var aString: string = 'this is a string'; >aString : Symbol(aString, Decl(everyTypeWithAnnotationAndInitializer.ts, 25, 3)) diff --git a/tests/baselines/reference/everyTypeWithAnnotationAndInitializer.types b/tests/baselines/reference/everyTypeWithAnnotationAndInitializer.types index 9dd55faec19e5..84d59283ca190 100644 --- a/tests/baselines/reference/everyTypeWithAnnotationAndInitializer.types +++ b/tests/baselines/reference/everyTypeWithAnnotationAndInitializer.types @@ -69,8 +69,8 @@ namespace M { > : ^ ^^^ ^^^^^ } -var aNumber: number = 9.9; ->aNumber : number +var a number: number = 9.9; +>a number : number > : ^^^^^^ >9.9 : 9.9 > : ^^^ diff --git a/tests/baselines/reference/everyTypeWithAnnotationAndInvalidInitializer.errors.txt b/tests/baselines/reference/everyTypeWithAnnotationAndInvalidInitializer.errors.txt index 531f79da9efa3..d372f67204202 100644 --- a/tests/baselines/reference/everyTypeWithAnnotationAndInvalidInitializer.errors.txt +++ b/tests/baselines/reference/everyTypeWithAnnotationAndInvalidInitializer.errors.txt @@ -76,7 +76,7 @@ everyTypeWithAnnotationAndInvalidInitializer.ts(52,5): error TS2322: Type '(x: n export function F2(x: number): string { return x.toString(); } } - var aNumber: number = 'this is a string'; + var a number: number = 'this is a string'; ~~~~~~~ !!! error TS2322: Type 'string' is not assignable to type 'number'. var aString: string = 9.9; diff --git a/tests/baselines/reference/everyTypeWithAnnotationAndInvalidInitializer.js b/tests/baselines/reference/everyTypeWithAnnotationAndInvalidInitializer.js index 0c07c149afc81..b7858783670cf 100644 --- a/tests/baselines/reference/everyTypeWithAnnotationAndInvalidInitializer.js +++ b/tests/baselines/reference/everyTypeWithAnnotationAndInvalidInitializer.js @@ -34,7 +34,7 @@ namespace N { export function F2(x: number): string { return x.toString(); } } -var aNumber: number = 'this is a string'; +var a number: number = 'this is a string'; var aString: string = 9.9; var aDate: Date = 9.9; @@ -80,7 +80,7 @@ var N; function F2(x) { return x.toString(); } N.F2 = F2; })(N || (N = {})); -var aNumber = 'this is a string'; +var a number = 'this is a string'; var aString = 9.9; var aDate = 9.9; var aVoid = 9.9; diff --git a/tests/baselines/reference/everyTypeWithAnnotationAndInvalidInitializer.symbols b/tests/baselines/reference/everyTypeWithAnnotationAndInvalidInitializer.symbols index 395efd9164fa6..174e313d76384 100644 --- a/tests/baselines/reference/everyTypeWithAnnotationAndInvalidInitializer.symbols +++ b/tests/baselines/reference/everyTypeWithAnnotationAndInvalidInitializer.symbols @@ -81,8 +81,8 @@ namespace N { >toString : Symbol(Number.toString, Decl(lib.es5.d.ts, --, --)) } -var aNumber: number = 'this is a string'; ->aNumber : Symbol(aNumber, Decl(everyTypeWithAnnotationAndInvalidInitializer.ts, 33, 3)) +var a number: number = 'this is a string'; +>a number : Symbol(a number, Decl(everyTypeWithAnnotationAndInvalidInitializer.ts, 33, 3)) var aString: string = 9.9; >aString : Symbol(aString, Decl(everyTypeWithAnnotationAndInvalidInitializer.ts, 34, 3)) diff --git a/tests/baselines/reference/everyTypeWithAnnotationAndInvalidInitializer.types b/tests/baselines/reference/everyTypeWithAnnotationAndInvalidInitializer.types index ce217559731e1..d905774080730 100644 --- a/tests/baselines/reference/everyTypeWithAnnotationAndInvalidInitializer.types +++ b/tests/baselines/reference/everyTypeWithAnnotationAndInvalidInitializer.types @@ -109,8 +109,8 @@ namespace N { > : ^ ^^^ ^^^^^ } -var aNumber: number = 'this is a string'; ->aNumber : number +var a number: number = 'this is a string'; +>a number : number > : ^^^^^^ >'this is a string' : "this is a string" > : ^^^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/everyTypeWithInitializer.js b/tests/baselines/reference/everyTypeWithInitializer.js index 77165215d90e5..7f1cd8a9ea711 100644 --- a/tests/baselines/reference/everyTypeWithInitializer.js +++ b/tests/baselines/reference/everyTypeWithInitializer.js @@ -25,7 +25,7 @@ namespace M { export function F2(x: number): string { return x.toString(); } } -var aNumber = 9.9; +var a number = 9.9; var aString = 'this is a string'; var aDate = new Date(12); var anObject = new Object(); @@ -66,7 +66,7 @@ var M; function F2(x) { return x.toString(); } M.F2 = F2; })(M || (M = {})); -var aNumber = 9.9; +var a number = 9.9; var aString = 'this is a string'; var aDate = new Date(12); var anObject = new Object(); diff --git a/tests/baselines/reference/everyTypeWithInitializer.symbols b/tests/baselines/reference/everyTypeWithInitializer.symbols index 3cecbb903999c..6776fc424b3b1 100644 --- a/tests/baselines/reference/everyTypeWithInitializer.symbols +++ b/tests/baselines/reference/everyTypeWithInitializer.symbols @@ -58,8 +58,8 @@ namespace M { >toString : Symbol(Number.toString, Decl(lib.es5.d.ts, --, --)) } -var aNumber = 9.9; ->aNumber : Symbol(aNumber, Decl(everyTypeWithInitializer.ts, 24, 3)) +var a number = 9.9; +>a number : Symbol(a number, Decl(everyTypeWithInitializer.ts, 24, 3)) var aString = 'this is a string'; >aString : Symbol(aString, Decl(everyTypeWithInitializer.ts, 25, 3)) diff --git a/tests/baselines/reference/everyTypeWithInitializer.types b/tests/baselines/reference/everyTypeWithInitializer.types index 62135e11f5b78..bcbd9fb5e58fc 100644 --- a/tests/baselines/reference/everyTypeWithInitializer.types +++ b/tests/baselines/reference/everyTypeWithInitializer.types @@ -69,8 +69,8 @@ namespace M { > : ^ ^^^ ^^^^^ } -var aNumber = 9.9; ->aNumber : number +var a number = 9.9; +>a number : number > : ^^^^^^ >9.9 : 9.9 > : ^^^ diff --git a/tests/baselines/reference/expandoFunctionNestedAssigments.errors.txt b/tests/baselines/reference/expandoFunctionNestedAssigments.errors.txt index 86cf666fbd3b4..d61e77e94a40b 100644 --- a/tests/baselines/reference/expandoFunctionNestedAssigments.errors.txt +++ b/tests/baselines/reference/expandoFunctionNestedAssigments.errors.txt @@ -49,7 +49,7 @@ expandoFunctionNestedAssigments.ts(7,23): error TS2339: Property 'inNestedFuncti } - for(let f in (Foo.forIn = []) ){ + for(let f in (Foo.foreign = []) ){ Foo.fromForInBody = 1; { Foo.fromForInBodyNested = 1; diff --git a/tests/baselines/reference/expandoFunctionNestedAssigments.js b/tests/baselines/reference/expandoFunctionNestedAssigments.js index fe3a3feec8a6a..6de6c0716de3b 100644 --- a/tests/baselines/reference/expandoFunctionNestedAssigments.js +++ b/tests/baselines/reference/expandoFunctionNestedAssigments.js @@ -46,7 +46,7 @@ for(let f of (Foo.forOf = []) ){ } -for(let f in (Foo.forIn = []) ){ +for(let f in (Foo.foreign = []) ){ Foo.fromForInBody = 1; { Foo.fromForInBodyNested = 1; @@ -88,7 +88,7 @@ for (let f of (Foo.forOf = [])) { Foo.fromForOfBodyNested = 1; } } -for (let f in (Foo.forIn = [])) { +for (let f in (Foo.foreign = [])) { Foo.fromForInBody = 1; { Foo.fromForInBodyNested = 1; @@ -121,7 +121,7 @@ declare namespace Foo { var forOf: any[]; var fromForOfBody: number; var fromForOfBodyNested: number; - var forIn: any[]; + var foreign: any[]; var fromForInBody: number; var fromForInBodyNested: number; } diff --git a/tests/baselines/reference/expandoFunctionNestedAssigments.symbols b/tests/baselines/reference/expandoFunctionNestedAssigments.symbols index 6c91cc3b68c52..1939d11add741 100644 --- a/tests/baselines/reference/expandoFunctionNestedAssigments.symbols +++ b/tests/baselines/reference/expandoFunctionNestedAssigments.symbols @@ -119,11 +119,11 @@ for(let f of (Foo.forOf = []) ){ } -for(let f in (Foo.forIn = []) ){ +for(let f in (Foo.foreign = []) ){ >f : Symbol(f, Decl(expandoFunctionNestedAssigments.ts, 45, 7)) ->Foo.forIn : Symbol(Foo.forIn, Decl(expandoFunctionNestedAssigments.ts, 45, 14)) +>Foo.foreign : Symbol(Foo.foreign, Decl(expandoFunctionNestedAssigments.ts, 45, 14)) >Foo : Symbol(Foo, Decl(expandoFunctionNestedAssigments.ts, 0, 0), Decl(expandoFunctionNestedAssigments.ts, 12, 3), Decl(expandoFunctionNestedAssigments.ts, 16, 6), Decl(expandoFunctionNestedAssigments.ts, 28, 8), Decl(expandoFunctionNestedAssigments.ts, 30, 4) ... and 1 more) ->forIn : Symbol(Foo.forIn, Decl(expandoFunctionNestedAssigments.ts, 45, 14)) +>foreign : Symbol(Foo.foreign, Decl(expandoFunctionNestedAssigments.ts, 45, 14)) Foo.fromForInBody = 1; >Foo.fromForInBody : Symbol(Foo.fromForInBody, Decl(expandoFunctionNestedAssigments.ts, 45, 32)) diff --git a/tests/baselines/reference/expandoFunctionNestedAssigments.types b/tests/baselines/reference/expandoFunctionNestedAssigments.types index f1102b159041e..1a4ef3598fc53 100644 --- a/tests/baselines/reference/expandoFunctionNestedAssigments.types +++ b/tests/baselines/reference/expandoFunctionNestedAssigments.types @@ -300,18 +300,18 @@ for(let f of (Foo.forOf = []) ){ } -for(let f in (Foo.forIn = []) ){ +for(let f in (Foo.foreign = []) ){ >f : string > : ^^^^^^ ->(Foo.forIn = []) : undefined[] +>(Foo.foreign = []) : undefined[] > : ^^^^^^^^^^^ ->Foo.forIn = [] : undefined[] +>Foo.foreign = [] : undefined[] > : ^^^^^^^^^^^ ->Foo.forIn : any[] +>Foo.foreign : any[] > : ^^^^^ >Foo : typeof Foo > : ^^^^^^^^^^ ->forIn : any[] +>foreign : any[] > : ^^^^^ >[] : undefined[] > : ^^^^^^^^^^^ diff --git a/tests/baselines/reference/expandoFunctionNestedAssigmentsDeclared.js b/tests/baselines/reference/expandoFunctionNestedAssigmentsDeclared.js index 32bbc21b86730..5ff0c0b83d71f 100644 --- a/tests/baselines/reference/expandoFunctionNestedAssigmentsDeclared.js +++ b/tests/baselines/reference/expandoFunctionNestedAssigmentsDeclared.js @@ -26,7 +26,7 @@ declare namespace Foo { var forOf: any[]; var fromForOfBody: number; var fromForOfBodyNested: number; - var forIn: any[]; + var foreign: any[]; var fromForInBody: number; var fromForInBodyNested: number; } @@ -66,7 +66,7 @@ for(let f of (Foo.forOf = []) ){ } -for(let f in (Foo.forIn = []) ){ +for(let f in (Foo.foreign = []) ){ Foo.fromForInBody = 1; { Foo.fromForInBodyNested = 1; @@ -105,7 +105,7 @@ for (let f of (Foo.forOf = [])) { Foo.fromForOfBodyNested = 1; } } -for (let f in (Foo.forIn = [])) { +for (let f in (Foo.foreign = [])) { Foo.fromForInBody = 1; { Foo.fromForInBodyNested = 1; @@ -137,7 +137,7 @@ declare namespace Foo { var forOf: any[]; var fromForOfBody: number; var fromForOfBodyNested: number; - var forIn: any[]; + var foreign: any[]; var fromForInBody: number; var fromForInBodyNested: number; } diff --git a/tests/baselines/reference/expandoFunctionNestedAssigmentsDeclared.symbols b/tests/baselines/reference/expandoFunctionNestedAssigmentsDeclared.symbols index 8bbec04eff4dd..b5627b017c403 100644 --- a/tests/baselines/reference/expandoFunctionNestedAssigmentsDeclared.symbols +++ b/tests/baselines/reference/expandoFunctionNestedAssigmentsDeclared.symbols @@ -69,8 +69,8 @@ declare namespace Foo { var fromForOfBodyNested: number; >fromForOfBodyNested : Symbol(fromForOfBodyNested, Decl(expandoFunctionNestedAssigmentsDeclared.ts, 24, 7), Decl(expandoFunctionNestedAssigmentsDeclared.ts, 59, 5)) - var forIn: any[]; ->forIn : Symbol(forIn, Decl(expandoFunctionNestedAssigmentsDeclared.ts, 25, 7), Decl(expandoFunctionNestedAssigmentsDeclared.ts, 65, 14)) + var foreign: any[]; +>foreign : Symbol(foreign, Decl(expandoFunctionNestedAssigmentsDeclared.ts, 25, 7), Decl(expandoFunctionNestedAssigmentsDeclared.ts, 65, 14)) var fromForInBody: number; >fromForInBody : Symbol(fromForInBody, Decl(expandoFunctionNestedAssigmentsDeclared.ts, 26, 7), Decl(expandoFunctionNestedAssigmentsDeclared.ts, 65, 32)) @@ -179,11 +179,11 @@ for(let f of (Foo.forOf = []) ){ } -for(let f in (Foo.forIn = []) ){ +for(let f in (Foo.foreign = []) ){ >f : Symbol(f, Decl(expandoFunctionNestedAssigmentsDeclared.ts, 65, 7)) ->Foo.forIn : Symbol(Foo.forIn, Decl(expandoFunctionNestedAssigmentsDeclared.ts, 25, 7), Decl(expandoFunctionNestedAssigmentsDeclared.ts, 65, 14)) +>Foo.foreign : Symbol(Foo.foreign, Decl(expandoFunctionNestedAssigmentsDeclared.ts, 25, 7), Decl(expandoFunctionNestedAssigmentsDeclared.ts, 65, 14)) >Foo : Symbol(Foo, Decl(expandoFunctionNestedAssigmentsDeclared.ts, 0, 0), Decl(expandoFunctionNestedAssigmentsDeclared.ts, 2, 1), Decl(expandoFunctionNestedAssigmentsDeclared.ts, 32, 3), Decl(expandoFunctionNestedAssigmentsDeclared.ts, 36, 6), Decl(expandoFunctionNestedAssigmentsDeclared.ts, 48, 8) ... and 2 more) ->forIn : Symbol(Foo.forIn, Decl(expandoFunctionNestedAssigmentsDeclared.ts, 25, 7), Decl(expandoFunctionNestedAssigmentsDeclared.ts, 65, 14)) +>foreign : Symbol(Foo.foreign, Decl(expandoFunctionNestedAssigmentsDeclared.ts, 25, 7), Decl(expandoFunctionNestedAssigmentsDeclared.ts, 65, 14)) Foo.fromForInBody = 1; >Foo.fromForInBody : Symbol(Foo.fromForInBody, Decl(expandoFunctionNestedAssigmentsDeclared.ts, 26, 7), Decl(expandoFunctionNestedAssigmentsDeclared.ts, 65, 32)) diff --git a/tests/baselines/reference/expandoFunctionNestedAssigmentsDeclared.types b/tests/baselines/reference/expandoFunctionNestedAssigmentsDeclared.types index 892ddc51778e1..30a316ec1e00c 100644 --- a/tests/baselines/reference/expandoFunctionNestedAssigmentsDeclared.types +++ b/tests/baselines/reference/expandoFunctionNestedAssigmentsDeclared.types @@ -91,8 +91,8 @@ declare namespace Foo { >fromForOfBodyNested : number > : ^^^^^^ - var forIn: any[]; ->forIn : any[] + var foreign: any[]; +>foreign : any[] > : ^^^^^ var fromForInBody: number; @@ -360,18 +360,18 @@ for(let f of (Foo.forOf = []) ){ } -for(let f in (Foo.forIn = []) ){ +for(let f in (Foo.foreign = []) ){ >f : string > : ^^^^^^ ->(Foo.forIn = []) : undefined[] +>(Foo.foreign = []) : undefined[] > : ^^^^^^^^^^^ ->Foo.forIn = [] : undefined[] +>Foo.foreign = [] : undefined[] > : ^^^^^^^^^^^ ->Foo.forIn : any[] +>Foo.foreign : any[] > : ^^^^^ >Foo : typeof Foo > : ^^^^^^^^^^ ->forIn : any[] +>foreign : any[] > : ^^^^^ >[] : undefined[] > : ^^^^^^^^^^^ diff --git a/tests/baselines/reference/exportImportCanSubstituteConstEnumForValue(target=es2015).errors.txt b/tests/baselines/reference/exportImportCanSubstituteConstEnumForValue(target=es2015).errors.txt index 08a44fab214f6..597a046431a36 100644 --- a/tests/baselines/reference/exportImportCanSubstituteConstEnumForValue(target=es2015).errors.txt +++ b/tests/baselines/reference/exportImportCanSubstituteConstEnumForValue(target=es2015).errors.txt @@ -41,12 +41,12 @@ error TS5107: Option 'module=AMD' is deprecated and will stop functioning in Typ export import ReExportedEnum = Dialogs.DialogResult; /** - * Not exported to show difference. No javascript is emmitted (as expected) + * Not exported to show difference. No javascript is emitted (as expected) */ import DialogButtons = Dialogs.MessageBoxButtons; /** - * Re-exporting a function type to show difference. No javascript is emmitted (as expected) + * Re-exporting a function type to show difference. No javascript is emitted (as expected) */ export import Callback = Dialogs.DialogResultCallback; diff --git a/tests/baselines/reference/exportImportCanSubstituteConstEnumForValue(target=es2015).js b/tests/baselines/reference/exportImportCanSubstituteConstEnumForValue(target=es2015).js index 6e9a48643c5cc..d40af21528225 100644 --- a/tests/baselines/reference/exportImportCanSubstituteConstEnumForValue(target=es2015).js +++ b/tests/baselines/reference/exportImportCanSubstituteConstEnumForValue(target=es2015).js @@ -39,12 +39,12 @@ namespace MsPortalFx.ViewModels { export import ReExportedEnum = Dialogs.DialogResult; /** - * Not exported to show difference. No javascript is emmitted (as expected) + * Not exported to show difference. No javascript is emitted (as expected) */ import DialogButtons = Dialogs.MessageBoxButtons; /** - * Re-exporting a function type to show difference. No javascript is emmitted (as expected) + * Re-exporting a function type to show difference. No javascript is emitted (as expected) */ export import Callback = Dialogs.DialogResultCallback; @@ -121,7 +121,7 @@ declare namespace MsPortalFx.ViewModels { */ export import ReExportedEnum = Dialogs.DialogResult; /** - * Re-exporting a function type to show difference. No javascript is emmitted (as expected) + * Re-exporting a function type to show difference. No javascript is emitted (as expected) */ export import Callback = Dialogs.DialogResultCallback; class SomeUsagesOfTheseConsts { diff --git a/tests/baselines/reference/exportImportCanSubstituteConstEnumForValue(target=es2015).symbols b/tests/baselines/reference/exportImportCanSubstituteConstEnumForValue(target=es2015).symbols index c94e113918142..106ae1291e4d0 100644 --- a/tests/baselines/reference/exportImportCanSubstituteConstEnumForValue(target=es2015).symbols +++ b/tests/baselines/reference/exportImportCanSubstituteConstEnumForValue(target=es2015).symbols @@ -83,7 +83,7 @@ namespace MsPortalFx.ViewModels { >DialogResult : Symbol(ReExportedEnum, Decl(exportImportCanSubstituteConstEnumForValue.ts, 0, 41)) /** - * Not exported to show difference. No javascript is emmitted (as expected) + * Not exported to show difference. No javascript is emitted (as expected) */ import DialogButtons = Dialogs.MessageBoxButtons; >DialogButtons : Symbol(DialogButtons, Decl(exportImportCanSubstituteConstEnumForValue.ts, 35, 56)) @@ -91,7 +91,7 @@ namespace MsPortalFx.ViewModels { >MessageBoxButtons : Symbol(DialogButtons, Decl(exportImportCanSubstituteConstEnumForValue.ts, 17, 5)) /** - * Re-exporting a function type to show difference. No javascript is emmitted (as expected) + * Re-exporting a function type to show difference. No javascript is emitted (as expected) */ export import Callback = Dialogs.DialogResultCallback; >Callback : Symbol(Callback, Decl(exportImportCanSubstituteConstEnumForValue.ts, 40, 53)) diff --git a/tests/baselines/reference/exportImportCanSubstituteConstEnumForValue(target=es2015).types b/tests/baselines/reference/exportImportCanSubstituteConstEnumForValue(target=es2015).types index f1373fd2237e7..e8eb8a8c7c9be 100644 --- a/tests/baselines/reference/exportImportCanSubstituteConstEnumForValue(target=es2015).types +++ b/tests/baselines/reference/exportImportCanSubstituteConstEnumForValue(target=es2015).types @@ -108,7 +108,7 @@ namespace MsPortalFx.ViewModels { > : ^^^^^^^^^^^^^^ /** - * Not exported to show difference. No javascript is emmitted (as expected) + * Not exported to show difference. No javascript is emitted (as expected) */ import DialogButtons = Dialogs.MessageBoxButtons; >DialogButtons : typeof DialogButtons @@ -119,7 +119,7 @@ namespace MsPortalFx.ViewModels { > : ^^^^^^^^^^^^^ /** - * Re-exporting a function type to show difference. No javascript is emmitted (as expected) + * Re-exporting a function type to show difference. No javascript is emitted (as expected) */ export import Callback = Dialogs.DialogResultCallback; >Callback : any diff --git a/tests/baselines/reference/exportImportCanSubstituteConstEnumForValue(target=es5).errors.txt b/tests/baselines/reference/exportImportCanSubstituteConstEnumForValue(target=es5).errors.txt index 8d1fde6460652..236e96b3756f6 100644 --- a/tests/baselines/reference/exportImportCanSubstituteConstEnumForValue(target=es5).errors.txt +++ b/tests/baselines/reference/exportImportCanSubstituteConstEnumForValue(target=es5).errors.txt @@ -43,12 +43,12 @@ error TS5107: Option 'target=ES5' is deprecated and will stop functioning in Typ export import ReExportedEnum = Dialogs.DialogResult; /** - * Not exported to show difference. No javascript is emmitted (as expected) + * Not exported to show difference. No javascript is emitted (as expected) */ import DialogButtons = Dialogs.MessageBoxButtons; /** - * Re-exporting a function type to show difference. No javascript is emmitted (as expected) + * Re-exporting a function type to show difference. No javascript is emitted (as expected) */ export import Callback = Dialogs.DialogResultCallback; diff --git a/tests/baselines/reference/exportImportCanSubstituteConstEnumForValue(target=es5).js b/tests/baselines/reference/exportImportCanSubstituteConstEnumForValue(target=es5).js index 627831e22c3bd..13511a842276e 100644 --- a/tests/baselines/reference/exportImportCanSubstituteConstEnumForValue(target=es5).js +++ b/tests/baselines/reference/exportImportCanSubstituteConstEnumForValue(target=es5).js @@ -39,12 +39,12 @@ namespace MsPortalFx.ViewModels { export import ReExportedEnum = Dialogs.DialogResult; /** - * Not exported to show difference. No javascript is emmitted (as expected) + * Not exported to show difference. No javascript is emitted (as expected) */ import DialogButtons = Dialogs.MessageBoxButtons; /** - * Re-exporting a function type to show difference. No javascript is emmitted (as expected) + * Re-exporting a function type to show difference. No javascript is emitted (as expected) */ export import Callback = Dialogs.DialogResultCallback; @@ -122,7 +122,7 @@ declare namespace MsPortalFx.ViewModels { */ export import ReExportedEnum = Dialogs.DialogResult; /** - * Re-exporting a function type to show difference. No javascript is emmitted (as expected) + * Re-exporting a function type to show difference. No javascript is emitted (as expected) */ export import Callback = Dialogs.DialogResultCallback; class SomeUsagesOfTheseConsts { diff --git a/tests/baselines/reference/exportImportCanSubstituteConstEnumForValue(target=es5).symbols b/tests/baselines/reference/exportImportCanSubstituteConstEnumForValue(target=es5).symbols index c94e113918142..106ae1291e4d0 100644 --- a/tests/baselines/reference/exportImportCanSubstituteConstEnumForValue(target=es5).symbols +++ b/tests/baselines/reference/exportImportCanSubstituteConstEnumForValue(target=es5).symbols @@ -83,7 +83,7 @@ namespace MsPortalFx.ViewModels { >DialogResult : Symbol(ReExportedEnum, Decl(exportImportCanSubstituteConstEnumForValue.ts, 0, 41)) /** - * Not exported to show difference. No javascript is emmitted (as expected) + * Not exported to show difference. No javascript is emitted (as expected) */ import DialogButtons = Dialogs.MessageBoxButtons; >DialogButtons : Symbol(DialogButtons, Decl(exportImportCanSubstituteConstEnumForValue.ts, 35, 56)) @@ -91,7 +91,7 @@ namespace MsPortalFx.ViewModels { >MessageBoxButtons : Symbol(DialogButtons, Decl(exportImportCanSubstituteConstEnumForValue.ts, 17, 5)) /** - * Re-exporting a function type to show difference. No javascript is emmitted (as expected) + * Re-exporting a function type to show difference. No javascript is emitted (as expected) */ export import Callback = Dialogs.DialogResultCallback; >Callback : Symbol(Callback, Decl(exportImportCanSubstituteConstEnumForValue.ts, 40, 53)) diff --git a/tests/baselines/reference/exportImportCanSubstituteConstEnumForValue(target=es5).types b/tests/baselines/reference/exportImportCanSubstituteConstEnumForValue(target=es5).types index f1373fd2237e7..e8eb8a8c7c9be 100644 --- a/tests/baselines/reference/exportImportCanSubstituteConstEnumForValue(target=es5).types +++ b/tests/baselines/reference/exportImportCanSubstituteConstEnumForValue(target=es5).types @@ -108,7 +108,7 @@ namespace MsPortalFx.ViewModels { > : ^^^^^^^^^^^^^^ /** - * Not exported to show difference. No javascript is emmitted (as expected) + * Not exported to show difference. No javascript is emitted (as expected) */ import DialogButtons = Dialogs.MessageBoxButtons; >DialogButtons : typeof DialogButtons @@ -119,7 +119,7 @@ namespace MsPortalFx.ViewModels { > : ^^^^^^^^^^^^^ /** - * Re-exporting a function type to show difference. No javascript is emmitted (as expected) + * Re-exporting a function type to show difference. No javascript is emitted (as expected) */ export import Callback = Dialogs.DialogResultCallback; >Callback : any diff --git a/tests/baselines/reference/exportImportMultipleFiles.errors.txt b/tests/baselines/reference/exportImportMultipleFiles.errors.txt index a9e71232f82a7..444f6ba7b8834 100644 --- a/tests/baselines/reference/exportImportMultipleFiles.errors.txt +++ b/tests/baselines/reference/exportImportMultipleFiles.errors.txt @@ -4,7 +4,7 @@ error TS5107: Option 'module=AMD' is deprecated and will stop functioning in Typ !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error. ==== exportImportMultipleFiles_userCode.ts (0 errors) ==== import lib = require('./exportImportMultipleFiles_library'); - lib.math.add(3, 4); // Shouldnt be error + lib.math.add(3, 4); // Shouldn't be error ==== exportImportMultipleFiles_math.ts (0 errors) ==== export function add(a, b) { return a + b; } diff --git a/tests/baselines/reference/exportImportMultipleFiles.js b/tests/baselines/reference/exportImportMultipleFiles.js index ee087e9d44032..a4c3571831e9d 100644 --- a/tests/baselines/reference/exportImportMultipleFiles.js +++ b/tests/baselines/reference/exportImportMultipleFiles.js @@ -9,7 +9,7 @@ math.add(3, 4); // OK //// [exportImportMultipleFiles_userCode.ts] import lib = require('./exportImportMultipleFiles_library'); -lib.math.add(3, 4); // Shouldnt be error +lib.math.add(3, 4); // Shouldn't be error //// [exportImportMultipleFiles_math.js] @@ -30,5 +30,5 @@ define(["require", "exports", "exportImportMultipleFiles_math"], function (requi define(["require", "exports", "./exportImportMultipleFiles_library"], function (require, exports, lib) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); - lib.math.add(3, 4); // Shouldnt be error + lib.math.add(3, 4); // Shouldn't be error }); diff --git a/tests/baselines/reference/exportImportMultipleFiles.symbols b/tests/baselines/reference/exportImportMultipleFiles.symbols index efa13b45292a9..4f6f4e3f37cd8 100644 --- a/tests/baselines/reference/exportImportMultipleFiles.symbols +++ b/tests/baselines/reference/exportImportMultipleFiles.symbols @@ -4,7 +4,7 @@ import lib = require('./exportImportMultipleFiles_library'); >lib : Symbol(lib, Decl(exportImportMultipleFiles_userCode.ts, 0, 0)) -lib.math.add(3, 4); // Shouldnt be error +lib.math.add(3, 4); // Shouldn't be error >lib.math.add : Symbol(lib.math.add, Decl(exportImportMultipleFiles_math.ts, 0, 0)) >lib.math : Symbol(lib.math, Decl(exportImportMultipleFiles_library.ts, 0, 0)) >lib : Symbol(lib, Decl(exportImportMultipleFiles_userCode.ts, 0, 0)) diff --git a/tests/baselines/reference/exportImportMultipleFiles.types b/tests/baselines/reference/exportImportMultipleFiles.types index 0dc9157861f77..159b5eb1b67c5 100644 --- a/tests/baselines/reference/exportImportMultipleFiles.types +++ b/tests/baselines/reference/exportImportMultipleFiles.types @@ -5,7 +5,7 @@ import lib = require('./exportImportMultipleFiles_library'); >lib : typeof lib > : ^^^^^^^^^^ -lib.math.add(3, 4); // Shouldnt be error +lib.math.add(3, 4); // Shouldn't be error >lib.math.add(3, 4) : any > : ^^^ >lib.math.add : (a: any, b: any) => any diff --git a/tests/baselines/reference/extendGlobalThis.errors.txt b/tests/baselines/reference/extendGlobalThis.errors.txt index 121635b759fa6..2257be36ddb6d 100644 --- a/tests/baselines/reference/extendGlobalThis.errors.txt +++ b/tests/baselines/reference/extendGlobalThis.errors.txt @@ -11,7 +11,7 @@ index.ts(1,8): error TS2882: Cannot find module or type declarations for side-ef export {} ==== index.ts (1 errors) ==== - import "./extention"; + import "./extension"; ~~~~~~~~~~~~~ !!! error TS2882: Cannot find module or type declarations for side-effect import of './extention'. diff --git a/tests/baselines/reference/extendGlobalThis.js b/tests/baselines/reference/extendGlobalThis.js index a12d73c4c0b2b..b587c6d7397c7 100644 --- a/tests/baselines/reference/extendGlobalThis.js +++ b/tests/baselines/reference/extendGlobalThis.js @@ -10,7 +10,7 @@ declare global { export {} //// [index.ts] -import "./extention"; +import "./extension"; globalThis.tests = "a-b"; console.log(globalThis.test.split("-")); @@ -19,6 +19,6 @@ console.log(globalThis.test.split("-")); //// [index.js] "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -require("./extention"); +require("./extension"); globalThis.tests = "a-b"; console.log(globalThis.test.split("-")); diff --git a/tests/baselines/reference/extendGlobalThis.symbols b/tests/baselines/reference/extendGlobalThis.symbols index e1f848a7c5579..9f65aec71aab6 100644 --- a/tests/baselines/reference/extendGlobalThis.symbols +++ b/tests/baselines/reference/extendGlobalThis.symbols @@ -15,7 +15,7 @@ declare global { export {} === index.ts === -import "./extention"; +import "./extension"; globalThis.tests = "a-b"; >globalThis : Symbol(globalThis, Decl(extension.d.ts, 0, 16)) diff --git a/tests/baselines/reference/extendGlobalThis.types b/tests/baselines/reference/extendGlobalThis.types index 22f7d48d727d9..db0a18f899e3d 100644 --- a/tests/baselines/reference/extendGlobalThis.types +++ b/tests/baselines/reference/extendGlobalThis.types @@ -18,7 +18,7 @@ declare global { export {} === index.ts === -import "./extention"; +import "./extension"; globalThis.tests = "a-b"; >globalThis.tests = "a-b" : "a-b" diff --git a/tests/baselines/reference/fatarrowfunctionsOptionalArgs.errors.txt b/tests/baselines/reference/fatarrowfunctionsOptionalArgs.errors.txt index 6400a8586ed09..e7ab9aec23a3c 100644 --- a/tests/baselines/reference/fatarrowfunctionsOptionalArgs.errors.txt +++ b/tests/baselines/reference/fatarrowfunctionsOptionalArgs.errors.txt @@ -131,7 +131,7 @@ fatarrowfunctionsOptionalArgs.ts(130,24): error TS7006: Parameter 'b' implicitly ~~~ !!! error TS7006: Parameter 'arg' implicitly has an 'any' type. - // in ternary exression + // in ternary expression false ? () => 41 : null; false ? (arg) => 42 : null; ~~~ @@ -145,7 +145,7 @@ fatarrowfunctionsOptionalArgs.ts(130,24): error TS7006: Parameter 'b' implicitly false ? (arg?: number = 0) => 47 : null; false ? (...arg: number[]) => 48 : null; - // in ternary exression within paren + // in ternary expression within paren false ? (() => 51) : null; false ? ((arg) => 52) : null; ~~~ diff --git a/tests/baselines/reference/fatarrowfunctionsOptionalArgs.js b/tests/baselines/reference/fatarrowfunctionsOptionalArgs.js index 692c16548504c..8ce096bb1e503 100644 --- a/tests/baselines/reference/fatarrowfunctionsOptionalArgs.js +++ b/tests/baselines/reference/fatarrowfunctionsOptionalArgs.js @@ -53,7 +53,7 @@ arg => 2; // in multiple paren (((((arg) => { return 32; })))); -// in ternary exression +// in ternary expression false ? () => 41 : null; false ? (arg) => 42 : null; false ? (arg = 1) => 43 : null; @@ -63,7 +63,7 @@ false ? (arg?: number) => 46 : null; false ? (arg?: number = 0) => 47 : null; false ? (...arg: number[]) => 48 : null; -// in ternary exression within paren +// in ternary expression within paren false ? (() => 51) : null; false ? ((arg) => 52) : null; false ? ((arg = 1) => 53) : null; @@ -174,7 +174,7 @@ arg => 2; ((...arg) => 28); // in multiple paren (((((arg) => { return 32; })))); -// in ternary exression +// in ternary expression false ? () => 41 : null; false ? (arg) => 42 : null; false ? (arg = 1) => 43 : null; @@ -183,7 +183,7 @@ false ? (arg) => 45 : null; false ? (arg) => 46 : null; false ? (arg = 0) => 47 : null; false ? (...arg) => 48 : null; -// in ternary exression within paren +// in ternary expression within paren false ? (() => 51) : null; false ? ((arg) => 52) : null; false ? ((arg = 1) => 53) : null; diff --git a/tests/baselines/reference/fatarrowfunctionsOptionalArgs.symbols b/tests/baselines/reference/fatarrowfunctionsOptionalArgs.symbols index b031449fcb52c..e4a3fedc11c5a 100644 --- a/tests/baselines/reference/fatarrowfunctionsOptionalArgs.symbols +++ b/tests/baselines/reference/fatarrowfunctionsOptionalArgs.symbols @@ -98,7 +98,7 @@ arg => 2; (((((arg) => { return 32; })))); >arg : Symbol(arg, Decl(fatarrowfunctionsOptionalArgs.ts, 50, 5)) -// in ternary exression +// in ternary expression false ? () => 41 : null; false ? (arg) => 42 : null; >arg : Symbol(arg, Decl(fatarrowfunctionsOptionalArgs.ts, 54, 9)) @@ -121,7 +121,7 @@ false ? (arg?: number = 0) => 47 : null; false ? (...arg: number[]) => 48 : null; >arg : Symbol(arg, Decl(fatarrowfunctionsOptionalArgs.ts, 60, 9)) -// in ternary exression within paren +// in ternary expression within paren false ? (() => 51) : null; false ? ((arg) => 52) : null; >arg : Symbol(arg, Decl(fatarrowfunctionsOptionalArgs.ts, 64, 10)) diff --git a/tests/baselines/reference/fatarrowfunctionsOptionalArgs.types b/tests/baselines/reference/fatarrowfunctionsOptionalArgs.types index ba83de446a09b..a6bf92a238f38 100644 --- a/tests/baselines/reference/fatarrowfunctionsOptionalArgs.types +++ b/tests/baselines/reference/fatarrowfunctionsOptionalArgs.types @@ -275,7 +275,7 @@ arg => 2; >32 : 32 > : ^^ -// in ternary exression +// in ternary expression false ? () => 41 : null; >false ? () => 41 : null : (() => number) | null > : ^^^^^^^^^^^^^^^^^^^^^ @@ -374,7 +374,7 @@ false ? (...arg: number[]) => 48 : null; >48 : 48 > : ^^ -// in ternary exression within paren +// in ternary expression within paren false ? (() => 51) : null; >false ? (() => 51) : null : (() => number) | null > : ^^^^^^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/findAllRefsForRest.baseline.jsonc b/tests/baselines/reference/findAllRefsForRest.baseline.jsonc index 25662eb128daa..e84db07347493 100644 --- a/tests/baselines/reference/findAllRefsForRest.baseline.jsonc +++ b/tests/baselines/reference/findAllRefsForRest.baseline.jsonc @@ -3,7 +3,7 @@ // interface Gen { // x: number // /*FIND ALL REFS*/<|[|{| isDefinition: true |}parent|]: Gen;|> -// millenial: string; +// millennial: string; // } // let t: Gen; // var { x, ...rest } = t; @@ -14,7 +14,7 @@ // interface Gen { // x: number // /*FIND ALL REFS*/<|[|parent|]: Gen;|> - // millenial: string; + // millennial: string; // } // let t: Gen; // var { x, ...rest } = t; @@ -79,7 +79,7 @@ // interface Gen { // x: number // <|[|parent|]: Gen;|> -// millenial: string; +// millennial: string; // } // let t: Gen; // var { x, ...rest } = t; @@ -90,7 +90,7 @@ // interface Gen { // x: number // <|[|parent|]: Gen;|> - // millenial: string; + // millennial: string; // } // let t: Gen; // var { x, ...rest } = t; diff --git a/tests/baselines/reference/fixSignatureCaching.errors.txt b/tests/baselines/reference/fixSignatureCaching.errors.txt index 5c3ceb0cf961e..93ea57f22b006 100644 --- a/tests/baselines/reference/fixSignatureCaching.errors.txt +++ b/tests/baselines/reference/fixSignatureCaching.errors.txt @@ -215,10 +215,10 @@ fixSignatureCaching.ts(983,44): error TS2339: Property 'MobileDetect' does not e "GenericTablet": "Android.*\\b97D\\b|Tablet(?!.*PC)|BNTV250A|MID-WCDMA|LogicPD Zoom2|\\bA7EB\\b|CatNova8|A1_07|CT704|CT1002|\\bM721\\b|rk30sdk|\\bEVOTAB\\b|M758A|ET904|ALUMIUM10|Smartfren Tab|Endeavour 1010|Tablet-PC-4|Tagi Tab|\\bM6pro\\b|CT1020W|arc 10HD|\\bJolla\\b|\\bTP750\\b" }, "oss": { - "AndroidOS": "Android", + "androids": "Android", "BlackBerryOS": "blackberry|\\bBB10\\b|rim tablet os", "PalmOS": "PalmOS|avantgo|blazer|elaine|hiptop|palm|plucker|xiino", - "SymbianOS": "Symbian|SymbOS|Series60|Series40|SYB-[0-9]+|\\bS60\\b", + "SymbianOS": "Symbian|symbols|Series60|Series40|SYB-[0-9]+|\\bS60\\b", "WindowsMobileOS": "Windows CE.*(PPC|Smartphone|Mobile|[0-9]{3}x[0-9]{3})|Window Mobile|Windows Phone [0-9.]+|WCE;", "WindowsPhoneOS": "Windows Phone 10.0|Windows Phone 8.1|Windows Phone 8.0|Windows Phone OS|XBLWP7|ZuneWP7|Windows NT 6.[23]; ARM;", "iOS": "\\biPhone.*Mobile|\\biPod|\\biPad", @@ -989,7 +989,7 @@ fixSignatureCaching.ts(983,44): error TS2339: Property 'MobileDetect' does not e * Returns the detected operating system string or null. *
* The operating system is one of following keys:
- *
AndroidOS, BlackBerryOS, PalmOS, SymbianOS, WindowsMobileOS, WindowsPhoneOS, + *
androids, BlackBerryOS, PalmOS, SymbianOS, WindowsMobileOS, WindowsPhoneOS, * iOS, MeeGoOS, MaemoOS, JavaOS, webOS, badaOS, BREWOS
* * @returns {String} the key for the detected operating system. diff --git a/tests/baselines/reference/fixSignatureCaching.js b/tests/baselines/reference/fixSignatureCaching.js index 0296e4d897bb1..2b9c56840c5ac 100644 --- a/tests/baselines/reference/fixSignatureCaching.js +++ b/tests/baselines/reference/fixSignatureCaching.js @@ -154,10 +154,10 @@ define(function () { "GenericTablet": "Android.*\\b97D\\b|Tablet(?!.*PC)|BNTV250A|MID-WCDMA|LogicPD Zoom2|\\bA7EB\\b|CatNova8|A1_07|CT704|CT1002|\\bM721\\b|rk30sdk|\\bEVOTAB\\b|M758A|ET904|ALUMIUM10|Smartfren Tab|Endeavour 1010|Tablet-PC-4|Tagi Tab|\\bM6pro\\b|CT1020W|arc 10HD|\\bJolla\\b|\\bTP750\\b" }, "oss": { - "AndroidOS": "Android", + "androids": "Android", "BlackBerryOS": "blackberry|\\bBB10\\b|rim tablet os", "PalmOS": "PalmOS|avantgo|blazer|elaine|hiptop|palm|plucker|xiino", - "SymbianOS": "Symbian|SymbOS|Series60|Series40|SYB-[0-9]+|\\bS60\\b", + "SymbianOS": "Symbian|symbols|Series60|Series40|SYB-[0-9]+|\\bS60\\b", "WindowsMobileOS": "Windows CE.*(PPC|Smartphone|Mobile|[0-9]{3}x[0-9]{3})|Window Mobile|Windows Phone [0-9.]+|WCE;", "WindowsPhoneOS": "Windows Phone 10.0|Windows Phone 8.1|Windows Phone 8.0|Windows Phone OS|XBLWP7|ZuneWP7|Windows NT 6.[23]; ARM;", "iOS": "\\biPhone.*Mobile|\\biPod|\\biPad", @@ -840,7 +840,7 @@ define(function () { * Returns the detected operating system string or null. *
* The operating system is one of following keys:
- *
AndroidOS, BlackBerryOS, PalmOS, SymbianOS, WindowsMobileOS, WindowsPhoneOS, + *
androids, BlackBerryOS, PalmOS, SymbianOS, WindowsMobileOS, WindowsPhoneOS, * iOS, MeeGoOS, MaemoOS, JavaOS, webOS, badaOS, BREWOS
* * @returns {String} the key for the detected operating system. @@ -1143,10 +1143,10 @@ define(function () { "GenericTablet": "Android.*\\b97D\\b|Tablet(?!.*PC)|BNTV250A|MID-WCDMA|LogicPD Zoom2|\\bA7EB\\b|CatNova8|A1_07|CT704|CT1002|\\bM721\\b|rk30sdk|\\bEVOTAB\\b|M758A|ET904|ALUMIUM10|Smartfren Tab|Endeavour 1010|Tablet-PC-4|Tagi Tab|\\bM6pro\\b|CT1020W|arc 10HD|\\bJolla\\b|\\bTP750\\b" }, "oss": { - "AndroidOS": "Android", + "androids": "Android", "BlackBerryOS": "blackberry|\\bBB10\\b|rim tablet os", "PalmOS": "PalmOS|avantgo|blazer|elaine|hiptop|palm|plucker|xiino", - "SymbianOS": "Symbian|SymbOS|Series60|Series40|SYB-[0-9]+|\\bS60\\b", + "SymbianOS": "Symbian|symbols|Series60|Series40|SYB-[0-9]+|\\bS60\\b", "WindowsMobileOS": "Windows CE.*(PPC|Smartphone|Mobile|[0-9]{3}x[0-9]{3})|Window Mobile|Windows Phone [0-9.]+|WCE;", "WindowsPhoneOS": "Windows Phone 10.0|Windows Phone 8.1|Windows Phone 8.0|Windows Phone OS|XBLWP7|ZuneWP7|Windows NT 6.[23]; ARM;", "iOS": "\\biPhone.*Mobile|\\biPod|\\biPad", @@ -1767,7 +1767,7 @@ define(function () { * Returns the detected operating system string or null. *
* The operating system is one of following keys:
- *
AndroidOS, BlackBerryOS, PalmOS, SymbianOS, WindowsMobileOS, WindowsPhoneOS, + *
androids, BlackBerryOS, PalmOS, SymbianOS, WindowsMobileOS, WindowsPhoneOS, * iOS, MeeGoOS, MaemoOS, JavaOS, webOS, badaOS, BREWOS
* * @returns {String} the key for the detected operating system. diff --git a/tests/baselines/reference/fixSignatureCaching.symbols b/tests/baselines/reference/fixSignatureCaching.symbols index c64e72d66c84b..0999f69acca19 100644 --- a/tests/baselines/reference/fixSignatureCaching.symbols +++ b/tests/baselines/reference/fixSignatureCaching.symbols @@ -446,8 +446,8 @@ define(function () { "oss": { >"oss" : Symbol("oss", Decl(fixSignatureCaching.ts, 151, 6)) - "AndroidOS": "Android", ->"AndroidOS" : Symbol("AndroidOS", Decl(fixSignatureCaching.ts, 152, 12)) + "androids": "Android", +>"androids" : Symbol("androids", Decl(fixSignatureCaching.ts, 152, 12)) "BlackBerryOS": "blackberry|\\bBB10\\b|rim tablet os", >"BlackBerryOS" : Symbol("BlackBerryOS", Decl(fixSignatureCaching.ts, 153, 31)) @@ -455,7 +455,7 @@ define(function () { "PalmOS": "PalmOS|avantgo|blazer|elaine|hiptop|palm|plucker|xiino", >"PalmOS" : Symbol("PalmOS", Decl(fixSignatureCaching.ts, 154, 62)) - "SymbianOS": "Symbian|SymbOS|Series60|Series40|SYB-[0-9]+|\\bS60\\b", + "SymbianOS": "Symbian|symbols|Series60|Series40|SYB-[0-9]+|\\bS60\\b", >"SymbianOS" : Symbol("SymbianOS", Decl(fixSignatureCaching.ts, 155, 75)) "WindowsMobileOS": "Windows CE.*(PPC|Smartphone|Mobile|[0-9]{3}x[0-9]{3})|Window Mobile|Windows Phone [0-9.]+|WCE;", @@ -1863,7 +1863,7 @@ define(function () { * Returns the detected operating system string or null. *
* The operating system is one of following keys:
- *
AndroidOS, BlackBerryOS, PalmOS, SymbianOS, WindowsMobileOS, WindowsPhoneOS, + *
androids, BlackBerryOS, PalmOS, SymbianOS, WindowsMobileOS, WindowsPhoneOS, * iOS, MeeGoOS, MaemoOS, JavaOS, webOS, badaOS, BREWOS
* * @returns {String} the key for the detected operating system. diff --git a/tests/baselines/reference/fixSignatureCaching.types b/tests/baselines/reference/fixSignatureCaching.types index 4251529b6a09e..a121450bbe13d 100644 --- a/tests/baselines/reference/fixSignatureCaching.types +++ b/tests/baselines/reference/fixSignatureCaching.types @@ -7,11 +7,11 @@ Type Count: 1,000 // Repro from #10697 (function (define, undefined) { ->(function (define, undefined) {define(function () { 'use strict'; var impl = {}; impl.mobileDetectRules = { "phones": { "iPhone": "\\biPhone\\b|\\biPod\\b", "BlackBerry": "BlackBerry|\\bBB10\\b|rim[0-9]+", "HTC": "HTC|HTC.*(Sensation|Evo|Vision|Explorer|6800|8100|8900|A7272|S510e|C110e|Legend|Desire|T8282)|APX515CKT|Qtek9090|APA9292KT|HD_mini|Sensation.*Z710e|PG86100|Z715e|Desire.*(A8181|HD)|ADR6200|ADR6400L|ADR6425|001HT|Inspire 4G|Android.*\\bEVO\\b|T-Mobile G1|Z520m", "Nexus": "Nexus One|Nexus S|Galaxy.*Nexus|Android.*Nexus.*Mobile|Nexus 4|Nexus 5|Nexus 6", "Dell": "Dell.*Streak|Dell.*Aero|Dell.*Venue|DELL.*Venue Pro|Dell Flash|Dell Smoke|Dell Mini 3iX|XCD28|XCD35|\\b001DL\\b|\\b101DL\\b|\\bGS01\\b", "Motorola": "Motorola|DROIDX|DROID BIONIC|\\bDroid\\b.*Build|Android.*Xoom|HRI39|MOT-|A1260|A1680|A555|A853|A855|A953|A955|A956|Motorola.*ELECTRIFY|Motorola.*i1|i867|i940|MB200|MB300|MB501|MB502|MB508|MB511|MB520|MB525|MB526|MB611|MB612|MB632|MB810|MB855|MB860|MB861|MB865|MB870|ME501|ME502|ME511|ME525|ME600|ME632|ME722|ME811|ME860|ME863|ME865|MT620|MT710|MT716|MT720|MT810|MT870|MT917|Motorola.*TITANIUM|WX435|WX445|XT300|XT301|XT311|XT316|XT317|XT319|XT320|XT390|XT502|XT530|XT531|XT532|XT535|XT603|XT610|XT611|XT615|XT681|XT701|XT702|XT711|XT720|XT800|XT806|XT860|XT862|XT875|XT882|XT883|XT894|XT901|XT907|XT909|XT910|XT912|XT928|XT926|XT915|XT919|XT925|XT1021|\\bMoto E\\b", "Samsung": "Samsung|SM-G9250|GT-19300|SGH-I337|BGT-S5230|GT-B2100|GT-B2700|GT-B2710|GT-B3210|GT-B3310|GT-B3410|GT-B3730|GT-B3740|GT-B5510|GT-B5512|GT-B5722|GT-B6520|GT-B7300|GT-B7320|GT-B7330|GT-B7350|GT-B7510|GT-B7722|GT-B7800|GT-C3010|GT-C3011|GT-C3060|GT-C3200|GT-C3212|GT-C3212I|GT-C3262|GT-C3222|GT-C3300|GT-C3300K|GT-C3303|GT-C3303K|GT-C3310|GT-C3322|GT-C3330|GT-C3350|GT-C3500|GT-C3510|GT-C3530|GT-C3630|GT-C3780|GT-C5010|GT-C5212|GT-C6620|GT-C6625|GT-C6712|GT-E1050|GT-E1070|GT-E1075|GT-E1080|GT-E1081|GT-E1085|GT-E1087|GT-E1100|GT-E1107|GT-E1110|GT-E1120|GT-E1125|GT-E1130|GT-E1160|GT-E1170|GT-E1175|GT-E1180|GT-E1182|GT-E1200|GT-E1210|GT-E1225|GT-E1230|GT-E1390|GT-E2100|GT-E2120|GT-E2121|GT-E2152|GT-E2220|GT-E2222|GT-E2230|GT-E2232|GT-E2250|GT-E2370|GT-E2550|GT-E2652|GT-E3210|GT-E3213|GT-I5500|GT-I5503|GT-I5700|GT-I5800|GT-I5801|GT-I6410|GT-I6420|GT-I7110|GT-I7410|GT-I7500|GT-I8000|GT-I8150|GT-I8160|GT-I8190|GT-I8320|GT-I8330|GT-I8350|GT-I8530|GT-I8700|GT-I8703|GT-I8910|GT-I9000|GT-I9001|GT-I9003|GT-I9010|GT-I9020|GT-I9023|GT-I9070|GT-I9082|GT-I9100|GT-I9103|GT-I9220|GT-I9250|GT-I9300|GT-I9305|GT-I9500|GT-I9505|GT-M3510|GT-M5650|GT-M7500|GT-M7600|GT-M7603|GT-M8800|GT-M8910|GT-N7000|GT-S3110|GT-S3310|GT-S3350|GT-S3353|GT-S3370|GT-S3650|GT-S3653|GT-S3770|GT-S3850|GT-S5210|GT-S5220|GT-S5229|GT-S5230|GT-S5233|GT-S5250|GT-S5253|GT-S5260|GT-S5263|GT-S5270|GT-S5300|GT-S5330|GT-S5350|GT-S5360|GT-S5363|GT-S5369|GT-S5380|GT-S5380D|GT-S5560|GT-S5570|GT-S5600|GT-S5603|GT-S5610|GT-S5620|GT-S5660|GT-S5670|GT-S5690|GT-S5750|GT-S5780|GT-S5830|GT-S5839|GT-S6102|GT-S6500|GT-S7070|GT-S7200|GT-S7220|GT-S7230|GT-S7233|GT-S7250|GT-S7500|GT-S7530|GT-S7550|GT-S7562|GT-S7710|GT-S8000|GT-S8003|GT-S8500|GT-S8530|GT-S8600|SCH-A310|SCH-A530|SCH-A570|SCH-A610|SCH-A630|SCH-A650|SCH-A790|SCH-A795|SCH-A850|SCH-A870|SCH-A890|SCH-A930|SCH-A950|SCH-A970|SCH-A990|SCH-I100|SCH-I110|SCH-I400|SCH-I405|SCH-I500|SCH-I510|SCH-I515|SCH-I600|SCH-I730|SCH-I760|SCH-I770|SCH-I830|SCH-I910|SCH-I920|SCH-I959|SCH-LC11|SCH-N150|SCH-N300|SCH-R100|SCH-R300|SCH-R351|SCH-R400|SCH-R410|SCH-T300|SCH-U310|SCH-U320|SCH-U350|SCH-U360|SCH-U365|SCH-U370|SCH-U380|SCH-U410|SCH-U430|SCH-U450|SCH-U460|SCH-U470|SCH-U490|SCH-U540|SCH-U550|SCH-U620|SCH-U640|SCH-U650|SCH-U660|SCH-U700|SCH-U740|SCH-U750|SCH-U810|SCH-U820|SCH-U900|SCH-U940|SCH-U960|SCS-26UC|SGH-A107|SGH-A117|SGH-A127|SGH-A137|SGH-A157|SGH-A167|SGH-A177|SGH-A187|SGH-A197|SGH-A227|SGH-A237|SGH-A257|SGH-A437|SGH-A517|SGH-A597|SGH-A637|SGH-A657|SGH-A667|SGH-A687|SGH-A697|SGH-A707|SGH-A717|SGH-A727|SGH-A737|SGH-A747|SGH-A767|SGH-A777|SGH-A797|SGH-A817|SGH-A827|SGH-A837|SGH-A847|SGH-A867|SGH-A877|SGH-A887|SGH-A897|SGH-A927|SGH-B100|SGH-B130|SGH-B200|SGH-B220|SGH-C100|SGH-C110|SGH-C120|SGH-C130|SGH-C140|SGH-C160|SGH-C170|SGH-C180|SGH-C200|SGH-C207|SGH-C210|SGH-C225|SGH-C230|SGH-C417|SGH-C450|SGH-D307|SGH-D347|SGH-D357|SGH-D407|SGH-D415|SGH-D780|SGH-D807|SGH-D980|SGH-E105|SGH-E200|SGH-E315|SGH-E316|SGH-E317|SGH-E335|SGH-E590|SGH-E635|SGH-E715|SGH-E890|SGH-F300|SGH-F480|SGH-I200|SGH-I300|SGH-I320|SGH-I550|SGH-I577|SGH-I600|SGH-I607|SGH-I617|SGH-I627|SGH-I637|SGH-I677|SGH-I700|SGH-I717|SGH-I727|SGH-i747M|SGH-I777|SGH-I780|SGH-I827|SGH-I847|SGH-I857|SGH-I896|SGH-I897|SGH-I900|SGH-I907|SGH-I917|SGH-I927|SGH-I937|SGH-I997|SGH-J150|SGH-J200|SGH-L170|SGH-L700|SGH-M110|SGH-M150|SGH-M200|SGH-N105|SGH-N500|SGH-N600|SGH-N620|SGH-N625|SGH-N700|SGH-N710|SGH-P107|SGH-P207|SGH-P300|SGH-P310|SGH-P520|SGH-P735|SGH-P777|SGH-Q105|SGH-R210|SGH-R220|SGH-R225|SGH-S105|SGH-S307|SGH-T109|SGH-T119|SGH-T139|SGH-T209|SGH-T219|SGH-T229|SGH-T239|SGH-T249|SGH-T259|SGH-T309|SGH-T319|SGH-T329|SGH-T339|SGH-T349|SGH-T359|SGH-T369|SGH-T379|SGH-T409|SGH-T429|SGH-T439|SGH-T459|SGH-T469|SGH-T479|SGH-T499|SGH-T509|SGH-T519|SGH-T539|SGH-T559|SGH-T589|SGH-T609|SGH-T619|SGH-T629|SGH-T639|SGH-T659|SGH-T669|SGH-T679|SGH-T709|SGH-T719|SGH-T729|SGH-T739|SGH-T746|SGH-T749|SGH-T759|SGH-T769|SGH-T809|SGH-T819|SGH-T839|SGH-T919|SGH-T929|SGH-T939|SGH-T959|SGH-T989|SGH-U100|SGH-U200|SGH-U800|SGH-V205|SGH-V206|SGH-X100|SGH-X105|SGH-X120|SGH-X140|SGH-X426|SGH-X427|SGH-X475|SGH-X495|SGH-X497|SGH-X507|SGH-X600|SGH-X610|SGH-X620|SGH-X630|SGH-X700|SGH-X820|SGH-X890|SGH-Z130|SGH-Z150|SGH-Z170|SGH-ZX10|SGH-ZX20|SHW-M110|SPH-A120|SPH-A400|SPH-A420|SPH-A460|SPH-A500|SPH-A560|SPH-A600|SPH-A620|SPH-A660|SPH-A700|SPH-A740|SPH-A760|SPH-A790|SPH-A800|SPH-A820|SPH-A840|SPH-A880|SPH-A900|SPH-A940|SPH-A960|SPH-D600|SPH-D700|SPH-D710|SPH-D720|SPH-I300|SPH-I325|SPH-I330|SPH-I350|SPH-I500|SPH-I600|SPH-I700|SPH-L700|SPH-M100|SPH-M220|SPH-M240|SPH-M300|SPH-M305|SPH-M320|SPH-M330|SPH-M350|SPH-M360|SPH-M370|SPH-M380|SPH-M510|SPH-M540|SPH-M550|SPH-M560|SPH-M570|SPH-M580|SPH-M610|SPH-M620|SPH-M630|SPH-M800|SPH-M810|SPH-M850|SPH-M900|SPH-M910|SPH-M920|SPH-M930|SPH-N100|SPH-N200|SPH-N240|SPH-N300|SPH-N400|SPH-Z400|SWC-E100|SCH-i909|GT-N7100|GT-N7105|SCH-I535|SM-N900A|SGH-I317|SGH-T999L|GT-S5360B|GT-I8262|GT-S6802|GT-S6312|GT-S6310|GT-S5312|GT-S5310|GT-I9105|GT-I8510|GT-S6790N|SM-G7105|SM-N9005|GT-S5301|GT-I9295|GT-I9195|SM-C101|GT-S7392|GT-S7560|GT-B7610|GT-I5510|GT-S7582|GT-S7530E|GT-I8750|SM-G9006V|SM-G9008V|SM-G9009D|SM-G900A|SM-G900D|SM-G900F|SM-G900H|SM-G900I|SM-G900J|SM-G900K|SM-G900L|SM-G900M|SM-G900P|SM-G900R4|SM-G900S|SM-G900T|SM-G900V|SM-G900W8|SHV-E160K|SCH-P709|SCH-P729|SM-T2558|GT-I9205|SM-G9350|SM-J120F", "LG": "\\bLG\\b;|LG[- ]?(C800|C900|E400|E610|E900|E-900|F160|F180K|F180L|F180S|730|855|L160|LS740|LS840|LS970|LU6200|MS690|MS695|MS770|MS840|MS870|MS910|P500|P700|P705|VM696|AS680|AS695|AX840|C729|E970|GS505|272|C395|E739BK|E960|L55C|L75C|LS696|LS860|P769BK|P350|P500|P509|P870|UN272|US730|VS840|VS950|LN272|LN510|LS670|LS855|LW690|MN270|MN510|P509|P769|P930|UN200|UN270|UN510|UN610|US670|US740|US760|UX265|UX840|VN271|VN530|VS660|VS700|VS740|VS750|VS910|VS920|VS930|VX9200|VX11000|AX840A|LW770|P506|P925|P999|E612|D955|D802|MS323)", "Sony": "SonyST|SonyLT|SonyEricsson|SonyEricssonLT15iv|LT18i|E10i|LT28h|LT26w|SonyEricssonMT27i|C5303|C6902|C6903|C6906|C6943|D2533", "Asus": "Asus.*Galaxy|PadFone.*Mobile", "NokiaLumia": "Lumia [0-9]{3,4}", "Micromax": "Micromax.*\\b(A210|A92|A88|A72|A111|A110Q|A115|A116|A110|A90S|A26|A51|A35|A54|A25|A27|A89|A68|A65|A57|A90)\\b", "Palm": "PalmSource|Palm", "Vertu": "Vertu|Vertu.*Ltd|Vertu.*Ascent|Vertu.*Ayxta|Vertu.*Constellation(F|Quest)?|Vertu.*Monika|Vertu.*Signature", "Pantech": "PANTECH|IM-A850S|IM-A840S|IM-A830L|IM-A830K|IM-A830S|IM-A820L|IM-A810K|IM-A810S|IM-A800S|IM-T100K|IM-A725L|IM-A780L|IM-A775C|IM-A770K|IM-A760S|IM-A750K|IM-A740S|IM-A730S|IM-A720L|IM-A710K|IM-A690L|IM-A690S|IM-A650S|IM-A630K|IM-A600S|VEGA PTL21|PT003|P8010|ADR910L|P6030|P6020|P9070|P4100|P9060|P5000|CDM8992|TXT8045|ADR8995|IS11PT|P2030|P6010|P8000|PT002|IS06|CDM8999|P9050|PT001|TXT8040|P2020|P9020|P2000|P7040|P7000|C790", "Fly": "IQ230|IQ444|IQ450|IQ440|IQ442|IQ441|IQ245|IQ256|IQ236|IQ255|IQ235|IQ245|IQ275|IQ240|IQ285|IQ280|IQ270|IQ260|IQ250", "Wiko": "KITE 4G|HIGHWAY|GETAWAY|STAIRWAY|DARKSIDE|DARKFULL|DARKNIGHT|DARKMOON|SLIDE|WAX 4G|RAINBOW|BLOOM|SUNSET|GOA(?!nna)|LENNY|BARRY|IGGY|OZZY|CINK FIVE|CINK PEAX|CINK PEAX 2|CINK SLIM|CINK SLIM 2|CINK +|CINK KING|CINK PEAX|CINK SLIM|SUBLIM", "iMobile": "i-mobile (IQ|i-STYLE|idea|ZAA|Hitz)", "SimValley": "\\b(SP-80|XT-930|SX-340|XT-930|SX-310|SP-360|SP60|SPT-800|SP-120|SPT-800|SP-140|SPX-5|SPX-8|SP-100|SPX-8|SPX-12)\\b", "Wolfgang": "AT-B24D|AT-AS50HD|AT-AS40W|AT-AS55HD|AT-AS45q2|AT-B26D|AT-AS50Q", "Alcatel": "Alcatel", "Nintendo": "Nintendo 3DS", "Amoi": "Amoi", "INQ": "INQ", "GenericPhone": "Tapatalk|PDA;|SAGEM|\\bmmp\\b|pocket|\\bpsp\\b|symbian|Smartphone|smartfon|treo|up.browser|up.link|vodafone|\\bwap\\b|nokia|Series40|Series60|S60|SonyEricsson|N900|MAUI.*WAP.*Browser" }, "tablets": { "iPad": "iPad|iPad.*Mobile", "NexusTablet": "Android.*Nexus[\\s]+(7|9|10)", "SamsungTablet": "SAMSUNG.*Tablet|Galaxy.*Tab|SC-01C|GT-P1000|GT-P1003|GT-P1010|GT-P3105|GT-P6210|GT-P6800|GT-P6810|GT-P7100|GT-P7300|GT-P7310|GT-P7500|GT-P7510|SCH-I800|SCH-I815|SCH-I905|SGH-I957|SGH-I987|SGH-T849|SGH-T859|SGH-T869|SPH-P100|GT-P3100|GT-P3108|GT-P3110|GT-P5100|GT-P5110|GT-P6200|GT-P7320|GT-P7511|GT-N8000|GT-P8510|SGH-I497|SPH-P500|SGH-T779|SCH-I705|SCH-I915|GT-N8013|GT-P3113|GT-P5113|GT-P8110|GT-N8010|GT-N8005|GT-N8020|GT-P1013|GT-P6201|GT-P7501|GT-N5100|GT-N5105|GT-N5110|SHV-E140K|SHV-E140L|SHV-E140S|SHV-E150S|SHV-E230K|SHV-E230L|SHV-E230S|SHW-M180K|SHW-M180L|SHW-M180S|SHW-M180W|SHW-M300W|SHW-M305W|SHW-M380K|SHW-M380S|SHW-M380W|SHW-M430W|SHW-M480K|SHW-M480S|SHW-M480W|SHW-M485W|SHW-M486W|SHW-M500W|GT-I9228|SCH-P739|SCH-I925|GT-I9200|GT-P5200|GT-P5210|GT-P5210X|SM-T311|SM-T310|SM-T310X|SM-T210|SM-T210R|SM-T211|SM-P600|SM-P601|SM-P605|SM-P900|SM-P901|SM-T217|SM-T217A|SM-T217S|SM-P6000|SM-T3100|SGH-I467|XE500|SM-T110|GT-P5220|GT-I9200X|GT-N5110X|GT-N5120|SM-P905|SM-T111|SM-T2105|SM-T315|SM-T320|SM-T320X|SM-T321|SM-T520|SM-T525|SM-T530NU|SM-T230NU|SM-T330NU|SM-T900|XE500T1C|SM-P605V|SM-P905V|SM-T337V|SM-T537V|SM-T707V|SM-T807V|SM-P600X|SM-P900X|SM-T210X|SM-T230|SM-T230X|SM-T325|GT-P7503|SM-T531|SM-T330|SM-T530|SM-T705|SM-T705C|SM-T535|SM-T331|SM-T800|SM-T700|SM-T537|SM-T807|SM-P907A|SM-T337A|SM-T537A|SM-T707A|SM-T807A|SM-T237|SM-T807P|SM-P607T|SM-T217T|SM-T337T|SM-T807T|SM-T116NQ|SM-P550|SM-T350|SM-T550|SM-T9000|SM-P9000|SM-T705Y|SM-T805|GT-P3113|SM-T710|SM-T810|SM-T815|SM-T360|SM-T533|SM-T113|SM-T335|SM-T715|SM-T560|SM-T670|SM-T677|SM-T377|SM-T567|SM-T357T|SM-T555|SM-T561", "Kindle": "Kindle|Silk.*Accelerated|Android.*\\b(KFOT|KFTT|KFJWI|KFJWA|KFOTE|KFSOWI|KFTHWI|KFTHWA|KFAPWI|KFAPWA|WFJWAE|KFSAWA|KFSAWI|KFASWI|KFARWI)\\b", "SurfaceTablet": "Windows NT [0-9.]+; ARM;.*(Tablet|ARMBJS)", "HPTablet": "HP Slate (7|8|10)|HP ElitePad 900|hp-tablet|EliteBook.*Touch|HP 8|Slate 21|HP SlateBook 10", "AsusTablet": "^.*PadFone((?!Mobile).)*$|Transformer|TF101|TF101G|TF300T|TF300TG|TF300TL|TF700T|TF700KL|TF701T|TF810C|ME171|ME301T|ME302C|ME371MG|ME370T|ME372MG|ME172V|ME173X|ME400C|Slider SL101|\\bK00F\\b|\\bK00C\\b|\\bK00E\\b|\\bK00L\\b|TX201LA|ME176C|ME102A|\\bM80TA\\b|ME372CL|ME560CG|ME372CG|ME302KL| K010 | K017 |ME572C|ME103K|ME170C|ME171C|\\bME70C\\b|ME581C|ME581CL|ME8510C|ME181C|P01Y|PO1MA", "BlackBerryTablet": "PlayBook|RIM Tablet", "HTCtablet": "HTC_Flyer_P512|HTC Flyer|HTC Jetstream|HTC-P715a|HTC EVO View 4G|PG41200|PG09410", "MotorolaTablet": "xoom|sholest|MZ615|MZ605|MZ505|MZ601|MZ602|MZ603|MZ604|MZ606|MZ607|MZ608|MZ609|MZ615|MZ616|MZ617", "NookTablet": "Android.*Nook|NookColor|nook browser|BNRV200|BNRV200A|BNTV250|BNTV250A|BNTV400|BNTV600|LogicPD Zoom2", "AcerTablet": "Android.*; \\b(A100|A101|A110|A200|A210|A211|A500|A501|A510|A511|A700|A701|W500|W500P|W501|W501P|W510|W511|W700|G100|G100W|B1-A71|B1-710|B1-711|A1-810|A1-811|A1-830)\\b|W3-810|\\bA3-A10\\b|\\bA3-A11\\b|\\bA3-A20", "ToshibaTablet": "Android.*(AT100|AT105|AT200|AT205|AT270|AT275|AT300|AT305|AT1S5|AT500|AT570|AT700|AT830)|TOSHIBA.*FOLIO", "LGTablet": "\\bL-06C|LG-V909|LG-V900|LG-V700|LG-V510|LG-V500|LG-V410|LG-V400|LG-VK810\\b", "FujitsuTablet": "Android.*\\b(F-01D|F-02F|F-05E|F-10D|M532|Q572)\\b", "PrestigioTablet": "PMP3170B|PMP3270B|PMP3470B|PMP7170B|PMP3370B|PMP3570C|PMP5870C|PMP3670B|PMP5570C|PMP5770D|PMP3970B|PMP3870C|PMP5580C|PMP5880D|PMP5780D|PMP5588C|PMP7280C|PMP7280C3G|PMP7280|PMP7880D|PMP5597D|PMP5597|PMP7100D|PER3464|PER3274|PER3574|PER3884|PER5274|PER5474|PMP5097CPRO|PMP5097|PMP7380D|PMP5297C|PMP5297C_QUAD|PMP812E|PMP812E3G|PMP812F|PMP810E|PMP880TD|PMT3017|PMT3037|PMT3047|PMT3057|PMT7008|PMT5887|PMT5001|PMT5002", "LenovoTablet": "Lenovo TAB|Idea(Tab|Pad)( A1|A10| K1|)|ThinkPad([ ]+)?Tablet|YT3-X90L|YT3-X90F|YT3-X90X|Lenovo.*(S2109|S2110|S5000|S6000|K3011|A3000|A3500|A1000|A2107|A2109|A1107|A5500|A7600|B6000|B8000|B8080)(-|)(FL|F|HV|H|)", "DellTablet": "Venue 11|Venue 8|Venue 7|Dell Streak 10|Dell Streak 7", "YarvikTablet": "Android.*\\b(TAB210|TAB211|TAB224|TAB250|TAB260|TAB264|TAB310|TAB360|TAB364|TAB410|TAB411|TAB420|TAB424|TAB450|TAB460|TAB461|TAB464|TAB465|TAB467|TAB468|TAB07-100|TAB07-101|TAB07-150|TAB07-151|TAB07-152|TAB07-200|TAB07-201-3G|TAB07-210|TAB07-211|TAB07-212|TAB07-214|TAB07-220|TAB07-400|TAB07-485|TAB08-150|TAB08-200|TAB08-201-3G|TAB08-201-30|TAB09-100|TAB09-211|TAB09-410|TAB10-150|TAB10-201|TAB10-211|TAB10-400|TAB10-410|TAB13-201|TAB274EUK|TAB275EUK|TAB374EUK|TAB462EUK|TAB474EUK|TAB9-200)\\b", "MedionTablet": "Android.*\\bOYO\\b|LIFE.*(P9212|P9514|P9516|S9512)|LIFETAB", "ArnovaTablet": "AN10G2|AN7bG3|AN7fG3|AN8G3|AN8cG3|AN7G3|AN9G3|AN7dG3|AN7dG3ST|AN7dG3ChildPad|AN10bG3|AN10bG3DT|AN9G2", "IntensoTablet": "INM8002KP|INM1010FP|INM805ND|Intenso Tab|TAB1004", "IRUTablet": "M702pro", "MegafonTablet": "MegaFon V9|\\bZTE V9\\b|Android.*\\bMT7A\\b", "EbodaTablet": "E-Boda (Supreme|Impresspeed|Izzycomm|Essential)", "AllViewTablet": "Allview.*(Viva|Alldro|City|Speed|All TV|Frenzy|Quasar|Shine|TX1|AX1|AX2)", "ArchosTablet": "\\b(101G9|80G9|A101IT)\\b|Qilive 97R|Archos5|\\bARCHOS (70|79|80|90|97|101|FAMILYPAD|)(b|)(G10| Cobalt| TITANIUM(HD|)| Xenon| Neon|XSK| 2| XS 2| PLATINUM| CARBON|GAMEPAD)\\b", "AinolTablet": "NOVO7|NOVO8|NOVO10|Novo7Aurora|Novo7Basic|NOVO7PALADIN|novo9-Spark", "NokiaLumiaTablet": "Lumia 2520", "SonyTablet": "Sony.*Tablet|Xperia Tablet|Sony Tablet S|SO-03E|SGPT12|SGPT13|SGPT114|SGPT121|SGPT122|SGPT123|SGPT111|SGPT112|SGPT113|SGPT131|SGPT132|SGPT133|SGPT211|SGPT212|SGPT213|SGP311|SGP312|SGP321|EBRD1101|EBRD1102|EBRD1201|SGP351|SGP341|SGP511|SGP512|SGP521|SGP541|SGP551|SGP621|SGP612|SOT31", "PhilipsTablet": "\\b(PI2010|PI3000|PI3100|PI3105|PI3110|PI3205|PI3210|PI3900|PI4010|PI7000|PI7100)\\b", "CubeTablet": "Android.*(K8GT|U9GT|U10GT|U16GT|U17GT|U18GT|U19GT|U20GT|U23GT|U30GT)|CUBE U8GT", "CobyTablet": "MID1042|MID1045|MID1125|MID1126|MID7012|MID7014|MID7015|MID7034|MID7035|MID7036|MID7042|MID7048|MID7127|MID8042|MID8048|MID8127|MID9042|MID9740|MID9742|MID7022|MID7010", "MIDTablet": "M9701|M9000|M9100|M806|M1052|M806|T703|MID701|MID713|MID710|MID727|MID760|MID830|MID728|MID933|MID125|MID810|MID732|MID120|MID930|MID800|MID731|MID900|MID100|MID820|MID735|MID980|MID130|MID833|MID737|MID960|MID135|MID860|MID736|MID140|MID930|MID835|MID733|MID4X10", "MSITablet": "MSI \\b(Primo 73K|Primo 73L|Primo 81L|Primo 77|Primo 93|Primo 75|Primo 76|Primo 73|Primo 81|Primo 91|Primo 90|Enjoy 71|Enjoy 7|Enjoy 10)\\b", "SMiTTablet": "Android.*(\\bMID\\b|MID-560|MTV-T1200|MTV-PND531|MTV-P1101|MTV-PND530)", "RockChipTablet": "Android.*(RK2818|RK2808A|RK2918|RK3066)|RK2738|RK2808A", "FlyTablet": "IQ310|Fly Vision", "bqTablet": "Android.*(bq)?.*(Elcano|Curie|Edison|Maxwell|Kepler|Pascal|Tesla|Hypatia|Platon|Newton|Livingstone|Cervantes|Avant|Aquaris E10)|Maxwell.*Lite|Maxwell.*Plus", "HuaweiTablet": "MediaPad|MediaPad 7 Youth|IDEOS S7|S7-201c|S7-202u|S7-101|S7-103|S7-104|S7-105|S7-106|S7-201|S7-Slim", "NecTablet": "\\bN-06D|\\bN-08D", "PantechTablet": "Pantech.*P4100", "BronchoTablet": "Broncho.*(N701|N708|N802|a710)", "VersusTablet": "TOUCHPAD.*[78910]|\\bTOUCHTAB\\b", "ZyncTablet": "z1000|Z99 2G|z99|z930|z999|z990|z909|Z919|z900", "PositivoTablet": "TB07STA|TB10STA|TB07FTA|TB10FTA", "NabiTablet": "Android.*\\bNabi", "KoboTablet": "Kobo Touch|\\bK080\\b|\\bVox\\b Build|\\bArc\\b Build", "DanewTablet": "DSlide.*\\b(700|701R|702|703R|704|802|970|971|972|973|974|1010|1012)\\b", "TexetTablet": "NaviPad|TB-772A|TM-7045|TM-7055|TM-9750|TM-7016|TM-7024|TM-7026|TM-7041|TM-7043|TM-7047|TM-8041|TM-9741|TM-9747|TM-9748|TM-9751|TM-7022|TM-7021|TM-7020|TM-7011|TM-7010|TM-7023|TM-7025|TM-7037W|TM-7038W|TM-7027W|TM-9720|TM-9725|TM-9737W|TM-1020|TM-9738W|TM-9740|TM-9743W|TB-807A|TB-771A|TB-727A|TB-725A|TB-719A|TB-823A|TB-805A|TB-723A|TB-715A|TB-707A|TB-705A|TB-709A|TB-711A|TB-890HD|TB-880HD|TB-790HD|TB-780HD|TB-770HD|TB-721HD|TB-710HD|TB-434HD|TB-860HD|TB-840HD|TB-760HD|TB-750HD|TB-740HD|TB-730HD|TB-722HD|TB-720HD|TB-700HD|TB-500HD|TB-470HD|TB-431HD|TB-430HD|TB-506|TB-504|TB-446|TB-436|TB-416|TB-146SE|TB-126SE", "PlaystationTablet": "Playstation.*(Portable|Vita)", "TrekstorTablet": "ST10416-1|VT10416-1|ST70408-1|ST702xx-1|ST702xx-2|ST80208|ST97216|ST70104-2|VT10416-2|ST10216-2A|SurfTab", "PyleAudioTablet": "\\b(PTBL10CEU|PTBL10C|PTBL72BC|PTBL72BCEU|PTBL7CEU|PTBL7C|PTBL92BC|PTBL92BCEU|PTBL9CEU|PTBL9CUK|PTBL9C)\\b", "AdvanTablet": "Android.* \\b(E3A|T3X|T5C|T5B|T3E|T3C|T3B|T1J|T1F|T2A|T1H|T1i|E1C|T1-E|T5-A|T4|E1-B|T2Ci|T1-B|T1-D|O1-A|E1-A|T1-A|T3A|T4i)\\b ", "DanyTechTablet": "Genius Tab G3|Genius Tab S2|Genius Tab Q3|Genius Tab G4|Genius Tab Q4|Genius Tab G-II|Genius TAB GII|Genius TAB GIII|Genius Tab S1", "GalapadTablet": "Android.*\\bG1\\b", "MicromaxTablet": "Funbook|Micromax.*\\b(P250|P560|P360|P362|P600|P300|P350|P500|P275)\\b", "KarbonnTablet": "Android.*\\b(A39|A37|A34|ST8|ST10|ST7|Smart Tab3|Smart Tab2)\\b", "AllFineTablet": "Fine7 Genius|Fine7 Shine|Fine7 Air|Fine8 Style|Fine9 More|Fine10 Joy|Fine11 Wide", "PROSCANTablet": "\\b(PEM63|PLT1023G|PLT1041|PLT1044|PLT1044G|PLT1091|PLT4311|PLT4311PL|PLT4315|PLT7030|PLT7033|PLT7033D|PLT7035|PLT7035D|PLT7044K|PLT7045K|PLT7045KB|PLT7071KG|PLT7072|PLT7223G|PLT7225G|PLT7777G|PLT7810K|PLT7849G|PLT7851G|PLT7852G|PLT8015|PLT8031|PLT8034|PLT8036|PLT8080K|PLT8082|PLT8088|PLT8223G|PLT8234G|PLT8235G|PLT8816K|PLT9011|PLT9045K|PLT9233G|PLT9735|PLT9760G|PLT9770G)\\b", "YONESTablet": "BQ1078|BC1003|BC1077|RK9702|BC9730|BC9001|IT9001|BC7008|BC7010|BC708|BC728|BC7012|BC7030|BC7027|BC7026", "ChangJiaTablet": "TPC7102|TPC7103|TPC7105|TPC7106|TPC7107|TPC7201|TPC7203|TPC7205|TPC7210|TPC7708|TPC7709|TPC7712|TPC7110|TPC8101|TPC8103|TPC8105|TPC8106|TPC8203|TPC8205|TPC8503|TPC9106|TPC9701|TPC97101|TPC97103|TPC97105|TPC97106|TPC97111|TPC97113|TPC97203|TPC97603|TPC97809|TPC97205|TPC10101|TPC10103|TPC10106|TPC10111|TPC10203|TPC10205|TPC10503", "GUTablet": "TX-A1301|TX-M9002|Q702|kf026", "PointOfViewTablet": "TAB-P506|TAB-navi-7-3G-M|TAB-P517|TAB-P-527|TAB-P701|TAB-P703|TAB-P721|TAB-P731N|TAB-P741|TAB-P825|TAB-P905|TAB-P925|TAB-PR945|TAB-PL1015|TAB-P1025|TAB-PI1045|TAB-P1325|TAB-PROTAB[0-9]+|TAB-PROTAB25|TAB-PROTAB26|TAB-PROTAB27|TAB-PROTAB26XL|TAB-PROTAB2-IPS9|TAB-PROTAB30-IPS9|TAB-PROTAB25XXL|TAB-PROTAB26-IPS10|TAB-PROTAB30-IPS10", "OvermaxTablet": "OV-(SteelCore|NewBase|Basecore|Baseone|Exellen|Quattor|EduTab|Solution|ACTION|BasicTab|TeddyTab|MagicTab|Stream|TB-08|TB-09)", "HCLTablet": "HCL.*Tablet|Connect-3G-2.0|Connect-2G-2.0|ME Tablet U1|ME Tablet U2|ME Tablet G1|ME Tablet X1|ME Tablet Y2|ME Tablet Sync", "DPSTablet": "DPS Dream 9|DPS Dual 7", "VistureTablet": "V97 HD|i75 3G|Visture V4( HD)?|Visture V5( HD)?|Visture V10", "CrestaTablet": "CTP(-)?810|CTP(-)?818|CTP(-)?828|CTP(-)?838|CTP(-)?888|CTP(-)?978|CTP(-)?980|CTP(-)?987|CTP(-)?988|CTP(-)?989", "MediatekTablet": "\\bMT8125|MT8389|MT8135|MT8377\\b", "ConcordeTablet": "Concorde([ ]+)?Tab|ConCorde ReadMan", "GoCleverTablet": "GOCLEVER TAB|A7GOCLEVER|M1042|M7841|M742|R1042BK|R1041|TAB A975|TAB A7842|TAB A741|TAB A741L|TAB M723G|TAB M721|TAB A1021|TAB I921|TAB R721|TAB I720|TAB T76|TAB R70|TAB R76.2|TAB R106|TAB R83.2|TAB M813G|TAB I721|GCTA722|TAB I70|TAB I71|TAB S73|TAB R73|TAB R74|TAB R93|TAB R75|TAB R76.1|TAB A73|TAB A93|TAB A93.2|TAB T72|TAB R83|TAB R974|TAB R973|TAB A101|TAB A103|TAB A104|TAB A104.2|R105BK|M713G|A972BK|TAB A971|TAB R974.2|TAB R104|TAB R83.3|TAB A1042", "ModecomTablet": "FreeTAB 9000|FreeTAB 7.4|FreeTAB 7004|FreeTAB 7800|FreeTAB 2096|FreeTAB 7.5|FreeTAB 1014|FreeTAB 1001 |FreeTAB 8001|FreeTAB 9706|FreeTAB 9702|FreeTAB 7003|FreeTAB 7002|FreeTAB 1002|FreeTAB 7801|FreeTAB 1331|FreeTAB 1004|FreeTAB 8002|FreeTAB 8014|FreeTAB 9704|FreeTAB 1003", "VoninoTablet": "\\b(Argus[ _]?S|Diamond[ _]?79HD|Emerald[ _]?78E|Luna[ _]?70C|Onyx[ _]?S|Onyx[ _]?Z|Orin[ _]?HD|Orin[ _]?S|Otis[ _]?S|SpeedStar[ _]?S|Magnet[ _]?M9|Primus[ _]?94[ _]?3G|Primus[ _]?94HD|Primus[ _]?QS|Android.*\\bQ8\\b|Sirius[ _]?EVO[ _]?QS|Sirius[ _]?QS|Spirit[ _]?S)\\b", "ECSTablet": "V07OT2|TM105A|S10OT1|TR10CS1", "StorexTablet": "eZee[_']?(Tab|Go)[0-9]+|TabLC7|Looney Tunes Tab", "VodafoneTablet": "SmartTab([ ]+)?[0-9]+|SmartTabII10|SmartTabII7|VF-1497", "EssentielBTablet": "Smart[ ']?TAB[ ]+?[0-9]+|Family[ ']?TAB2", "RossMoorTablet": "RM-790|RM-997|RMD-878G|RMD-974R|RMT-705A|RMT-701|RME-601|RMT-501|RMT-711", "iMobileTablet": "i-mobile i-note", "TolinoTablet": "tolino tab [0-9.]+|tolino shine", "AudioSonicTablet": "\\bC-22Q|T7-QC|T-17B|T-17P\\b", "AMPETablet": "Android.* A78 ", "SkkTablet": "Android.* (SKYPAD|PHOENIX|CYCLOPS)", "TecnoTablet": "TECNO P9", "JXDTablet": "Android.* \\b(F3000|A3300|JXD5000|JXD3000|JXD2000|JXD300B|JXD300|S5800|S7800|S602b|S5110b|S7300|S5300|S602|S603|S5100|S5110|S601|S7100a|P3000F|P3000s|P101|P200s|P1000m|P200m|P9100|P1000s|S6600b|S908|P1000|P300|S18|S6600|S9100)\\b", "iJoyTablet": "Tablet (Spirit 7|Essentia|Galatea|Fusion|Onix 7|Landa|Titan|Scooby|Deox|Stella|Themis|Argon|Unique 7|Sygnus|Hexen|Finity 7|Cream|Cream X2|Jade|Neon 7|Neron 7|Kandy|Scape|Saphyr 7|Rebel|Biox|Rebel|Rebel 8GB|Myst|Draco 7|Myst|Tab7-004|Myst|Tadeo Jones|Tablet Boing|Arrow|Draco Dual Cam|Aurix|Mint|Amity|Revolution|Finity 9|Neon 9|T9w|Amity 4GB Dual Cam|Stone 4GB|Stone 8GB|Andromeda|Silken|X2|Andromeda II|Halley|Flame|Saphyr 9,7|Touch 8|Planet|Triton|Unique 10|Hexen 10|Memphis 4GB|Memphis 8GB|Onix 10)", "FX2Tablet": "FX2 PAD7|FX2 PAD10", "XoroTablet": "KidsPAD 701|PAD[ ]?712|PAD[ ]?714|PAD[ ]?716|PAD[ ]?717|PAD[ ]?718|PAD[ ]?720|PAD[ ]?721|PAD[ ]?722|PAD[ ]?790|PAD[ ]?792|PAD[ ]?900|PAD[ ]?9715D|PAD[ ]?9716DR|PAD[ ]?9718DR|PAD[ ]?9719QR|PAD[ ]?9720QR|TelePAD1030|Telepad1032|TelePAD730|TelePAD731|TelePAD732|TelePAD735Q|TelePAD830|TelePAD9730|TelePAD795|MegaPAD 1331|MegaPAD 1851|MegaPAD 2151", "ViewsonicTablet": "ViewPad 10pi|ViewPad 10e|ViewPad 10s|ViewPad E72|ViewPad7|ViewPad E100|ViewPad 7e|ViewSonic VB733|VB100a", "OdysTablet": "LOOX|XENO10|ODYS[ -](Space|EVO|Xpress|NOON)|\\bXELIO\\b|Xelio10Pro|XELIO7PHONETAB|XELIO10EXTREME|XELIOPT2|NEO_QUAD10", "CaptivaTablet": "CAPTIVA PAD", "IconbitTablet": "NetTAB|NT-3702|NT-3702S|NT-3702S|NT-3603P|NT-3603P|NT-0704S|NT-0704S|NT-3805C|NT-3805C|NT-0806C|NT-0806C|NT-0909T|NT-0909T|NT-0907S|NT-0907S|NT-0902S|NT-0902S", "TeclastTablet": "T98 4G|\\bP80\\b|\\bX90HD\\b|X98 Air|X98 Air 3G|\\bX89\\b|P80 3G|\\bX80h\\b|P98 Air|\\bX89HD\\b|P98 3G|\\bP90HD\\b|P89 3G|X98 3G|\\bP70h\\b|P79HD 3G|G18d 3G|\\bP79HD\\b|\\bP89s\\b|\\bA88\\b|\\bP10HD\\b|\\bP19HD\\b|G18 3G|\\bP78HD\\b|\\bA78\\b|\\bP75\\b|G17s 3G|G17h 3G|\\bP85t\\b|\\bP90\\b|\\bP11\\b|\\bP98t\\b|\\bP98HD\\b|\\bG18d\\b|\\bP85s\\b|\\bP11HD\\b|\\bP88s\\b|\\bA80HD\\b|\\bA80se\\b|\\bA10h\\b|\\bP89\\b|\\bP78s\\b|\\bG18\\b|\\bP85\\b|\\bA70h\\b|\\bA70\\b|\\bG17\\b|\\bP18\\b|\\bA80s\\b|\\bA11s\\b|\\bP88HD\\b|\\bA80h\\b|\\bP76s\\b|\\bP76h\\b|\\bP98\\b|\\bA10HD\\b|\\bP78\\b|\\bP88\\b|\\bA11\\b|\\bA10t\\b|\\bP76a\\b|\\bP76t\\b|\\bP76e\\b|\\bP85HD\\b|\\bP85a\\b|\\bP86\\b|\\bP75HD\\b|\\bP76v\\b|\\bA12\\b|\\bP75a\\b|\\bA15\\b|\\bP76Ti\\b|\\bP81HD\\b|\\bA10\\b|\\bT760VE\\b|\\bT720HD\\b|\\bP76\\b|\\bP73\\b|\\bP71\\b|\\bP72\\b|\\bT720SE\\b|\\bC520Ti\\b|\\bT760\\b|\\bT720VE\\b|T720-3GE|T720-WiFi", "OndaTablet": "\\b(V975i|Vi30|VX530|V701|Vi60|V701s|Vi50|V801s|V719|Vx610w|VX610W|V819i|Vi10|VX580W|Vi10|V711s|V813|V811|V820w|V820|Vi20|V711|VI30W|V712|V891w|V972|V819w|V820w|Vi60|V820w|V711|V813s|V801|V819|V975s|V801|V819|V819|V818|V811|V712|V975m|V101w|V961w|V812|V818|V971|V971s|V919|V989|V116w|V102w|V973|Vi40)\\b[\\s]+", "JaytechTablet": "TPC-PA762", "BlaupunktTablet": "Endeavour 800NG|Endeavour 1010", "DigmaTablet": "\\b(iDx10|iDx9|iDx8|iDx7|iDxD7|iDxD8|iDsQ8|iDsQ7|iDsQ8|iDsD10|iDnD7|3TS804H|iDsQ11|iDj7|iDs10)\\b", "EvolioTablet": "ARIA_Mini_wifi|Aria[ _]Mini|Evolio X10|Evolio X7|Evolio X8|\\bEvotab\\b|\\bNeura\\b", "LavaTablet": "QPAD E704|\\bIvoryS\\b|E-TAB IVORY|\\bE-TAB\\b", "AocTablet": "MW0811|MW0812|MW0922|MTK8382|MW1031|MW0831|MW0821|MW0931|MW0712", "MpmanTablet": "MP11 OCTA|MP10 OCTA|MPQC1114|MPQC1004|MPQC994|MPQC974|MPQC973|MPQC804|MPQC784|MPQC780|\\bMPG7\\b|MPDCG75|MPDCG71|MPDC1006|MP101DC|MPDC9000|MPDC905|MPDC706HD|MPDC706|MPDC705|MPDC110|MPDC100|MPDC99|MPDC97|MPDC88|MPDC8|MPDC77|MP709|MID701|MID711|MID170|MPDC703|MPQC1010", "CelkonTablet": "CT695|CT888|CT[\\s]?910|CT7 Tab|CT9 Tab|CT3 Tab|CT2 Tab|CT1 Tab|C820|C720|\\bCT-1\\b", "WolderTablet": "miTab \\b(DIAMOND|SPACE|BROOKLYN|NEO|FLY|MANHATTAN|FUNK|EVOLUTION|SKY|GOCAR|IRON|GENIUS|POP|MINT|EPSILON|BROADWAY|JUMP|HOP|LEGEND|NEW AGE|LINE|ADVANCE|FEEL|FOLLOW|LIKE|LINK|LIVE|THINK|FREEDOM|CHICAGO|CLEVELAND|BALTIMORE-GH|IOWA|BOSTON|SEATTLE|PHOENIX|DALLAS|IN 101|MasterChef)\\b", "MiTablet": "\\bMI PAD\\b|\\bHM NOTE 1W\\b", "NibiruTablet": "Nibiru M1|Nibiru Jupiter One", "NexoTablet": "NEXO NOVA|NEXO 10|NEXO AVIO|NEXO FREE|NEXO GO|NEXO EVO|NEXO 3G|NEXO SMART|NEXO KIDDO|NEXO MOBI", "LeaderTablet": "TBLT10Q|TBLT10I|TBL-10WDKB|TBL-10WDKBO2013|TBL-W230V2|TBL-W450|TBL-W500|SV572|TBLT7I|TBA-AC7-8G|TBLT79|TBL-8W16|TBL-10W32|TBL-10WKB|TBL-W100", "UbislateTablet": "UbiSlate[\\s]?7C", "PocketBookTablet": "Pocketbook", "KocasoTablet": "\\b(TB-1207)\\b", "Hudl": "Hudl HT7S3|Hudl 2", "TelstraTablet": "T-Hub2", "GenericTablet": "Android.*\\b97D\\b|Tablet(?!.*PC)|BNTV250A|MID-WCDMA|LogicPD Zoom2|\\bA7EB\\b|CatNova8|A1_07|CT704|CT1002|\\bM721\\b|rk30sdk|\\bEVOTAB\\b|M758A|ET904|ALUMIUM10|Smartfren Tab|Endeavour 1010|Tablet-PC-4|Tagi Tab|\\bM6pro\\b|CT1020W|arc 10HD|\\bJolla\\b|\\bTP750\\b" }, "oss": { "AndroidOS": "Android", "BlackBerryOS": "blackberry|\\bBB10\\b|rim tablet os", "PalmOS": "PalmOS|avantgo|blazer|elaine|hiptop|palm|plucker|xiino", "SymbianOS": "Symbian|SymbOS|Series60|Series40|SYB-[0-9]+|\\bS60\\b", "WindowsMobileOS": "Windows CE.*(PPC|Smartphone|Mobile|[0-9]{3}x[0-9]{3})|Window Mobile|Windows Phone [0-9.]+|WCE;", "WindowsPhoneOS": "Windows Phone 10.0|Windows Phone 8.1|Windows Phone 8.0|Windows Phone OS|XBLWP7|ZuneWP7|Windows NT 6.[23]; ARM;", "iOS": "\\biPhone.*Mobile|\\biPod|\\biPad", "MeeGoOS": "MeeGo", "MaemoOS": "Maemo", "JavaOS": "J2ME\/|\\bMIDP\\b|\\bCLDC\\b", "webOS": "webOS|hpwOS", "badaOS": "\\bBada\\b", "BREWOS": "BREW" }, "uas": { "Vivaldi": "Vivaldi", "Chrome": "\\bCrMo\\b|CriOS|Android.*Chrome\/[.0-9]* (Mobile)?", "Dolfin": "\\bDolfin\\b", "Opera": "Opera.*Mini|Opera.*Mobi|Android.*Opera|Mobile.*OPR\/[0-9.]+|Coast\/[0-9.]+", "Skyfire": "Skyfire", "Edge": "Mobile Safari\/[.0-9]* Edge", "IE": "IEMobile|MSIEMobile", "Firefox": "fennec|firefox.*maemo|(Mobile|Tablet).*Firefox|Firefox.*Mobile", "Bolt": "bolt", "TeaShark": "teashark", "Blazer": "Blazer", "Safari": "Version.*Mobile.*Safari|Safari.*Mobile|MobileSafari", "Tizen": "Tizen", "UCBrowser": "UC.*Browser|UCWEB", "baiduboxapp": "baiduboxapp", "baidubrowser": "baidubrowser", "DiigoBrowser": "DiigoBrowser", "Puffin": "Puffin", "Mercury": "\\bMercury\\b", "ObigoBrowser": "Obigo", "NetFront": "NF-Browser", "GenericBrowser": "NokiaBrowser|OviBrowser|OneBrowser|TwonkyBeamBrowser|SEMC.*Browser|FlyFlow|Minimo|NetFront|Novarra-Vision|MQQBrowser|MicroMessenger", "PaleMoon": "Android.*PaleMoon|Mobile.*PaleMoon" }, "props": { "Mobile": "Mobile\/[VER]", "Build": "Build\/[VER]", "Version": "Version\/[VER]", "VendorID": "VendorID\/[VER]", "iPad": "iPad.*CPU[a-z ]+[VER]", "iPhone": "iPhone.*CPU[a-z ]+[VER]", "iPod": "iPod.*CPU[a-z ]+[VER]", "Kindle": "Kindle\/[VER]", "Chrome": [ "Chrome\/[VER]", "CriOS\/[VER]", "CrMo\/[VER]" ], "Coast": [ "Coast\/[VER]" ], "Dolfin": "Dolfin\/[VER]", "Firefox": "Firefox\/[VER]", "Fennec": "Fennec\/[VER]", "Edge": "Edge\/[VER]", "IE": [ "IEMobile\/[VER];", "IEMobile [VER]", "MSIE [VER];", "Trident\/[0-9.]+;.*rv:[VER]" ], "NetFront": "NetFront\/[VER]", "NokiaBrowser": "NokiaBrowser\/[VER]", "Opera": [ " OPR\/[VER]", "Opera Mini\/[VER]", "Version\/[VER]" ], "Opera Mini": "Opera Mini\/[VER]", "Opera Mobi": "Version\/[VER]", "UC Browser": "UC Browser[VER]", "MQQBrowser": "MQQBrowser\/[VER]", "MicroMessenger": "MicroMessenger\/[VER]", "baiduboxapp": "baiduboxapp\/[VER]", "baidubrowser": "baidubrowser\/[VER]", "Iron": "Iron\/[VER]", "Safari": [ "Version\/[VER]", "Safari\/[VER]" ], "Skyfire": "Skyfire\/[VER]", "Tizen": "Tizen\/[VER]", "Webkit": "webkit[ \/][VER]", "PaleMoon": "PaleMoon\/[VER]", "Gecko": "Gecko\/[VER]", "Trident": "Trident\/[VER]", "Presto": "Presto\/[VER]", "Goanna": "Goanna\/[VER]", "iOS": " \\bi?OS\\b [VER][ ;]{1}", "Android": "Android [VER]", "BlackBerry": [ "BlackBerry[\\w]+\/[VER]", "BlackBerry.*Version\/[VER]", "Version\/[VER]" ], "BREW": "BREW [VER]", "Java": "Java\/[VER]", "Windows Phone OS": [ "Windows Phone OS [VER]", "Windows Phone [VER]" ], "Windows Phone": "Windows Phone [VER]", "Windows CE": "Windows CE\/[VER]", "Windows NT": "Windows NT [VER]", "Symbian": [ "SymbianOS\/[VER]", "Symbian\/[VER]" ], "webOS": [ "webOS\/[VER]", "hpwOS\/[VER];" ] }, "utils": { "Bot": "Googlebot|facebookexternalhit|AdsBot-Google|Google Keyword Suggestion|Facebot|YandexBot|bingbot|ia_archiver|AhrefsBot|Ezooms|GSLFbot|WBSearchBot|Twitterbot|TweetmemeBot|Twikle|PaperLiBot|Wotbox|UnwindFetchor|Exabot|MJ12bot|YandexImages|TurnitinBot|Pingdom", "MobileBot": "Googlebot-Mobile|AdsBot-Google-Mobile|YahooSeeker\/M1A1-R2D2", "DesktopMode": "WPDesktop", "TV": "SonyDTV|HbbTV", "WebKit": "(webkit)[ \/]([\\w.]+)", "Console": "\\b(Nintendo|Nintendo WiiU|Nintendo 3DS|PLAYSTATION|Xbox)\\b", "Watch": "SM-V700" }}; // following patterns come from http://detectmobilebrowsers.com/ impl.detectMobileBrowsers = { fullPattern: /(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino/i, shortPattern: /1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i, tabletPattern: /android|ipad|playbook|silk/i }; var hasOwnProp = Object.prototype.hasOwnProperty, isArray; impl.FALLBACK_PHONE = 'UnknownPhone'; impl.FALLBACK_TABLET = 'UnknownTablet'; impl.FALLBACK_MOBILE = 'UnknownMobile'; isArray = ('isArray' in Array) ? Array.isArray : function (value) { return Object.prototype.toString.call(value) === '[object Array]'; }; isArray = 'isArray' in Array ? function (value) { return Object.prototype.toString.call(value) === '[object Array]'; } : Array.isArray; function equalIC(a, b) { return a != null && b != null && a.toLowerCase() === b.toLowerCase(); } function containsIC(array, value) { var valueLC, i, len = array.length; if (!len || !value) { return false; } valueLC = value.toLowerCase(); for (i = 0; i < len; ++i) { if (valueLC === array[i].toLowerCase()) { return true; } } return false; } function convertPropsToRegExp(object) { for (var key in object) { if (hasOwnProp.call(object, key)) { object[key] = new RegExp(object[key], 'i'); } } } (function init() { var key, values, value, i, len, verPos, mobileDetectRules = impl.mobileDetectRules; for (key in mobileDetectRules.props) { if (hasOwnProp.call(mobileDetectRules.props, key)) { values = mobileDetectRules.props[key]; if (!isArray(values)) { values = [values]; } len = values.length; for (i = 0; i < len; ++i) { value = values[i]; verPos = value.indexOf('[VER]'); if (verPos >= 0) { value = value.substring(0, verPos) + '([\\w._\\+]+)' + value.substring(verPos + 5); } values[i] = new RegExp(value, 'i'); } mobileDetectRules.props[key] = values; } } convertPropsToRegExp(mobileDetectRules.oss); convertPropsToRegExp(mobileDetectRules.phones); convertPropsToRegExp(mobileDetectRules.tablets); convertPropsToRegExp(mobileDetectRules.uas); convertPropsToRegExp(mobileDetectRules.utils); // copy some patterns to oss0 which are tested first (see issue#15) mobileDetectRules.oss0 = { WindowsPhoneOS: mobileDetectRules.oss.WindowsPhoneOS, WindowsMobileOS: mobileDetectRules.oss.WindowsMobileOS }; }()); /** * Test userAgent string against a set of rules and find the first matched key. * @param {Object} rules (key is String, value is RegExp) * @param {String} userAgent the navigator.userAgent (or HTTP-Header 'User-Agent'). * @returns {String|null} the matched key if found, otherwise null * @private */ impl.findMatch = function(rules, userAgent) { for (var key in rules) { if (hasOwnProp.call(rules, key)) { if (rules[key].test(userAgent)) { return key; } } } return null; }; /** * Test userAgent string against a set of rules and return an array of matched keys. * @param {Object} rules (key is String, value is RegExp) * @param {String} userAgent the navigator.userAgent (or HTTP-Header 'User-Agent'). * @returns {Array} an array of matched keys, may be empty when there is no match, but not null * @private */ impl.findMatches = function(rules, userAgent) { var result = []; for (var key in rules) { if (hasOwnProp.call(rules, key)) { if (rules[key].test(userAgent)) { result.push(key); } } } return result; }; /** * Check the version of the given property in the User-Agent. * * @param {String} propertyName * @param {String} userAgent * @return {String} version or null if version not found * @private */ impl.getVersionStr = function (propertyName, userAgent) { var props = impl.mobileDetectRules.props, patterns, i, len, match; if (hasOwnProp.call(props, propertyName)) { patterns = props[propertyName]; len = patterns.length; for (i = 0; i < len; ++i) { match = patterns[i].exec(userAgent); if (match !== null) { return match[1]; } } } return null; }; /** * Check the version of the given property in the User-Agent. * Will return a float number. (eg. 2_0 will return 2.0, 4.3.1 will return 4.31) * * @param {String} propertyName * @param {String} userAgent * @return {Number} version or NaN if version not found * @private */ impl.getVersion = function (propertyName, userAgent) { var version = impl.getVersionStr(propertyName, userAgent); return version ? impl.prepareVersionNo(version) : NaN; }; /** * Prepare the version number. * * @param {String} version * @return {Number} the version number as a floating number * @private */ impl.prepareVersionNo = function (version) { var numbers; numbers = version.split(/[a-z._ \/\-]/i); if (numbers.length === 1) { version = numbers[0]; } if (numbers.length > 1) { version = numbers[0] + '.'; numbers.shift(); version += numbers.join(''); } return Number(version); }; impl.isMobileFallback = function (userAgent) { return impl.detectMobileBrowsers.fullPattern.test(userAgent) || impl.detectMobileBrowsers.shortPattern.test(userAgent.substr(0,4)); }; impl.isTabletFallback = function (userAgent) { return impl.detectMobileBrowsers.tabletPattern.test(userAgent); }; impl.prepareDetectionCache = function (cache, userAgent, maxPhoneWidth) { if (cache.mobile !== undefined) { return; } var phone, tablet, phoneSized; // first check for stronger tablet rules, then phone (see issue#5) tablet = impl.findMatch(impl.mobileDetectRules.tablets, userAgent); if (tablet) { cache.mobile = cache.tablet = tablet; cache.phone = null; return; // unambiguously identified as tablet } phone = impl.findMatch(impl.mobileDetectRules.phones, userAgent); if (phone) { cache.mobile = cache.phone = phone; cache.tablet = null; return; // unambiguously identified as phone } // our rules haven't found a match -> try more general fallback rules if (impl.isMobileFallback(userAgent)) { phoneSized = MobileDetect.isPhoneSized(maxPhoneWidth); if (phoneSized === undefined) { cache.mobile = impl.FALLBACK_MOBILE; cache.tablet = cache.phone = null; } else if (phoneSized) { cache.mobile = cache.phone = impl.FALLBACK_PHONE; cache.tablet = null; } else { cache.mobile = cache.tablet = impl.FALLBACK_TABLET; cache.phone = null; } } else if (impl.isTabletFallback(userAgent)) { cache.mobile = cache.tablet = impl.FALLBACK_TABLET; cache.phone = null; } else { // not mobile at all! cache.mobile = cache.tablet = cache.phone = null; } }; // t is a reference to a MobileDetect instance impl.mobileGrade = function (t) { // impl note: // To keep in sync w/ Mobile_Detect.php easily, the following code is tightly aligned to the PHP version. // When changes are made in Mobile_Detect.php, copy this method and replace: // $this-> / t. // self::MOBILE_GRADE_(.) / '$1' // , self::VERSION_TYPE_FLOAT / (nothing) // isIOS() / os('iOS') // [reg] / (nothing) <-- jsdelivr complaining about unescaped unicode character U+00AE var $isMobile = t.mobile() !== null; if ( // Apple iOS 3.2-5.1 - Tested on the original iPad (4.3 / 5.0), iPad 2 (4.3), iPad 3 (5.1), original iPhone (3.1), iPhone 3 (3.2), 3GS (4.3), 4 (4.3 / 5.0), and 4S (5.1) t.os('iOS') && t.version('iPad')>=4.3 || t.os('iOS') && t.version('iPhone')>=3.1 || t.os('iOS') && t.version('iPod')>=3.1 || // Android 2.1-2.3 - Tested on the HTC Incredible (2.2), original Droid (2.2), HTC Aria (2.1), Google Nexus S (2.3). Functional on 1.5 & 1.6 but performance may be sluggish, tested on Google G1 (1.5) // Android 3.1 (Honeycomb) - Tested on the Samsung Galaxy Tab 10.1 and Motorola XOOM // Android 4.0 (ICS) - Tested on a Galaxy Nexus. Note: transition performance can be poor on upgraded devices // Android 4.1 (Jelly Bean) - Tested on a Galaxy Nexus and Galaxy 7 ( t.version('Android')>2.1 && t.is('Webkit') ) || // Windows Phone 7-7.5 - Tested on the HTC Surround (7.0) HTC Trophy (7.5), LG-E900 (7.5), Nokia Lumia 800 t.version('Windows Phone OS')>=7.0 || // Blackberry 7 - Tested on BlackBerry Torch 9810 // Blackberry 6.0 - Tested on the Torch 9800 and Style 9670 t.is('BlackBerry') && t.version('BlackBerry')>=6.0 || // Blackberry Playbook (1.0-2.0) - Tested on PlayBook t.match('Playbook.*Tablet') || // Palm WebOS (1.4-2.0) - Tested on the Palm Pixi (1.4), Pre (1.4), Pre 2 (2.0) ( t.version('webOS')>=1.4 && t.match('Palm|Pre|Pixi') ) || // Palm WebOS 3.0 - Tested on HP TouchPad t.match('hp.*TouchPad') || // Firefox Mobile (12 Beta) - Tested on Android 2.3 device ( t.is('Firefox') && t.version('Firefox')>=12 ) || // Chrome for Android - Tested on Android 4.0, 4.1 device ( t.is('Chrome') && t.is('AndroidOS') && t.version('Android')>=4.0 ) || // Skyfire 4.1 - Tested on Android 2.3 device ( t.is('Skyfire') && t.version('Skyfire')>=4.1 && t.is('AndroidOS') && t.version('Android')>=2.3 ) || // Opera Mobile 11.5-12: Tested on Android 2.3 ( t.is('Opera') && t.version('Opera Mobi')>11 && t.is('AndroidOS') ) || // Meego 1.2 - Tested on Nokia 950 and N9 t.is('MeeGoOS') || // Tizen (pre-release) - Tested on early hardware t.is('Tizen') || // Samsung Bada 2.0 - Tested on a Samsung Wave 3, Dolphin browser // @todo: more tests here! t.is('Dolfin') && t.version('Bada')>=2.0 || // UC Browser - Tested on Android 2.3 device ( (t.is('UC Browser') || t.is('Dolfin')) && t.version('Android')>=2.3 ) || // Kindle 3 and Fire - Tested on the built-in WebKit browser for each ( t.match('Kindle Fire') || t.is('Kindle') && t.version('Kindle')>=3.0 ) || // Nook Color 1.4.1 - Tested on original Nook Color, not Nook Tablet t.is('AndroidOS') && t.is('NookTablet') || // Chrome Desktop 11-21 - Tested on OS X 10.7 and Windows 7 t.version('Chrome')>=11 && !$isMobile || // Safari Desktop 4-5 - Tested on OS X 10.7 and Windows 7 t.version('Safari')>=5.0 && !$isMobile || // Firefox Desktop 4-13 - Tested on OS X 10.7 and Windows 7 t.version('Firefox')>=4.0 && !$isMobile || // Internet Explorer 7-9 - Tested on Windows XP, Vista and 7 t.version('MSIE')>=7.0 && !$isMobile || // Opera Desktop 10-12 - Tested on OS X 10.7 and Windows 7 // @reference: http://my.opera.com/community/openweb/idopera/ t.version('Opera')>=10 && !$isMobile ){ return 'A'; } if ( t.os('iOS') && t.version('iPad')<4.3 || t.os('iOS') && t.version('iPhone')<3.1 || t.os('iOS') && t.version('iPod')<3.1 || // Blackberry 5.0: Tested on the Storm 2 9550, Bold 9770 t.is('Blackberry') && t.version('BlackBerry')>=5 && t.version('BlackBerry')<6 || //Opera Mini (5.0-6.5) - Tested on iOS 3.2/4.3 and Android 2.3 ( t.version('Opera Mini')>=5.0 && t.version('Opera Mini')<=6.5 && (t.version('Android')>=2.3 || t.is('iOS')) ) || // Nokia Symbian^3 - Tested on Nokia N8 (Symbian^3), C7 (Symbian^3), also works on N97 (Symbian^1) t.match('NokiaN8|NokiaC7|N97.*Series60|Symbian/3') || // @todo: report this (tested on Nokia N71) t.version('Opera Mobi')>=11 && t.is('SymbianOS') ){ return 'B'; } if ( // Blackberry 4.x - Tested on the Curve 8330 t.version('BlackBerry')<5.0 || // Windows Mobile - Tested on the HTC Leo (WinMo 5.2) t.match('MSIEMobile|Windows CE.*Mobile') || t.version('Windows Mobile')<=5.2 ){ return 'C'; } //All older smartphone platforms and featurephones - Any device that doesn't support media queries //will receive the basic, C grade experience. return 'C'; }; impl.detectOS = function (ua) { return impl.findMatch(impl.mobileDetectRules.oss0, ua) || impl.findMatch(impl.mobileDetectRules.oss, ua); }; impl.getDeviceSmallerSide = function () { return window.screen.width < window.screen.height ? window.screen.width : window.screen.height; }; /** * Constructor for MobileDetect object. *
* Such an object will keep a reference to the given user-agent string and cache most of the detect queries.
*
* Find information how to download and install: * github.com/hgoebl/mobile-detect.js/ *
* * @example 
     *     var md = new MobileDetect(window.navigator.userAgent);     *     if (md.mobile()) {     *         location.href = (md.mobileGrade() === 'A') ? '/mobile/' : '/lynx/';     *     }     *
* * @param {string} userAgent typically taken from window.navigator.userAgent or http_header['User-Agent'] * @param {number} [maxPhoneWidth=600] only for browsers specify a value for the maximum * width of smallest device side (in logical "CSS" pixels) until a device detected as mobile will be handled * as phone. * This is only used in cases where the device cannot be classified as phone or tablet.
* See Declaring Tablet Layouts * for Android.
* If you provide a value < 0, then this "fuzzy" check is disabled. * @constructor * @global */ function MobileDetect(userAgent, maxPhoneWidth) { this.ua = userAgent || ''; this._cache = {}; //600dp is typical 7" tablet minimum width this.maxPhoneWidth = maxPhoneWidth || 600; } MobileDetect.prototype = { constructor: MobileDetect, /** * Returns the detected phone or tablet type or null if it is not a mobile device. *
* For a list of possible return values see {@link MobileDetect#phone} and {@link MobileDetect#tablet}.
*
* If the device is not detected by the regular expressions from Mobile-Detect, a test is made against * the patterns of detectmobilebrowsers.com. If this test * is positive, a value of UnknownPhone, UnknownTablet or * UnknownMobile is returned.
* When used in browser, the decision whether phone or tablet is made based on screen.width/height.
*
* When used server-side (node.js), there is no way to tell the difference between UnknownTablet * and UnknownMobile, so you will get UnknownMobile here.
* Be aware that since v1.0.0 in this special case you will get UnknownMobile only for: * {@link MobileDetect#mobile}, not for {@link MobileDetect#phone} and {@link MobileDetect#tablet}. * In versions before v1.0.0 all 3 methods returned UnknownMobile which was tedious to use. *
* In most cases you will use the return value just as a boolean. * * @returns {String} the key for the phone family or tablet family, e.g. "Nexus". * @function MobileDetect#mobile */ mobile: function () { impl.prepareDetectionCache(this._cache, this.ua, this.maxPhoneWidth); return this._cache.mobile; }, /** * Returns the detected phone type/family string or null. *
* The returned tablet (family or producer) is one of following keys:
*
iPhone, BlackBerry, HTC, Nexus, Dell, Motorola, Samsung, LG, Sony, Asus, * NokiaLumia, Micromax, Palm, Vertu, Pantech, Fly, Wiko, iMobile, SimValley, * Wolfgang, Alcatel, Nintendo, Amoi, INQ, GenericPhone
*
* If the device is not detected by the regular expressions from Mobile-Detect, a test is made against * the patterns of detectmobilebrowsers.com. If this test * is positive, a value of UnknownPhone or UnknownMobile is returned.
* When used in browser, the decision whether phone or tablet is made based on screen.width/height.
*
* When used server-side (node.js), there is no way to tell the difference between UnknownTablet * and UnknownMobile, so you will get null here, while {@link MobileDetect#mobile} * will return UnknownMobile.
* Be aware that since v1.0.0 in this special case you will get UnknownMobile only for: * {@link MobileDetect#mobile}, not for {@link MobileDetect#phone} and {@link MobileDetect#tablet}. * In versions before v1.0.0 all 3 methods returned UnknownMobile which was tedious to use. *
* In most cases you will use the return value just as a boolean. * * @returns {String} the key of the phone family or producer, e.g. "iPhone" * @function MobileDetect#phone */ phone: function () { impl.prepareDetectionCache(this._cache, this.ua, this.maxPhoneWidth); return this._cache.phone; }, /** * Returns the detected tablet type/family string or null. *
* The returned tablet (family or producer) is one of following keys:
*
iPad, NexusTablet, SamsungTablet, Kindle, SurfaceTablet, HPTablet, AsusTablet, * BlackBerryTablet, HTCtablet, MotorolaTablet, NookTablet, AcerTablet, * ToshibaTablet, LGTablet, FujitsuTablet, PrestigioTablet, LenovoTablet, * DellTablet, YarvikTablet, MedionTablet, ArnovaTablet, IntensoTablet, IRUTablet, * MegafonTablet, EbodaTablet, AllViewTablet, ArchosTablet, AinolTablet, * NokiaLumiaTablet, SonyTablet, PhilipsTablet, CubeTablet, CobyTablet, MIDTablet, * MSITablet, SMiTTablet, RockChipTablet, FlyTablet, bqTablet, HuaweiTablet, * NecTablet, PantechTablet, BronchoTablet, VersusTablet, ZyncTablet, * PositivoTablet, NabiTablet, KoboTablet, DanewTablet, TexetTablet, * PlaystationTablet, TrekstorTablet, PyleAudioTablet, AdvanTablet, * DanyTechTablet, GalapadTablet, MicromaxTablet, KarbonnTablet, AllFineTablet, * PROSCANTablet, YONESTablet, ChangJiaTablet, GUTablet, PointOfViewTablet, * OvermaxTablet, HCLTablet, DPSTablet, VistureTablet, CrestaTablet, * MediatekTablet, ConcordeTablet, GoCleverTablet, ModecomTablet, VoninoTablet, * ECSTablet, StorexTablet, VodafoneTablet, EssentielBTablet, RossMoorTablet, * iMobileTablet, TolinoTablet, AudioSonicTablet, AMPETablet, SkkTablet, * TecnoTablet, JXDTablet, iJoyTablet, FX2Tablet, XoroTablet, ViewsonicTablet, * OdysTablet, CaptivaTablet, IconbitTablet, TeclastTablet, OndaTablet, * JaytechTablet, BlaupunktTablet, DigmaTablet, EvolioTablet, LavaTablet, * AocTablet, MpmanTablet, CelkonTablet, WolderTablet, MiTablet, NibiruTablet, * NexoTablet, LeaderTablet, UbislateTablet, PocketBookTablet, KocasoTablet, Hudl, * TelstraTablet, GenericTablet
*
* If the device is not detected by the regular expressions from Mobile-Detect, a test is made against * the patterns of detectmobilebrowsers.com. If this test * is positive, a value of UnknownTablet or UnknownMobile is returned.
* When used in browser, the decision whether phone or tablet is made based on screen.width/height.
*
* When used server-side (node.js), there is no way to tell the difference between UnknownTablet * and UnknownMobile, so you will get null here, while {@link MobileDetect#mobile} * will return UnknownMobile.
* Be aware that since v1.0.0 in this special case you will get UnknownMobile only for: * {@link MobileDetect#mobile}, not for {@link MobileDetect#phone} and {@link MobileDetect#tablet}. * In versions before v1.0.0 all 3 methods returned UnknownMobile which was tedious to use. *
* In most cases you will use the return value just as a boolean. * * @returns {String} the key of the tablet family or producer, e.g. "SamsungTablet" * @function MobileDetect#tablet */ tablet: function () { impl.prepareDetectionCache(this._cache, this.ua, this.maxPhoneWidth); return this._cache.tablet; }, /** * Returns the (first) detected user-agent string or null. *
* The returned user-agent is one of following keys:
*
Vivaldi, Chrome, Dolfin, Opera, Skyfire, Edge, IE, Firefox, Bolt, TeaShark, * Blazer, Safari, Tizen, UCBrowser, baiduboxapp, baidubrowser, DiigoBrowser, * Puffin, Mercury, ObigoBrowser, NetFront, GenericBrowser, PaleMoon
*
* In most cases calling {@link MobileDetect#userAgent} will be sufficient. But there are rare * cases where a mobile device pretends to be more than one particular browser. You can get the * list of all matches with {@link MobileDetect#userAgents} or check for a particular value by * providing one of the defined keys as first argument to {@link MobileDetect#is}. * * @returns {String} the key for the detected user-agent or null * @function MobileDetect#userAgent */ userAgent: function () { if (this._cache.userAgent === undefined) { this._cache.userAgent = impl.findMatch(impl.mobileDetectRules.uas, this.ua); } return this._cache.userAgent; }, /** * Returns all detected user-agent strings. *
* The array is empty or contains one or more of following keys:
*
Vivaldi, Chrome, Dolfin, Opera, Skyfire, Edge, IE, Firefox, Bolt, TeaShark, * Blazer, Safari, Tizen, UCBrowser, baiduboxapp, baidubrowser, DiigoBrowser, * Puffin, Mercury, ObigoBrowser, NetFront, GenericBrowser, PaleMoon
*
* In most cases calling {@link MobileDetect#userAgent} will be sufficient. But there are rare * cases where a mobile device pretends to be more than one particular browser. You can get the * list of all matches with {@link MobileDetect#userAgents} or check for a particular value by * providing one of the defined keys as first argument to {@link MobileDetect#is}. * * @returns {Array} the array of detected user-agent keys or [] * @function MobileDetect#userAgents */ userAgents: function () { if (this._cache.userAgents === undefined) { this._cache.userAgents = impl.findMatches(impl.mobileDetectRules.uas, this.ua); } return this._cache.userAgents; }, /** * Returns the detected operating system string or null. *
* The operating system is one of following keys:
*
AndroidOS, BlackBerryOS, PalmOS, SymbianOS, WindowsMobileOS, WindowsPhoneOS, * iOS, MeeGoOS, MaemoOS, JavaOS, webOS, badaOS, BREWOS
* * @returns {String} the key for the detected operating system. * @function MobileDetect#os */ os: function () { if (this._cache.os === undefined) { this._cache.os = impl.detectOS(this.ua); } return this._cache.os; }, /** * Get the version (as Number) of the given property in the User-Agent. *
* Will return a float number. (eg. 2_0 will return 2.0, 4.3.1 will return 4.31) * * @param {String} key a key defining a thing which has a version.
* You can use one of following keys:
*
Mobile, Build, Version, VendorID, iPad, iPhone, iPod, Kindle, Chrome, Coast, * Dolfin, Firefox, Fennec, Edge, IE, NetFront, NokiaBrowser, Opera, Opera Mini, * Opera Mobi, UC Browser, MQQBrowser, MicroMessenger, baiduboxapp, baidubrowser, * Iron, Safari, Skyfire, Tizen, Webkit, PaleMoon, Gecko, Trident, Presto, Goanna, * iOS, Android, BlackBerry, BREW, Java, Windows Phone OS, Windows Phone, Windows * CE, Windows NT, Symbian, webOS
* * @returns {Number} the version as float or NaN if User-Agent doesn't contain this version. * Be careful when comparing this value with '==' operator! * @function MobileDetect#version */ version: function (key) { return impl.getVersion(key, this.ua); }, /** * Get the version (as String) of the given property in the User-Agent. *
* * @param {String} key a key defining a thing which has a version.
* You can use one of following keys:
*
Mobile, Build, Version, VendorID, iPad, iPhone, iPod, Kindle, Chrome, Coast, * Dolfin, Firefox, Fennec, Edge, IE, NetFront, NokiaBrowser, Opera, Opera Mini, * Opera Mobi, UC Browser, MQQBrowser, MicroMessenger, baiduboxapp, baidubrowser, * Iron, Safari, Skyfire, Tizen, Webkit, PaleMoon, Gecko, Trident, Presto, Goanna, * iOS, Android, BlackBerry, BREW, Java, Windows Phone OS, Windows Phone, Windows * CE, Windows NT, Symbian, webOS
* * @returns {String} the "raw" version as String or null if User-Agent doesn't contain this version. * * @function MobileDetect#versionStr */ versionStr: function (key) { return impl.getVersionStr(key, this.ua); }, /** * Global test key against userAgent, os, phone, tablet and some other properties of userAgent string. * * @param {String} key the key (case-insensitive) of a userAgent, an operating system, phone or * tablet family.
* For a complete list of possible values, see {@link MobileDetect#userAgent}, * {@link MobileDetect#os}, {@link MobileDetect#phone}, {@link MobileDetect#tablet}.
* Additionally you have following keys:
*
Bot, MobileBot, DesktopMode, TV, WebKit, Console, Watch
* * @returns {boolean} true when the given key is one of the defined keys of userAgent, os, phone, * tablet or one of the listed additional keys, otherwise false * @function MobileDetect#is */ is: function (key) { return containsIC(this.userAgents(), key) || equalIC(key, this.os()) || equalIC(key, this.phone()) || equalIC(key, this.tablet()) || containsIC(impl.findMatches(impl.mobileDetectRules.utils, this.ua), key); }, /** * Do a quick test against navigator::userAgent. * * @param {String|RegExp} pattern the pattern, either as String or RegExp * (a string will be converted to a case-insensitive RegExp). * @returns {boolean} true when the pattern matches, otherwise false * @function MobileDetect#match */ match: function (pattern) { if (!(pattern instanceof RegExp)) { pattern = new RegExp(pattern, 'i'); } return pattern.test(this.ua); }, /** * Checks whether the mobile device can be considered as phone regarding screen.width. *
* Obviously this method makes sense in browser environments only (not for Node.js)! * @param {number} [maxPhoneWidth] the maximum logical pixels (aka. CSS-pixels) to be considered as phone.
* The argument is optional and if not present or falsy, the value of the constructor is taken. * @returns {boolean|undefined} undefined if screen size wasn't detectable, else true * when screen.width is less or equal to maxPhoneWidth, otherwise false.
* Will always return undefined server-side. */ isPhoneSized: function (maxPhoneWidth) { return MobileDetect.isPhoneSized(maxPhoneWidth || this.maxPhoneWidth); }, /** * Returns the mobile grade ('A', 'B', 'C'). * * @returns {String} one of the mobile grades ('A', 'B', 'C'). * @function MobileDetect#mobileGrade */ mobileGrade: function () { if (this._cache.grade === undefined) { this._cache.grade = impl.mobileGrade(this); } return this._cache.grade; } }; // environment-dependent if (typeof window !== 'undefined' && window.screen) { MobileDetect.isPhoneSized = function (maxPhoneWidth) { return maxPhoneWidth < 0 ? undefined : impl.getDeviceSmallerSide() <= maxPhoneWidth; }; } else { MobileDetect.isPhoneSized = function () {}; } // should not be replaced by a completely new object - just overwrite existing methods MobileDetect._impl = impl; MobileDetect.version = '1.3.3 2016-07-31'; return MobileDetect;}); // end of call of define()})((function (undefined) { if (typeof module !== 'undefined' && module.exports) { return function (factory) { module.exports = factory(); }; } else if (typeof define === 'function' && define.amd) { return define; } else if (typeof window !== 'undefined') { return function (factory) { window.MobileDetect = factory(); }; } else { // please file a bug if you get this error! throw new Error('unknown environment'); }})()) : void +>(function (define, undefined) {define(function () { 'use strict'; var impl = {}; impl.mobileDetectRules = { "phones": { "iPhone": "\\biPhone\\b|\\biPod\\b", "BlackBerry": "BlackBerry|\\bBB10\\b|rim[0-9]+", "HTC": "HTC|HTC.*(Sensation|Evo|Vision|Explorer|6800|8100|8900|A7272|S510e|C110e|Legend|Desire|T8282)|APX515CKT|Qtek9090|APA9292KT|HD_mini|Sensation.*Z710e|PG86100|Z715e|Desire.*(A8181|HD)|ADR6200|ADR6400L|ADR6425|001HT|Inspire 4G|Android.*\\bEVO\\b|T-Mobile G1|Z520m", "Nexus": "Nexus One|Nexus S|Galaxy.*Nexus|Android.*Nexus.*Mobile|Nexus 4|Nexus 5|Nexus 6", "Dell": "Dell.*Streak|Dell.*Aero|Dell.*Venue|DELL.*Venue Pro|Dell Flash|Dell Smoke|Dell Mini 3iX|XCD28|XCD35|\\b001DL\\b|\\b101DL\\b|\\bGS01\\b", "Motorola": "Motorola|DROIDX|DROID BIONIC|\\bDroid\\b.*Build|Android.*Xoom|HRI39|MOT-|A1260|A1680|A555|A853|A855|A953|A955|A956|Motorola.*ELECTRIFY|Motorola.*i1|i867|i940|MB200|MB300|MB501|MB502|MB508|MB511|MB520|MB525|MB526|MB611|MB612|MB632|MB810|MB855|MB860|MB861|MB865|MB870|ME501|ME502|ME511|ME525|ME600|ME632|ME722|ME811|ME860|ME863|ME865|MT620|MT710|MT716|MT720|MT810|MT870|MT917|Motorola.*TITANIUM|WX435|WX445|XT300|XT301|XT311|XT316|XT317|XT319|XT320|XT390|XT502|XT530|XT531|XT532|XT535|XT603|XT610|XT611|XT615|XT681|XT701|XT702|XT711|XT720|XT800|XT806|XT860|XT862|XT875|XT882|XT883|XT894|XT901|XT907|XT909|XT910|XT912|XT928|XT926|XT915|XT919|XT925|XT1021|\\bMoto E\\b", "Samsung": "Samsung|SM-G9250|GT-19300|SGH-I337|BGT-S5230|GT-B2100|GT-B2700|GT-B2710|GT-B3210|GT-B3310|GT-B3410|GT-B3730|GT-B3740|GT-B5510|GT-B5512|GT-B5722|GT-B6520|GT-B7300|GT-B7320|GT-B7330|GT-B7350|GT-B7510|GT-B7722|GT-B7800|GT-C3010|GT-C3011|GT-C3060|GT-C3200|GT-C3212|GT-C3212I|GT-C3262|GT-C3222|GT-C3300|GT-C3300K|GT-C3303|GT-C3303K|GT-C3310|GT-C3322|GT-C3330|GT-C3350|GT-C3500|GT-C3510|GT-C3530|GT-C3630|GT-C3780|GT-C5010|GT-C5212|GT-C6620|GT-C6625|GT-C6712|GT-E1050|GT-E1070|GT-E1075|GT-E1080|GT-E1081|GT-E1085|GT-E1087|GT-E1100|GT-E1107|GT-E1110|GT-E1120|GT-E1125|GT-E1130|GT-E1160|GT-E1170|GT-E1175|GT-E1180|GT-E1182|GT-E1200|GT-E1210|GT-E1225|GT-E1230|GT-E1390|GT-E2100|GT-E2120|GT-E2121|GT-E2152|GT-E2220|GT-E2222|GT-E2230|GT-E2232|GT-E2250|GT-E2370|GT-E2550|GT-E2652|GT-E3210|GT-E3213|GT-I5500|GT-I5503|GT-I5700|GT-I5800|GT-I5801|GT-I6410|GT-I6420|GT-I7110|GT-I7410|GT-I7500|GT-I8000|GT-I8150|GT-I8160|GT-I8190|GT-I8320|GT-I8330|GT-I8350|GT-I8530|GT-I8700|GT-I8703|GT-I8910|GT-I9000|GT-I9001|GT-I9003|GT-I9010|GT-I9020|GT-I9023|GT-I9070|GT-I9082|GT-I9100|GT-I9103|GT-I9220|GT-I9250|GT-I9300|GT-I9305|GT-I9500|GT-I9505|GT-M3510|GT-M5650|GT-M7500|GT-M7600|GT-M7603|GT-M8800|GT-M8910|GT-N7000|GT-S3110|GT-S3310|GT-S3350|GT-S3353|GT-S3370|GT-S3650|GT-S3653|GT-S3770|GT-S3850|GT-S5210|GT-S5220|GT-S5229|GT-S5230|GT-S5233|GT-S5250|GT-S5253|GT-S5260|GT-S5263|GT-S5270|GT-S5300|GT-S5330|GT-S5350|GT-S5360|GT-S5363|GT-S5369|GT-S5380|GT-S5380D|GT-S5560|GT-S5570|GT-S5600|GT-S5603|GT-S5610|GT-S5620|GT-S5660|GT-S5670|GT-S5690|GT-S5750|GT-S5780|GT-S5830|GT-S5839|GT-S6102|GT-S6500|GT-S7070|GT-S7200|GT-S7220|GT-S7230|GT-S7233|GT-S7250|GT-S7500|GT-S7530|GT-S7550|GT-S7562|GT-S7710|GT-S8000|GT-S8003|GT-S8500|GT-S8530|GT-S8600|SCH-A310|SCH-A530|SCH-A570|SCH-A610|SCH-A630|SCH-A650|SCH-A790|SCH-A795|SCH-A850|SCH-A870|SCH-A890|SCH-A930|SCH-A950|SCH-A970|SCH-A990|SCH-I100|SCH-I110|SCH-I400|SCH-I405|SCH-I500|SCH-I510|SCH-I515|SCH-I600|SCH-I730|SCH-I760|SCH-I770|SCH-I830|SCH-I910|SCH-I920|SCH-I959|SCH-LC11|SCH-N150|SCH-N300|SCH-R100|SCH-R300|SCH-R351|SCH-R400|SCH-R410|SCH-T300|SCH-U310|SCH-U320|SCH-U350|SCH-U360|SCH-U365|SCH-U370|SCH-U380|SCH-U410|SCH-U430|SCH-U450|SCH-U460|SCH-U470|SCH-U490|SCH-U540|SCH-U550|SCH-U620|SCH-U640|SCH-U650|SCH-U660|SCH-U700|SCH-U740|SCH-U750|SCH-U810|SCH-U820|SCH-U900|SCH-U940|SCH-U960|SCS-26UC|SGH-A107|SGH-A117|SGH-A127|SGH-A137|SGH-A157|SGH-A167|SGH-A177|SGH-A187|SGH-A197|SGH-A227|SGH-A237|SGH-A257|SGH-A437|SGH-A517|SGH-A597|SGH-A637|SGH-A657|SGH-A667|SGH-A687|SGH-A697|SGH-A707|SGH-A717|SGH-A727|SGH-A737|SGH-A747|SGH-A767|SGH-A777|SGH-A797|SGH-A817|SGH-A827|SGH-A837|SGH-A847|SGH-A867|SGH-A877|SGH-A887|SGH-A897|SGH-A927|SGH-B100|SGH-B130|SGH-B200|SGH-B220|SGH-C100|SGH-C110|SGH-C120|SGH-C130|SGH-C140|SGH-C160|SGH-C170|SGH-C180|SGH-C200|SGH-C207|SGH-C210|SGH-C225|SGH-C230|SGH-C417|SGH-C450|SGH-D307|SGH-D347|SGH-D357|SGH-D407|SGH-D415|SGH-D780|SGH-D807|SGH-D980|SGH-E105|SGH-E200|SGH-E315|SGH-E316|SGH-E317|SGH-E335|SGH-E590|SGH-E635|SGH-E715|SGH-E890|SGH-F300|SGH-F480|SGH-I200|SGH-I300|SGH-I320|SGH-I550|SGH-I577|SGH-I600|SGH-I607|SGH-I617|SGH-I627|SGH-I637|SGH-I677|SGH-I700|SGH-I717|SGH-I727|SGH-i747M|SGH-I777|SGH-I780|SGH-I827|SGH-I847|SGH-I857|SGH-I896|SGH-I897|SGH-I900|SGH-I907|SGH-I917|SGH-I927|SGH-I937|SGH-I997|SGH-J150|SGH-J200|SGH-L170|SGH-L700|SGH-M110|SGH-M150|SGH-M200|SGH-N105|SGH-N500|SGH-N600|SGH-N620|SGH-N625|SGH-N700|SGH-N710|SGH-P107|SGH-P207|SGH-P300|SGH-P310|SGH-P520|SGH-P735|SGH-P777|SGH-Q105|SGH-R210|SGH-R220|SGH-R225|SGH-S105|SGH-S307|SGH-T109|SGH-T119|SGH-T139|SGH-T209|SGH-T219|SGH-T229|SGH-T239|SGH-T249|SGH-T259|SGH-T309|SGH-T319|SGH-T329|SGH-T339|SGH-T349|SGH-T359|SGH-T369|SGH-T379|SGH-T409|SGH-T429|SGH-T439|SGH-T459|SGH-T469|SGH-T479|SGH-T499|SGH-T509|SGH-T519|SGH-T539|SGH-T559|SGH-T589|SGH-T609|SGH-T619|SGH-T629|SGH-T639|SGH-T659|SGH-T669|SGH-T679|SGH-T709|SGH-T719|SGH-T729|SGH-T739|SGH-T746|SGH-T749|SGH-T759|SGH-T769|SGH-T809|SGH-T819|SGH-T839|SGH-T919|SGH-T929|SGH-T939|SGH-T959|SGH-T989|SGH-U100|SGH-U200|SGH-U800|SGH-V205|SGH-V206|SGH-X100|SGH-X105|SGH-X120|SGH-X140|SGH-X426|SGH-X427|SGH-X475|SGH-X495|SGH-X497|SGH-X507|SGH-X600|SGH-X610|SGH-X620|SGH-X630|SGH-X700|SGH-X820|SGH-X890|SGH-Z130|SGH-Z150|SGH-Z170|SGH-ZX10|SGH-ZX20|SHW-M110|SPH-A120|SPH-A400|SPH-A420|SPH-A460|SPH-A500|SPH-A560|SPH-A600|SPH-A620|SPH-A660|SPH-A700|SPH-A740|SPH-A760|SPH-A790|SPH-A800|SPH-A820|SPH-A840|SPH-A880|SPH-A900|SPH-A940|SPH-A960|SPH-D600|SPH-D700|SPH-D710|SPH-D720|SPH-I300|SPH-I325|SPH-I330|SPH-I350|SPH-I500|SPH-I600|SPH-I700|SPH-L700|SPH-M100|SPH-M220|SPH-M240|SPH-M300|SPH-M305|SPH-M320|SPH-M330|SPH-M350|SPH-M360|SPH-M370|SPH-M380|SPH-M510|SPH-M540|SPH-M550|SPH-M560|SPH-M570|SPH-M580|SPH-M610|SPH-M620|SPH-M630|SPH-M800|SPH-M810|SPH-M850|SPH-M900|SPH-M910|SPH-M920|SPH-M930|SPH-N100|SPH-N200|SPH-N240|SPH-N300|SPH-N400|SPH-Z400|SWC-E100|SCH-i909|GT-N7100|GT-N7105|SCH-I535|SM-N900A|SGH-I317|SGH-T999L|GT-S5360B|GT-I8262|GT-S6802|GT-S6312|GT-S6310|GT-S5312|GT-S5310|GT-I9105|GT-I8510|GT-S6790N|SM-G7105|SM-N9005|GT-S5301|GT-I9295|GT-I9195|SM-C101|GT-S7392|GT-S7560|GT-B7610|GT-I5510|GT-S7582|GT-S7530E|GT-I8750|SM-G9006V|SM-G9008V|SM-G9009D|SM-G900A|SM-G900D|SM-G900F|SM-G900H|SM-G900I|SM-G900J|SM-G900K|SM-G900L|SM-G900M|SM-G900P|SM-G900R4|SM-G900S|SM-G900T|SM-G900V|SM-G900W8|SHV-E160K|SCH-P709|SCH-P729|SM-T2558|GT-I9205|SM-G9350|SM-J120F", "LG": "\\bLG\\b;|LG[- ]?(C800|C900|E400|E610|E900|E-900|F160|F180K|F180L|F180S|730|855|L160|LS740|LS840|LS970|LU6200|MS690|MS695|MS770|MS840|MS870|MS910|P500|P700|P705|VM696|AS680|AS695|AX840|C729|E970|GS505|272|C395|E739BK|E960|L55C|L75C|LS696|LS860|P769BK|P350|P500|P509|P870|UN272|US730|VS840|VS950|LN272|LN510|LS670|LS855|LW690|MN270|MN510|P509|P769|P930|UN200|UN270|UN510|UN610|US670|US740|US760|UX265|UX840|VN271|VN530|VS660|VS700|VS740|VS750|VS910|VS920|VS930|VX9200|VX11000|AX840A|LW770|P506|P925|P999|E612|D955|D802|MS323)", "Sony": "SonyST|SonyLT|SonyEricsson|SonyEricssonLT15iv|LT18i|E10i|LT28h|LT26w|SonyEricssonMT27i|C5303|C6902|C6903|C6906|C6943|D2533", "Asus": "Asus.*Galaxy|PadFone.*Mobile", "NokiaLumia": "Lumia [0-9]{3,4}", "Micromax": "Micromax.*\\b(A210|A92|A88|A72|A111|A110Q|A115|A116|A110|A90S|A26|A51|A35|A54|A25|A27|A89|A68|A65|A57|A90)\\b", "Palm": "PalmSource|Palm", "Vertu": "Vertu|Vertu.*Ltd|Vertu.*Ascent|Vertu.*Ayxta|Vertu.*Constellation(F|Quest)?|Vertu.*Monika|Vertu.*Signature", "Pantech": "PANTECH|IM-A850S|IM-A840S|IM-A830L|IM-A830K|IM-A830S|IM-A820L|IM-A810K|IM-A810S|IM-A800S|IM-T100K|IM-A725L|IM-A780L|IM-A775C|IM-A770K|IM-A760S|IM-A750K|IM-A740S|IM-A730S|IM-A720L|IM-A710K|IM-A690L|IM-A690S|IM-A650S|IM-A630K|IM-A600S|VEGA PTL21|PT003|P8010|ADR910L|P6030|P6020|P9070|P4100|P9060|P5000|CDM8992|TXT8045|ADR8995|IS11PT|P2030|P6010|P8000|PT002|IS06|CDM8999|P9050|PT001|TXT8040|P2020|P9020|P2000|P7040|P7000|C790", "Fly": "IQ230|IQ444|IQ450|IQ440|IQ442|IQ441|IQ245|IQ256|IQ236|IQ255|IQ235|IQ245|IQ275|IQ240|IQ285|IQ280|IQ270|IQ260|IQ250", "Wiko": "KITE 4G|HIGHWAY|GETAWAY|STAIRWAY|DARKSIDE|DARKFULL|DARKNIGHT|DARKMOON|SLIDE|WAX 4G|RAINBOW|BLOOM|SUNSET|GOA(?!nna)|LENNY|BARRY|IGGY|OZZY|CINK FIVE|CINK PEAX|CINK PEAX 2|CINK SLIM|CINK SLIM 2|CINK +|CINK KING|CINK PEAX|CINK SLIM|SUBLIM", "iMobile": "i-mobile (IQ|i-STYLE|idea|ZAA|Hitz)", "SimValley": "\\b(SP-80|XT-930|SX-340|XT-930|SX-310|SP-360|SP60|SPT-800|SP-120|SPT-800|SP-140|SPX-5|SPX-8|SP-100|SPX-8|SPX-12)\\b", "Wolfgang": "AT-B24D|AT-AS50HD|AT-AS40W|AT-AS55HD|AT-AS45q2|AT-B26D|AT-AS50Q", "Alcatel": "Alcatel", "Nintendo": "Nintendo 3DS", "Amoi": "Amoi", "INQ": "INQ", "GenericPhone": "Tapatalk|PDA;|SAGEM|\\bmmp\\b|pocket|\\bpsp\\b|symbian|Smartphone|smartfon|treo|up.browser|up.link|vodafone|\\bwap\\b|nokia|Series40|Series60|S60|SonyEricsson|N900|MAUI.*WAP.*Browser" }, "tablets": { "iPad": "iPad|iPad.*Mobile", "NexusTablet": "Android.*Nexus[\\s]+(7|9|10)", "SamsungTablet": "SAMSUNG.*Tablet|Galaxy.*Tab|SC-01C|GT-P1000|GT-P1003|GT-P1010|GT-P3105|GT-P6210|GT-P6800|GT-P6810|GT-P7100|GT-P7300|GT-P7310|GT-P7500|GT-P7510|SCH-I800|SCH-I815|SCH-I905|SGH-I957|SGH-I987|SGH-T849|SGH-T859|SGH-T869|SPH-P100|GT-P3100|GT-P3108|GT-P3110|GT-P5100|GT-P5110|GT-P6200|GT-P7320|GT-P7511|GT-N8000|GT-P8510|SGH-I497|SPH-P500|SGH-T779|SCH-I705|SCH-I915|GT-N8013|GT-P3113|GT-P5113|GT-P8110|GT-N8010|GT-N8005|GT-N8020|GT-P1013|GT-P6201|GT-P7501|GT-N5100|GT-N5105|GT-N5110|SHV-E140K|SHV-E140L|SHV-E140S|SHV-E150S|SHV-E230K|SHV-E230L|SHV-E230S|SHW-M180K|SHW-M180L|SHW-M180S|SHW-M180W|SHW-M300W|SHW-M305W|SHW-M380K|SHW-M380S|SHW-M380W|SHW-M430W|SHW-M480K|SHW-M480S|SHW-M480W|SHW-M485W|SHW-M486W|SHW-M500W|GT-I9228|SCH-P739|SCH-I925|GT-I9200|GT-P5200|GT-P5210|GT-P5210X|SM-T311|SM-T310|SM-T310X|SM-T210|SM-T210R|SM-T211|SM-P600|SM-P601|SM-P605|SM-P900|SM-P901|SM-T217|SM-T217A|SM-T217S|SM-P6000|SM-T3100|SGH-I467|XE500|SM-T110|GT-P5220|GT-I9200X|GT-N5110X|GT-N5120|SM-P905|SM-T111|SM-T2105|SM-T315|SM-T320|SM-T320X|SM-T321|SM-T520|SM-T525|SM-T530NU|SM-T230NU|SM-T330NU|SM-T900|XE500T1C|SM-P605V|SM-P905V|SM-T337V|SM-T537V|SM-T707V|SM-T807V|SM-P600X|SM-P900X|SM-T210X|SM-T230|SM-T230X|SM-T325|GT-P7503|SM-T531|SM-T330|SM-T530|SM-T705|SM-T705C|SM-T535|SM-T331|SM-T800|SM-T700|SM-T537|SM-T807|SM-P907A|SM-T337A|SM-T537A|SM-T707A|SM-T807A|SM-T237|SM-T807P|SM-P607T|SM-T217T|SM-T337T|SM-T807T|SM-T116NQ|SM-P550|SM-T350|SM-T550|SM-T9000|SM-P9000|SM-T705Y|SM-T805|GT-P3113|SM-T710|SM-T810|SM-T815|SM-T360|SM-T533|SM-T113|SM-T335|SM-T715|SM-T560|SM-T670|SM-T677|SM-T377|SM-T567|SM-T357T|SM-T555|SM-T561", "Kindle": "Kindle|Silk.*Accelerated|Android.*\\b(KFOT|KFTT|KFJWI|KFJWA|KFOTE|KFSOWI|KFTHWI|KFTHWA|KFAPWI|KFAPWA|WFJWAE|KFSAWA|KFSAWI|KFASWI|KFARWI)\\b", "SurfaceTablet": "Windows NT [0-9.]+; ARM;.*(Tablet|ARMBJS)", "HPTablet": "HP Slate (7|8|10)|HP ElitePad 900|hp-tablet|EliteBook.*Touch|HP 8|Slate 21|HP SlateBook 10", "AsusTablet": "^.*PadFone((?!Mobile).)*$|Transformer|TF101|TF101G|TF300T|TF300TG|TF300TL|TF700T|TF700KL|TF701T|TF810C|ME171|ME301T|ME302C|ME371MG|ME370T|ME372MG|ME172V|ME173X|ME400C|Slider SL101|\\bK00F\\b|\\bK00C\\b|\\bK00E\\b|\\bK00L\\b|TX201LA|ME176C|ME102A|\\bM80TA\\b|ME372CL|ME560CG|ME372CG|ME302KL| K010 | K017 |ME572C|ME103K|ME170C|ME171C|\\bME70C\\b|ME581C|ME581CL|ME8510C|ME181C|P01Y|PO1MA", "BlackBerryTablet": "PlayBook|RIM Tablet", "HTCtablet": "HTC_Flyer_P512|HTC Flyer|HTC Jetstream|HTC-P715a|HTC EVO View 4G|PG41200|PG09410", "MotorolaTablet": "xoom|sholest|MZ615|MZ605|MZ505|MZ601|MZ602|MZ603|MZ604|MZ606|MZ607|MZ608|MZ609|MZ615|MZ616|MZ617", "NookTablet": "Android.*Nook|NookColor|nook browser|BNRV200|BNRV200A|BNTV250|BNTV250A|BNTV400|BNTV600|LogicPD Zoom2", "AcerTablet": "Android.*; \\b(A100|A101|A110|A200|A210|A211|A500|A501|A510|A511|A700|A701|W500|W500P|W501|W501P|W510|W511|W700|G100|G100W|B1-A71|B1-710|B1-711|A1-810|A1-811|A1-830)\\b|W3-810|\\bA3-A10\\b|\\bA3-A11\\b|\\bA3-A20", "ToshibaTablet": "Android.*(AT100|AT105|AT200|AT205|AT270|AT275|AT300|AT305|AT1S5|AT500|AT570|AT700|AT830)|TOSHIBA.*FOLIO", "LGTablet": "\\bL-06C|LG-V909|LG-V900|LG-V700|LG-V510|LG-V500|LG-V410|LG-V400|LG-VK810\\b", "FujitsuTablet": "Android.*\\b(F-01D|F-02F|F-05E|F-10D|M532|Q572)\\b", "PrestigioTablet": "PMP3170B|PMP3270B|PMP3470B|PMP7170B|PMP3370B|PMP3570C|PMP5870C|PMP3670B|PMP5570C|PMP5770D|PMP3970B|PMP3870C|PMP5580C|PMP5880D|PMP5780D|PMP5588C|PMP7280C|PMP7280C3G|PMP7280|PMP7880D|PMP5597D|PMP5597|PMP7100D|PER3464|PER3274|PER3574|PER3884|PER5274|PER5474|PMP5097CPRO|PMP5097|PMP7380D|PMP5297C|PMP5297C_QUAD|PMP812E|PMP812E3G|PMP812F|PMP810E|PMP880TD|PMT3017|PMT3037|PMT3047|PMT3057|PMT7008|PMT5887|PMT5001|PMT5002", "LenovoTablet": "Lenovo TAB|Idea(Tab|Pad)( A1|A10| K1|)|ThinkPad([ ]+)?Tablet|YT3-X90L|YT3-X90F|YT3-X90X|Lenovo.*(S2109|S2110|S5000|S6000|K3011|A3000|A3500|A1000|A2107|A2109|A1107|A5500|A7600|B6000|B8000|B8080)(-|)(FL|F|HV|H|)", "DellTablet": "Venue 11|Venue 8|Venue 7|Dell Streak 10|Dell Streak 7", "YarvikTablet": "Android.*\\b(TAB210|TAB211|TAB224|TAB250|TAB260|TAB264|TAB310|TAB360|TAB364|TAB410|TAB411|TAB420|TAB424|TAB450|TAB460|TAB461|TAB464|TAB465|TAB467|TAB468|TAB07-100|TAB07-101|TAB07-150|TAB07-151|TAB07-152|TAB07-200|TAB07-201-3G|TAB07-210|TAB07-211|TAB07-212|TAB07-214|TAB07-220|TAB07-400|TAB07-485|TAB08-150|TAB08-200|TAB08-201-3G|TAB08-201-30|TAB09-100|TAB09-211|TAB09-410|TAB10-150|TAB10-201|TAB10-211|TAB10-400|TAB10-410|TAB13-201|TAB274EUK|TAB275EUK|TAB374EUK|TAB462EUK|TAB474EUK|TAB9-200)\\b", "MedionTablet": "Android.*\\bOYO\\b|LIFE.*(P9212|P9514|P9516|S9512)|LIFETAB", "ArnovaTablet": "AN10G2|AN7bG3|AN7fG3|AN8G3|AN8cG3|AN7G3|AN9G3|AN7dG3|AN7dG3ST|AN7dG3ChildPad|AN10bG3|AN10bG3DT|AN9G2", "IntensoTablet": "INM8002KP|INM1010FP|INM805ND|Intenso Tab|TAB1004", "IRUTablet": "M702pro", "MegafonTablet": "MegaFon V9|\\bZTE V9\\b|Android.*\\bMT7A\\b", "EbodaTablet": "E-Boda (Supreme|Impresspeed|Izzycomm|Essential)", "AllViewTablet": "Allview.*(Viva|Alldro|City|Speed|All TV|Frenzy|Quasar|Shine|TX1|AX1|AX2)", "ArchosTablet": "\\b(101G9|80G9|A101IT)\\b|Qilive 97R|Archos5|\\bARCHOS (70|79|80|90|97|101|FAMILYPAD|)(b|)(G10| Cobalt| TITANIUM(HD|)| Xenon| Neon|XSK| 2| XS 2| PLATINUM| CARBON|GAMEPAD)\\b", "AinolTablet": "NOVO7|NOVO8|NOVO10|Novo7Aurora|Novo7Basic|NOVO7PALADIN|novo9-Spark", "NokiaLumiaTablet": "Lumia 2520", "SonyTablet": "Sony.*Tablet|Xperia Tablet|Sony Tablet S|SO-03E|SGPT12|SGPT13|SGPT114|SGPT121|SGPT122|SGPT123|SGPT111|SGPT112|SGPT113|SGPT131|SGPT132|SGPT133|SGPT211|SGPT212|SGPT213|SGP311|SGP312|SGP321|EBRD1101|EBRD1102|EBRD1201|SGP351|SGP341|SGP511|SGP512|SGP521|SGP541|SGP551|SGP621|SGP612|SOT31", "PhilipsTablet": "\\b(PI2010|PI3000|PI3100|PI3105|PI3110|PI3205|PI3210|PI3900|PI4010|PI7000|PI7100)\\b", "CubeTablet": "Android.*(K8GT|U9GT|U10GT|U16GT|U17GT|U18GT|U19GT|U20GT|U23GT|U30GT)|CUBE U8GT", "CobyTablet": "MID1042|MID1045|MID1125|MID1126|MID7012|MID7014|MID7015|MID7034|MID7035|MID7036|MID7042|MID7048|MID7127|MID8042|MID8048|MID8127|MID9042|MID9740|MID9742|MID7022|MID7010", "MIDTablet": "M9701|M9000|M9100|M806|M1052|M806|T703|MID701|MID713|MID710|MID727|MID760|MID830|MID728|MID933|MID125|MID810|MID732|MID120|MID930|MID800|MID731|MID900|MID100|MID820|MID735|MID980|MID130|MID833|MID737|MID960|MID135|MID860|MID736|MID140|MID930|MID835|MID733|MID4X10", "MSITablet": "MSI \\b(Primo 73K|Primo 73L|Primo 81L|Primo 77|Primo 93|Primo 75|Primo 76|Primo 73|Primo 81|Primo 91|Primo 90|Enjoy 71|Enjoy 7|Enjoy 10)\\b", "SMiTTablet": "Android.*(\\bMID\\b|MID-560|MTV-T1200|MTV-PND531|MTV-P1101|MTV-PND530)", "RockChipTablet": "Android.*(RK2818|RK2808A|RK2918|RK3066)|RK2738|RK2808A", "FlyTablet": "IQ310|Fly Vision", "bqTablet": "Android.*(bq)?.*(Elcano|Curie|Edison|Maxwell|Kepler|Pascal|Tesla|Hypatia|Platon|Newton|Livingstone|Cervantes|Avant|Aquaris E10)|Maxwell.*Lite|Maxwell.*Plus", "HuaweiTablet": "MediaPad|MediaPad 7 Youth|IDEOS S7|S7-201c|S7-202u|S7-101|S7-103|S7-104|S7-105|S7-106|S7-201|S7-Slim", "NecTablet": "\\bN-06D|\\bN-08D", "PantechTablet": "Pantech.*P4100", "BronchoTablet": "Broncho.*(N701|N708|N802|a710)", "VersusTablet": "TOUCHPAD.*[78910]|\\bTOUCHTAB\\b", "ZyncTablet": "z1000|Z99 2G|z99|z930|z999|z990|z909|Z919|z900", "PositivoTablet": "TB07STA|TB10STA|TB07FTA|TB10FTA", "NabiTablet": "Android.*\\bNabi", "KoboTablet": "Kobo Touch|\\bK080\\b|\\bVox\\b Build|\\bArc\\b Build", "DanewTablet": "DSlide.*\\b(700|701R|702|703R|704|802|970|971|972|973|974|1010|1012)\\b", "TexetTablet": "NaviPad|TB-772A|TM-7045|TM-7055|TM-9750|TM-7016|TM-7024|TM-7026|TM-7041|TM-7043|TM-7047|TM-8041|TM-9741|TM-9747|TM-9748|TM-9751|TM-7022|TM-7021|TM-7020|TM-7011|TM-7010|TM-7023|TM-7025|TM-7037W|TM-7038W|TM-7027W|TM-9720|TM-9725|TM-9737W|TM-1020|TM-9738W|TM-9740|TM-9743W|TB-807A|TB-771A|TB-727A|TB-725A|TB-719A|TB-823A|TB-805A|TB-723A|TB-715A|TB-707A|TB-705A|TB-709A|TB-711A|TB-890HD|TB-880HD|TB-790HD|TB-780HD|TB-770HD|TB-721HD|TB-710HD|TB-434HD|TB-860HD|TB-840HD|TB-760HD|TB-750HD|TB-740HD|TB-730HD|TB-722HD|TB-720HD|TB-700HD|TB-500HD|TB-470HD|TB-431HD|TB-430HD|TB-506|TB-504|TB-446|TB-436|TB-416|TB-146SE|TB-126SE", "PlaystationTablet": "Playstation.*(Portable|Vita)", "TrekstorTablet": "ST10416-1|VT10416-1|ST70408-1|ST702xx-1|ST702xx-2|ST80208|ST97216|ST70104-2|VT10416-2|ST10216-2A|SurfTab", "PyleAudioTablet": "\\b(PTBL10CEU|PTBL10C|PTBL72BC|PTBL72BCEU|PTBL7CEU|PTBL7C|PTBL92BC|PTBL92BCEU|PTBL9CEU|PTBL9CUK|PTBL9C)\\b", "AdvanTablet": "Android.* \\b(E3A|T3X|T5C|T5B|T3E|T3C|T3B|T1J|T1F|T2A|T1H|T1i|E1C|T1-E|T5-A|T4|E1-B|T2Ci|T1-B|T1-D|O1-A|E1-A|T1-A|T3A|T4i)\\b ", "DanyTechTablet": "Genius Tab G3|Genius Tab S2|Genius Tab Q3|Genius Tab G4|Genius Tab Q4|Genius Tab G-II|Genius TAB GII|Genius TAB GIII|Genius Tab S1", "GalapadTablet": "Android.*\\bG1\\b", "MicromaxTablet": "Funbook|Micromax.*\\b(P250|P560|P360|P362|P600|P300|P350|P500|P275)\\b", "KarbonnTablet": "Android.*\\b(A39|A37|A34|ST8|ST10|ST7|Smart Tab3|Smart Tab2)\\b", "AllFineTablet": "Fine7 Genius|Fine7 Shine|Fine7 Air|Fine8 Style|Fine9 More|Fine10 Joy|Fine11 Wide", "PROSCANTablet": "\\b(PEM63|PLT1023G|PLT1041|PLT1044|PLT1044G|PLT1091|PLT4311|PLT4311PL|PLT4315|PLT7030|PLT7033|PLT7033D|PLT7035|PLT7035D|PLT7044K|PLT7045K|PLT7045KB|PLT7071KG|PLT7072|PLT7223G|PLT7225G|PLT7777G|PLT7810K|PLT7849G|PLT7851G|PLT7852G|PLT8015|PLT8031|PLT8034|PLT8036|PLT8080K|PLT8082|PLT8088|PLT8223G|PLT8234G|PLT8235G|PLT8816K|PLT9011|PLT9045K|PLT9233G|PLT9735|PLT9760G|PLT9770G)\\b", "YONESTablet": "BQ1078|BC1003|BC1077|RK9702|BC9730|BC9001|IT9001|BC7008|BC7010|BC708|BC728|BC7012|BC7030|BC7027|BC7026", "ChangJiaTablet": "TPC7102|TPC7103|TPC7105|TPC7106|TPC7107|TPC7201|TPC7203|TPC7205|TPC7210|TPC7708|TPC7709|TPC7712|TPC7110|TPC8101|TPC8103|TPC8105|TPC8106|TPC8203|TPC8205|TPC8503|TPC9106|TPC9701|TPC97101|TPC97103|TPC97105|TPC97106|TPC97111|TPC97113|TPC97203|TPC97603|TPC97809|TPC97205|TPC10101|TPC10103|TPC10106|TPC10111|TPC10203|TPC10205|TPC10503", "GUTablet": "TX-A1301|TX-M9002|Q702|kf026", "PointOfViewTablet": "TAB-P506|TAB-navi-7-3G-M|TAB-P517|TAB-P-527|TAB-P701|TAB-P703|TAB-P721|TAB-P731N|TAB-P741|TAB-P825|TAB-P905|TAB-P925|TAB-PR945|TAB-PL1015|TAB-P1025|TAB-PI1045|TAB-P1325|TAB-PROTAB[0-9]+|TAB-PROTAB25|TAB-PROTAB26|TAB-PROTAB27|TAB-PROTAB26XL|TAB-PROTAB2-IPS9|TAB-PROTAB30-IPS9|TAB-PROTAB25XXL|TAB-PROTAB26-IPS10|TAB-PROTAB30-IPS10", "OvermaxTablet": "OV-(SteelCore|NewBase|Basecore|Baseone|Exellen|Quattor|EduTab|Solution|ACTION|BasicTab|TeddyTab|MagicTab|Stream|TB-08|TB-09)", "HCLTablet": "HCL.*Tablet|Connect-3G-2.0|Connect-2G-2.0|ME Tablet U1|ME Tablet U2|ME Tablet G1|ME Tablet X1|ME Tablet Y2|ME Tablet Sync", "DPSTablet": "DPS Dream 9|DPS Dual 7", "VistureTablet": "V97 HD|i75 3G|Visture V4( HD)?|Visture V5( HD)?|Visture V10", "CrestaTablet": "CTP(-)?810|CTP(-)?818|CTP(-)?828|CTP(-)?838|CTP(-)?888|CTP(-)?978|CTP(-)?980|CTP(-)?987|CTP(-)?988|CTP(-)?989", "MediatekTablet": "\\bMT8125|MT8389|MT8135|MT8377\\b", "ConcordeTablet": "Concorde([ ]+)?Tab|ConCorde ReadMan", "GoCleverTablet": "GOCLEVER TAB|A7GOCLEVER|M1042|M7841|M742|R1042BK|R1041|TAB A975|TAB A7842|TAB A741|TAB A741L|TAB M723G|TAB M721|TAB A1021|TAB I921|TAB R721|TAB I720|TAB T76|TAB R70|TAB R76.2|TAB R106|TAB R83.2|TAB M813G|TAB I721|GCTA722|TAB I70|TAB I71|TAB S73|TAB R73|TAB R74|TAB R93|TAB R75|TAB R76.1|TAB A73|TAB A93|TAB A93.2|TAB T72|TAB R83|TAB R974|TAB R973|TAB A101|TAB A103|TAB A104|TAB A104.2|R105BK|M713G|A972BK|TAB A971|TAB R974.2|TAB R104|TAB R83.3|TAB A1042", "ModecomTablet": "FreeTAB 9000|FreeTAB 7.4|FreeTAB 7004|FreeTAB 7800|FreeTAB 2096|FreeTAB 7.5|FreeTAB 1014|FreeTAB 1001 |FreeTAB 8001|FreeTAB 9706|FreeTAB 9702|FreeTAB 7003|FreeTAB 7002|FreeTAB 1002|FreeTAB 7801|FreeTAB 1331|FreeTAB 1004|FreeTAB 8002|FreeTAB 8014|FreeTAB 9704|FreeTAB 1003", "VoninoTablet": "\\b(Argus[ _]?S|Diamond[ _]?79HD|Emerald[ _]?78E|Luna[ _]?70C|Onyx[ _]?S|Onyx[ _]?Z|Orin[ _]?HD|Orin[ _]?S|Otis[ _]?S|SpeedStar[ _]?S|Magnet[ _]?M9|Primus[ _]?94[ _]?3G|Primus[ _]?94HD|Primus[ _]?QS|Android.*\\bQ8\\b|Sirius[ _]?EVO[ _]?QS|Sirius[ _]?QS|Spirit[ _]?S)\\b", "ECSTablet": "V07OT2|TM105A|S10OT1|TR10CS1", "StorexTablet": "eZee[_']?(Tab|Go)[0-9]+|TabLC7|Looney Tunes Tab", "VodafoneTablet": "SmartTab([ ]+)?[0-9]+|SmartTabII10|SmartTabII7|VF-1497", "EssentielBTablet": "Smart[ ']?TAB[ ]+?[0-9]+|Family[ ']?TAB2", "RossMoorTablet": "RM-790|RM-997|RMD-878G|RMD-974R|RMT-705A|RMT-701|RME-601|RMT-501|RMT-711", "iMobileTablet": "i-mobile i-note", "TolinoTablet": "tolino tab [0-9.]+|tolino shine", "AudioSonicTablet": "\\bC-22Q|T7-QC|T-17B|T-17P\\b", "AMPETablet": "Android.* A78 ", "SkkTablet": "Android.* (SKYPAD|PHOENIX|CYCLOPS)", "TecnoTablet": "TECNO P9", "JXDTablet": "Android.* \\b(F3000|A3300|JXD5000|JXD3000|JXD2000|JXD300B|JXD300|S5800|S7800|S602b|S5110b|S7300|S5300|S602|S603|S5100|S5110|S601|S7100a|P3000F|P3000s|P101|P200s|P1000m|P200m|P9100|P1000s|S6600b|S908|P1000|P300|S18|S6600|S9100)\\b", "iJoyTablet": "Tablet (Spirit 7|Essentia|Galatea|Fusion|Onix 7|Landa|Titan|Scooby|Deox|Stella|Themis|Argon|Unique 7|Sygnus|Hexen|Finity 7|Cream|Cream X2|Jade|Neon 7|Neron 7|Kandy|Scape|Saphyr 7|Rebel|Biox|Rebel|Rebel 8GB|Myst|Draco 7|Myst|Tab7-004|Myst|Tadeo Jones|Tablet Boing|Arrow|Draco Dual Cam|Aurix|Mint|Amity|Revolution|Finity 9|Neon 9|T9w|Amity 4GB Dual Cam|Stone 4GB|Stone 8GB|Andromeda|Silken|X2|Andromeda II|Halley|Flame|Saphyr 9,7|Touch 8|Planet|Triton|Unique 10|Hexen 10|Memphis 4GB|Memphis 8GB|Onix 10)", "FX2Tablet": "FX2 PAD7|FX2 PAD10", "XoroTablet": "KidsPAD 701|PAD[ ]?712|PAD[ ]?714|PAD[ ]?716|PAD[ ]?717|PAD[ ]?718|PAD[ ]?720|PAD[ ]?721|PAD[ ]?722|PAD[ ]?790|PAD[ ]?792|PAD[ ]?900|PAD[ ]?9715D|PAD[ ]?9716DR|PAD[ ]?9718DR|PAD[ ]?9719QR|PAD[ ]?9720QR|TelePAD1030|Telepad1032|TelePAD730|TelePAD731|TelePAD732|TelePAD735Q|TelePAD830|TelePAD9730|TelePAD795|MegaPAD 1331|MegaPAD 1851|MegaPAD 2151", "ViewsonicTablet": "ViewPad 10pi|ViewPad 10e|ViewPad 10s|ViewPad E72|ViewPad7|ViewPad E100|ViewPad 7e|ViewSonic VB733|VB100a", "OdysTablet": "LOOX|XENO10|ODYS[ -](Space|EVO|Xpress|NOON)|\\bXELIO\\b|Xelio10Pro|XELIO7PHONETAB|XELIO10EXTREME|XELIOPT2|NEO_QUAD10", "CaptivaTablet": "CAPTIVA PAD", "IconbitTablet": "NetTAB|NT-3702|NT-3702S|NT-3702S|NT-3603P|NT-3603P|NT-0704S|NT-0704S|NT-3805C|NT-3805C|NT-0806C|NT-0806C|NT-0909T|NT-0909T|NT-0907S|NT-0907S|NT-0902S|NT-0902S", "TeclastTablet": "T98 4G|\\bP80\\b|\\bX90HD\\b|X98 Air|X98 Air 3G|\\bX89\\b|P80 3G|\\bX80h\\b|P98 Air|\\bX89HD\\b|P98 3G|\\bP90HD\\b|P89 3G|X98 3G|\\bP70h\\b|P79HD 3G|G18d 3G|\\bP79HD\\b|\\bP89s\\b|\\bA88\\b|\\bP10HD\\b|\\bP19HD\\b|G18 3G|\\bP78HD\\b|\\bA78\\b|\\bP75\\b|G17s 3G|G17h 3G|\\bP85t\\b|\\bP90\\b|\\bP11\\b|\\bP98t\\b|\\bP98HD\\b|\\bG18d\\b|\\bP85s\\b|\\bP11HD\\b|\\bP88s\\b|\\bA80HD\\b|\\bA80se\\b|\\bA10h\\b|\\bP89\\b|\\bP78s\\b|\\bG18\\b|\\bP85\\b|\\bA70h\\b|\\bA70\\b|\\bG17\\b|\\bP18\\b|\\bA80s\\b|\\bA11s\\b|\\bP88HD\\b|\\bA80h\\b|\\bP76s\\b|\\bP76h\\b|\\bP98\\b|\\bA10HD\\b|\\bP78\\b|\\bP88\\b|\\bA11\\b|\\bA10t\\b|\\bP76a\\b|\\bP76t\\b|\\bP76e\\b|\\bP85HD\\b|\\bP85a\\b|\\bP86\\b|\\bP75HD\\b|\\bP76v\\b|\\bA12\\b|\\bP75a\\b|\\bA15\\b|\\bP76Ti\\b|\\bP81HD\\b|\\bA10\\b|\\bT760VE\\b|\\bT720HD\\b|\\bP76\\b|\\bP73\\b|\\bP71\\b|\\bP72\\b|\\bT720SE\\b|\\bC520Ti\\b|\\bT760\\b|\\bT720VE\\b|T720-3GE|T720-WiFi", "OndaTablet": "\\b(V975i|Vi30|VX530|V701|Vi60|V701s|Vi50|V801s|V719|Vx610w|VX610W|V819i|Vi10|VX580W|Vi10|V711s|V813|V811|V820w|V820|Vi20|V711|VI30W|V712|V891w|V972|V819w|V820w|Vi60|V820w|V711|V813s|V801|V819|V975s|V801|V819|V819|V818|V811|V712|V975m|V101w|V961w|V812|V818|V971|V971s|V919|V989|V116w|V102w|V973|Vi40)\\b[\\s]+", "JaytechTablet": "TPC-PA762", "BlaupunktTablet": "Endeavour 800NG|Endeavour 1010", "DigmaTablet": "\\b(iDx10|iDx9|iDx8|iDx7|iDxD7|iDxD8|iDsQ8|iDsQ7|iDsQ8|iDsD10|iDnD7|3TS804H|iDsQ11|iDj7|iDs10)\\b", "EvolioTablet": "ARIA_Mini_wifi|Aria[ _]Mini|Evolio X10|Evolio X7|Evolio X8|\\bEvotab\\b|\\bNeura\\b", "LavaTablet": "QPAD E704|\\bIvoryS\\b|E-TAB IVORY|\\bE-TAB\\b", "AocTablet": "MW0811|MW0812|MW0922|MTK8382|MW1031|MW0831|MW0821|MW0931|MW0712", "MpmanTablet": "MP11 OCTA|MP10 OCTA|MPQC1114|MPQC1004|MPQC994|MPQC974|MPQC973|MPQC804|MPQC784|MPQC780|\\bMPG7\\b|MPDCG75|MPDCG71|MPDC1006|MP101DC|MPDC9000|MPDC905|MPDC706HD|MPDC706|MPDC705|MPDC110|MPDC100|MPDC99|MPDC97|MPDC88|MPDC8|MPDC77|MP709|MID701|MID711|MID170|MPDC703|MPQC1010", "CelkonTablet": "CT695|CT888|CT[\\s]?910|CT7 Tab|CT9 Tab|CT3 Tab|CT2 Tab|CT1 Tab|C820|C720|\\bCT-1\\b", "WolderTablet": "miTab \\b(DIAMOND|SPACE|BROOKLYN|NEO|FLY|MANHATTAN|FUNK|EVOLUTION|SKY|GOCAR|IRON|GENIUS|POP|MINT|EPSILON|BROADWAY|JUMP|HOP|LEGEND|NEW AGE|LINE|ADVANCE|FEEL|FOLLOW|LIKE|LINK|LIVE|THINK|FREEDOM|CHICAGO|CLEVELAND|BALTIMORE-GH|IOWA|BOSTON|SEATTLE|PHOENIX|DALLAS|IN 101|MasterChef)\\b", "MiTablet": "\\bMI PAD\\b|\\bHM NOTE 1W\\b", "NibiruTablet": "Nibiru M1|Nibiru Jupiter One", "NexoTablet": "NEXO NOVA|NEXO 10|NEXO AVIO|NEXO FREE|NEXO GO|NEXO EVO|NEXO 3G|NEXO SMART|NEXO KIDDO|NEXO MOBI", "LeaderTablet": "TBLT10Q|TBLT10I|TBL-10WDKB|TBL-10WDKBO2013|TBL-W230V2|TBL-W450|TBL-W500|SV572|TBLT7I|TBA-AC7-8G|TBLT79|TBL-8W16|TBL-10W32|TBL-10WKB|TBL-W100", "UbislateTablet": "UbiSlate[\\s]?7C", "PocketBookTablet": "Pocketbook", "KocasoTablet": "\\b(TB-1207)\\b", "Hudl": "Hudl HT7S3|Hudl 2", "TelstraTablet": "T-Hub2", "GenericTablet": "Android.*\\b97D\\b|Tablet(?!.*PC)|BNTV250A|MID-WCDMA|LogicPD Zoom2|\\bA7EB\\b|CatNova8|A1_07|CT704|CT1002|\\bM721\\b|rk30sdk|\\bEVOTAB\\b|M758A|ET904|ALUMIUM10|Smartfren Tab|Endeavour 1010|Tablet-PC-4|Tagi Tab|\\bM6pro\\b|CT1020W|arc 10HD|\\bJolla\\b|\\bTP750\\b" }, "oss": { "androids": "Android", "BlackBerryOS": "blackberry|\\bBB10\\b|rim tablet os", "PalmOS": "PalmOS|avantgo|blazer|elaine|hiptop|palm|plucker|xiino", "SymbianOS": "Symbian|symbols|Series60|Series40|SYB-[0-9]+|\\bS60\\b", "WindowsMobileOS": "Windows CE.*(PPC|Smartphone|Mobile|[0-9]{3}x[0-9]{3})|Window Mobile|Windows Phone [0-9.]+|WCE;", "WindowsPhoneOS": "Windows Phone 10.0|Windows Phone 8.1|Windows Phone 8.0|Windows Phone OS|XBLWP7|ZuneWP7|Windows NT 6.[23]; ARM;", "iOS": "\\biPhone.*Mobile|\\biPod|\\biPad", "MeeGoOS": "MeeGo", "MaemoOS": "Maemo", "JavaOS": "J2ME\/|\\bMIDP\\b|\\bCLDC\\b", "webOS": "webOS|hpwOS", "badaOS": "\\bBada\\b", "BREWOS": "BREW" }, "uas": { "Vivaldi": "Vivaldi", "Chrome": "\\bCrMo\\b|CriOS|Android.*Chrome\/[.0-9]* (Mobile)?", "Dolfin": "\\bDolfin\\b", "Opera": "Opera.*Mini|Opera.*Mobi|Android.*Opera|Mobile.*OPR\/[0-9.]+|Coast\/[0-9.]+", "Skyfire": "Skyfire", "Edge": "Mobile Safari\/[.0-9]* Edge", "IE": "IEMobile|MSIEMobile", "Firefox": "fennec|firefox.*maemo|(Mobile|Tablet).*Firefox|Firefox.*Mobile", "Bolt": "bolt", "TeaShark": "teashark", "Blazer": "Blazer", "Safari": "Version.*Mobile.*Safari|Safari.*Mobile|MobileSafari", "Tizen": "Tizen", "UCBrowser": "UC.*Browser|UCWEB", "baiduboxapp": "baiduboxapp", "baidubrowser": "baidubrowser", "DiigoBrowser": "DiigoBrowser", "Puffin": "Puffin", "Mercury": "\\bMercury\\b", "ObigoBrowser": "Obigo", "NetFront": "NF-Browser", "GenericBrowser": "NokiaBrowser|OviBrowser|OneBrowser|TwonkyBeamBrowser|SEMC.*Browser|FlyFlow|Minimo|NetFront|Novarra-Vision|MQQBrowser|MicroMessenger", "PaleMoon": "Android.*PaleMoon|Mobile.*PaleMoon" }, "props": { "Mobile": "Mobile\/[VER]", "Build": "Build\/[VER]", "Version": "Version\/[VER]", "VendorID": "VendorID\/[VER]", "iPad": "iPad.*CPU[a-z ]+[VER]", "iPhone": "iPhone.*CPU[a-z ]+[VER]", "iPod": "iPod.*CPU[a-z ]+[VER]", "Kindle": "Kindle\/[VER]", "Chrome": [ "Chrome\/[VER]", "CriOS\/[VER]", "CrMo\/[VER]" ], "Coast": [ "Coast\/[VER]" ], "Dolfin": "Dolfin\/[VER]", "Firefox": "Firefox\/[VER]", "Fennec": "Fennec\/[VER]", "Edge": "Edge\/[VER]", "IE": [ "IEMobile\/[VER];", "IEMobile [VER]", "MSIE [VER];", "Trident\/[0-9.]+;.*rv:[VER]" ], "NetFront": "NetFront\/[VER]", "NokiaBrowser": "NokiaBrowser\/[VER]", "Opera": [ " OPR\/[VER]", "Opera Mini\/[VER]", "Version\/[VER]" ], "Opera Mini": "Opera Mini\/[VER]", "Opera Mobi": "Version\/[VER]", "UC Browser": "UC Browser[VER]", "MQQBrowser": "MQQBrowser\/[VER]", "MicroMessenger": "MicroMessenger\/[VER]", "baiduboxapp": "baiduboxapp\/[VER]", "baidubrowser": "baidubrowser\/[VER]", "Iron": "Iron\/[VER]", "Safari": [ "Version\/[VER]", "Safari\/[VER]" ], "Skyfire": "Skyfire\/[VER]", "Tizen": "Tizen\/[VER]", "Webkit": "webkit[ \/][VER]", "PaleMoon": "PaleMoon\/[VER]", "Gecko": "Gecko\/[VER]", "Trident": "Trident\/[VER]", "Presto": "Presto\/[VER]", "Goanna": "Goanna\/[VER]", "iOS": " \\bi?OS\\b [VER][ ;]{1}", "Android": "Android [VER]", "BlackBerry": [ "BlackBerry[\\w]+\/[VER]", "BlackBerry.*Version\/[VER]", "Version\/[VER]" ], "BREW": "BREW [VER]", "Java": "Java\/[VER]", "Windows Phone OS": [ "Windows Phone OS [VER]", "Windows Phone [VER]" ], "Windows Phone": "Windows Phone [VER]", "Windows CE": "Windows CE\/[VER]", "Windows NT": "Windows NT [VER]", "Symbian": [ "SymbianOS\/[VER]", "Symbian\/[VER]" ], "webOS": [ "webOS\/[VER]", "hpwOS\/[VER];" ] }, "utils": { "Bot": "Googlebot|facebookexternalhit|AdsBot-Google|Google Keyword Suggestion|Facebot|YandexBot|bingbot|ia_archiver|AhrefsBot|Ezooms|GSLFbot|WBSearchBot|Twitterbot|TweetmemeBot|Twikle|PaperLiBot|Wotbox|UnwindFetchor|Exabot|MJ12bot|YandexImages|TurnitinBot|Pingdom", "MobileBot": "Googlebot-Mobile|AdsBot-Google-Mobile|YahooSeeker\/M1A1-R2D2", "DesktopMode": "WPDesktop", "TV": "SonyDTV|HbbTV", "WebKit": "(webkit)[ \/]([\\w.]+)", "Console": "\\b(Nintendo|Nintendo WiiU|Nintendo 3DS|PLAYSTATION|Xbox)\\b", "Watch": "SM-V700" }}; // following patterns come from http://detectmobilebrowsers.com/ impl.detectMobileBrowsers = { fullPattern: /(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino/i, shortPattern: /1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i, tabletPattern: /android|ipad|playbook|silk/i }; var hasOwnProp = Object.prototype.hasOwnProperty, isArray; impl.FALLBACK_PHONE = 'UnknownPhone'; impl.FALLBACK_TABLET = 'UnknownTablet'; impl.FALLBACK_MOBILE = 'UnknownMobile'; isArray = ('isArray' in Array) ? Array.isArray : function (value) { return Object.prototype.toString.call(value) === '[object Array]'; }; isArray = 'isArray' in Array ? function (value) { return Object.prototype.toString.call(value) === '[object Array]'; } : Array.isArray; function equalIC(a, b) { return a != null && b != null && a.toLowerCase() === b.toLowerCase(); } function containsIC(array, value) { var valueLC, i, len = array.length; if (!len || !value) { return false; } valueLC = value.toLowerCase(); for (i = 0; i < len; ++i) { if (valueLC === array[i].toLowerCase()) { return true; } } return false; } function convertPropsToRegExp(object) { for (var key in object) { if (hasOwnProp.call(object, key)) { object[key] = new RegExp(object[key], 'i'); } } } (function init() { var key, values, value, i, len, verPos, mobileDetectRules = impl.mobileDetectRules; for (key in mobileDetectRules.props) { if (hasOwnProp.call(mobileDetectRules.props, key)) { values = mobileDetectRules.props[key]; if (!isArray(values)) { values = [values]; } len = values.length; for (i = 0; i < len; ++i) { value = values[i]; verPos = value.indexOf('[VER]'); if (verPos >= 0) { value = value.substring(0, verPos) + '([\\w._\\+]+)' + value.substring(verPos + 5); } values[i] = new RegExp(value, 'i'); } mobileDetectRules.props[key] = values; } } convertPropsToRegExp(mobileDetectRules.oss); convertPropsToRegExp(mobileDetectRules.phones); convertPropsToRegExp(mobileDetectRules.tablets); convertPropsToRegExp(mobileDetectRules.uas); convertPropsToRegExp(mobileDetectRules.utils); // copy some patterns to oss0 which are tested first (see issue#15) mobileDetectRules.oss0 = { WindowsPhoneOS: mobileDetectRules.oss.WindowsPhoneOS, WindowsMobileOS: mobileDetectRules.oss.WindowsMobileOS }; }()); /** * Test userAgent string against a set of rules and find the first matched key. * @param {Object} rules (key is String, value is RegExp) * @param {String} userAgent the navigator.userAgent (or HTTP-Header 'User-Agent'). * @returns {String|null} the matched key if found, otherwise null * @private */ impl.findMatch = function(rules, userAgent) { for (var key in rules) { if (hasOwnProp.call(rules, key)) { if (rules[key].test(userAgent)) { return key; } } } return null; }; /** * Test userAgent string against a set of rules and return an array of matched keys. * @param {Object} rules (key is String, value is RegExp) * @param {String} userAgent the navigator.userAgent (or HTTP-Header 'User-Agent'). * @returns {Array} an array of matched keys, may be empty when there is no match, but not null * @private */ impl.findMatches = function(rules, userAgent) { var result = []; for (var key in rules) { if (hasOwnProp.call(rules, key)) { if (rules[key].test(userAgent)) { result.push(key); } } } return result; }; /** * Check the version of the given property in the User-Agent. * * @param {String} propertyName * @param {String} userAgent * @return {String} version or null if version not found * @private */ impl.getVersionStr = function (propertyName, userAgent) { var props = impl.mobileDetectRules.props, patterns, i, len, match; if (hasOwnProp.call(props, propertyName)) { patterns = props[propertyName]; len = patterns.length; for (i = 0; i < len; ++i) { match = patterns[i].exec(userAgent); if (match !== null) { return match[1]; } } } return null; }; /** * Check the version of the given property in the User-Agent. * Will return a float number. (eg. 2_0 will return 2.0, 4.3.1 will return 4.31) * * @param {String} propertyName * @param {String} userAgent * @return {Number} version or NaN if version not found * @private */ impl.getVersion = function (propertyName, userAgent) { var version = impl.getVersionStr(propertyName, userAgent); return version ? impl.prepareVersionNo(version) : NaN; }; /** * Prepare the version number. * * @param {String} version * @return {Number} the version number as a floating number * @private */ impl.prepareVersionNo = function (version) { var numbers; numbers = version.split(/[a-z._ \/\-]/i); if (numbers.length === 1) { version = numbers[0]; } if (numbers.length > 1) { version = numbers[0] + '.'; numbers.shift(); version += numbers.join(''); } return Number(version); }; impl.isMobileFallback = function (userAgent) { return impl.detectMobileBrowsers.fullPattern.test(userAgent) || impl.detectMobileBrowsers.shortPattern.test(userAgent.substr(0,4)); }; impl.isTabletFallback = function (userAgent) { return impl.detectMobileBrowsers.tabletPattern.test(userAgent); }; impl.prepareDetectionCache = function (cache, userAgent, maxPhoneWidth) { if (cache.mobile !== undefined) { return; } var phone, tablet, phoneSized; // first check for stronger tablet rules, then phone (see issue#5) tablet = impl.findMatch(impl.mobileDetectRules.tablets, userAgent); if (tablet) { cache.mobile = cache.tablet = tablet; cache.phone = null; return; // unambiguously identified as tablet } phone = impl.findMatch(impl.mobileDetectRules.phones, userAgent); if (phone) { cache.mobile = cache.phone = phone; cache.tablet = null; return; // unambiguously identified as phone } // our rules haven't found a match -> try more general fallback rules if (impl.isMobileFallback(userAgent)) { phoneSized = MobileDetect.isPhoneSized(maxPhoneWidth); if (phoneSized === undefined) { cache.mobile = impl.FALLBACK_MOBILE; cache.tablet = cache.phone = null; } else if (phoneSized) { cache.mobile = cache.phone = impl.FALLBACK_PHONE; cache.tablet = null; } else { cache.mobile = cache.tablet = impl.FALLBACK_TABLET; cache.phone = null; } } else if (impl.isTabletFallback(userAgent)) { cache.mobile = cache.tablet = impl.FALLBACK_TABLET; cache.phone = null; } else { // not mobile at all! cache.mobile = cache.tablet = cache.phone = null; } }; // t is a reference to a MobileDetect instance impl.mobileGrade = function (t) { // impl note: // To keep in sync w/ Mobile_Detect.php easily, the following code is tightly aligned to the PHP version. // When changes are made in Mobile_Detect.php, copy this method and replace: // $this-> / t. // self::MOBILE_GRADE_(.) / '$1' // , self::VERSION_TYPE_FLOAT / (nothing) // isIOS() / os('iOS') // [reg] / (nothing) <-- jsdelivr complaining about unescaped unicode character U+00AE var $isMobile = t.mobile() !== null; if ( // Apple iOS 3.2-5.1 - Tested on the original iPad (4.3 / 5.0), iPad 2 (4.3), iPad 3 (5.1), original iPhone (3.1), iPhone 3 (3.2), 3GS (4.3), 4 (4.3 / 5.0), and 4S (5.1) t.os('iOS') && t.version('iPad')>=4.3 || t.os('iOS') && t.version('iPhone')>=3.1 || t.os('iOS') && t.version('iPod')>=3.1 || // Android 2.1-2.3 - Tested on the HTC Incredible (2.2), original Droid (2.2), HTC Aria (2.1), Google Nexus S (2.3). Functional on 1.5 & 1.6 but performance may be sluggish, tested on Google G1 (1.5) // Android 3.1 (Honeycomb) - Tested on the Samsung Galaxy Tab 10.1 and Motorola XOOM // Android 4.0 (ICS) - Tested on a Galaxy Nexus. Note: transition performance can be poor on upgraded devices // Android 4.1 (Jelly Bean) - Tested on a Galaxy Nexus and Galaxy 7 ( t.version('Android')>2.1 && t.is('Webkit') ) || // Windows Phone 7-7.5 - Tested on the HTC Surround (7.0) HTC Trophy (7.5), LG-E900 (7.5), Nokia Lumia 800 t.version('Windows Phone OS')>=7.0 || // Blackberry 7 - Tested on BlackBerry Torch 9810 // Blackberry 6.0 - Tested on the Torch 9800 and Style 9670 t.is('BlackBerry') && t.version('BlackBerry')>=6.0 || // Blackberry Playbook (1.0-2.0) - Tested on PlayBook t.match('Playbook.*Tablet') || // Palm WebOS (1.4-2.0) - Tested on the Palm Pixi (1.4), Pre (1.4), Pre 2 (2.0) ( t.version('webOS')>=1.4 && t.match('Palm|Pre|Pixi') ) || // Palm WebOS 3.0 - Tested on HP TouchPad t.match('hp.*TouchPad') || // Firefox Mobile (12 Beta) - Tested on Android 2.3 device ( t.is('Firefox') && t.version('Firefox')>=12 ) || // Chrome for Android - Tested on Android 4.0, 4.1 device ( t.is('Chrome') && t.is('androids') && t.version('Android')>=4.0 ) || // Skyfire 4.1 - Tested on Android 2.3 device ( t.is('Skyfire') && t.version('Skyfire')>=4.1 && t.is('androids') && t.version('Android')>=2.3 ) || // Opera Mobile 11.5-12: Tested on Android 2.3 ( t.is('Opera') && t.version('Opera Mobi')>11 && t.is('androids') ) || // Meego 1.2 - Tested on Nokia 950 and N9 t.is('MeeGoOS') || // Tizen (pre-release) - Tested on early hardware t.is('Tizen') || // Samsung Bada 2.0 - Tested on a Samsung Wave 3, Dolphin browser // @todo: more tests here! t.is('Dolfin') && t.version('Bada')>=2.0 || // UC Browser - Tested on Android 2.3 device ( (t.is('UC Browser') || t.is('Dolfin')) && t.version('Android')>=2.3 ) || // Kindle 3 and Fire - Tested on the built-in WebKit browser for each ( t.match('Kindle Fire') || t.is('Kindle') && t.version('Kindle')>=3.0 ) || // Nook Color 1.4.1 - Tested on original Nook Color, not Nook Tablet t.is('androids') && t.is('NookTablet') || // Chrome Desktop 11-21 - Tested on OS X 10.7 and Windows 7 t.version('Chrome')>=11 && !$isMobile || // Safari Desktop 4-5 - Tested on OS X 10.7 and Windows 7 t.version('Safari')>=5.0 && !$isMobile || // Firefox Desktop 4-13 - Tested on OS X 10.7 and Windows 7 t.version('Firefox')>=4.0 && !$isMobile || // Internet Explorer 7-9 - Tested on Windows XP, Vista and 7 t.version('MSIE')>=7.0 && !$isMobile || // Opera Desktop 10-12 - Tested on OS X 10.7 and Windows 7 // @reference: http://my.opera.com/community/openweb/idopera/ t.version('Opera')>=10 && !$isMobile ){ return 'A'; } if ( t.os('iOS') && t.version('iPad')<4.3 || t.os('iOS') && t.version('iPhone')<3.1 || t.os('iOS') && t.version('iPod')<3.1 || // Blackberry 5.0: Tested on the Storm 2 9550, Bold 9770 t.is('Blackberry') && t.version('BlackBerry')>=5 && t.version('BlackBerry')<6 || //Opera Mini (5.0-6.5) - Tested on iOS 3.2/4.3 and Android 2.3 ( t.version('Opera Mini')>=5.0 && t.version('Opera Mini')<=6.5 && (t.version('Android')>=2.3 || t.is('iOS')) ) || // Nokia Symbian^3 - Tested on Nokia N8 (Symbian^3), C7 (Symbian^3), also works on N97 (Symbian^1) t.match('NokiaN8|NokiaC7|N97.*Series60|Symbian/3') || // @todo: report this (tested on Nokia N71) t.version('Opera Mobi')>=11 && t.is('SymbianOS') ){ return 'B'; } if ( // Blackberry 4.x - Tested on the Curve 8330 t.version('BlackBerry')<5.0 || // Windows Mobile - Tested on the HTC Leo (WinMo 5.2) t.match('MSIEMobile|Windows CE.*Mobile') || t.version('Windows Mobile')<=5.2 ){ return 'C'; } //All older smartphone platforms and featurephones - Any device that doesn't support media queries //will receive the basic, C grade experience. return 'C'; }; impl.detectOS = function (ua) { return impl.findMatch(impl.mobileDetectRules.oss0, ua) || impl.findMatch(impl.mobileDetectRules.oss, ua); }; impl.getDeviceSmallerSide = function () { return window.screen.width < window.screen.height ? window.screen.width : window.screen.height; }; /** * Constructor for MobileDetect object. *
* Such an object will keep a reference to the given user-agent string and cache most of the detect queries.
*
* Find information how to download and install: * github.com/hgoebl/mobile-detect.js/ *
* * @example 
     *     var md = new MobileDetect(window.navigator.userAgent);     *     if (md.mobile()) {     *         location.href = (md.mobileGrade() === 'A') ? '/mobile/' : '/lynx/';     *     }     *
* * @param {string} userAgent typically taken from window.navigator.userAgent or http_header['User-Agent'] * @param {number} [maxPhoneWidth=600] only for browsers specify a value for the maximum * width of smallest device side (in logical "CSS" pixels) until a device detected as mobile will be handled * as phone. * This is only used in cases where the device cannot be classified as phone or tablet.
* See Declaring Tablet Layouts * for Android.
* If you provide a value < 0, then this "fuzzy" check is disabled. * @constructor * @global */ function MobileDetect(userAgent, maxPhoneWidth) { this.ua = userAgent || ''; this._cache = {}; //600dp is typical 7" tablet minimum width this.maxPhoneWidth = maxPhoneWidth || 600; } MobileDetect.prototype = { constructor: MobileDetect, /** * Returns the detected phone or tablet type or null if it is not a mobile device. *
* For a list of possible return values see {@link MobileDetect#phone} and {@link MobileDetect#tablet}.
*
* If the device is not detected by the regular expressions from Mobile-Detect, a test is made against * the patterns of detectmobilebrowsers.com. If this test * is positive, a value of UnknownPhone, UnknownTablet or * UnknownMobile is returned.
* When used in browser, the decision whether phone or tablet is made based on screen.width/height.
*
* When used server-side (node.js), there is no way to tell the difference between UnknownTablet * and UnknownMobile, so you will get UnknownMobile here.
* Be aware that since v1.0.0 in this special case you will get UnknownMobile only for: * {@link MobileDetect#mobile}, not for {@link MobileDetect#phone} and {@link MobileDetect#tablet}. * In versions before v1.0.0 all 3 methods returned UnknownMobile which was tedious to use. *
* In most cases you will use the return value just as a boolean. * * @returns {String} the key for the phone family or tablet family, e.g. "Nexus". * @function MobileDetect#mobile */ mobile: function () { impl.prepareDetectionCache(this._cache, this.ua, this.maxPhoneWidth); return this._cache.mobile; }, /** * Returns the detected phone type/family string or null. *
* The returned tablet (family or producer) is one of following keys:
*
iPhone, BlackBerry, HTC, Nexus, Dell, Motorola, Samsung, LG, Sony, Asus, * NokiaLumia, Micromax, Palm, Vertu, Pantech, Fly, Wiko, iMobile, SimValley, * Wolfgang, Alcatel, Nintendo, Amoi, INQ, GenericPhone
*
* If the device is not detected by the regular expressions from Mobile-Detect, a test is made against * the patterns of detectmobilebrowsers.com. If this test * is positive, a value of UnknownPhone or UnknownMobile is returned.
* When used in browser, the decision whether phone or tablet is made based on screen.width/height.
*
* When used server-side (node.js), there is no way to tell the difference between UnknownTablet * and UnknownMobile, so you will get null here, while {@link MobileDetect#mobile} * will return UnknownMobile.
* Be aware that since v1.0.0 in this special case you will get UnknownMobile only for: * {@link MobileDetect#mobile}, not for {@link MobileDetect#phone} and {@link MobileDetect#tablet}. * In versions before v1.0.0 all 3 methods returned UnknownMobile which was tedious to use. *
* In most cases you will use the return value just as a boolean. * * @returns {String} the key of the phone family or producer, e.g. "iPhone" * @function MobileDetect#phone */ phone: function () { impl.prepareDetectionCache(this._cache, this.ua, this.maxPhoneWidth); return this._cache.phone; }, /** * Returns the detected tablet type/family string or null. *
* The returned tablet (family or producer) is one of following keys:
*
iPad, NexusTablet, SamsungTablet, Kindle, SurfaceTablet, HPTablet, AsusTablet, * BlackBerryTablet, HTCtablet, MotorolaTablet, NookTablet, AcerTablet, * ToshibaTablet, LGTablet, FujitsuTablet, PrestigioTablet, LenovoTablet, * DellTablet, YarvikTablet, MedionTablet, ArnovaTablet, IntensoTablet, IRUTablet, * MegafonTablet, EbodaTablet, AllViewTablet, ArchosTablet, AinolTablet, * NokiaLumiaTablet, SonyTablet, PhilipsTablet, CubeTablet, CobyTablet, MIDTablet, * MSITablet, SMiTTablet, RockChipTablet, FlyTablet, bqTablet, HuaweiTablet, * NecTablet, PantechTablet, BronchoTablet, VersusTablet, ZyncTablet, * PositivoTablet, NabiTablet, KoboTablet, DanewTablet, TexetTablet, * PlaystationTablet, TrekstorTablet, PyleAudioTablet, AdvanTablet, * DanyTechTablet, GalapadTablet, MicromaxTablet, KarbonnTablet, AllFineTablet, * PROSCANTablet, YONESTablet, ChangJiaTablet, GUTablet, PointOfViewTablet, * OvermaxTablet, HCLTablet, DPSTablet, VistureTablet, CrestaTablet, * MediatekTablet, ConcordeTablet, GoCleverTablet, ModecomTablet, VoninoTablet, * ECSTablet, StorexTablet, VodafoneTablet, EssentielBTablet, RossMoorTablet, * iMobileTablet, TolinoTablet, AudioSonicTablet, AMPETablet, SkkTablet, * TecnoTablet, JXDTablet, iJoyTablet, FX2Tablet, XoroTablet, ViewsonicTablet, * OdysTablet, CaptivaTablet, IconbitTablet, TeclastTablet, OndaTablet, * JaytechTablet, BlaupunktTablet, DigmaTablet, EvolioTablet, LavaTablet, * AocTablet, MpmanTablet, CelkonTablet, WolderTablet, MiTablet, NibiruTablet, * NexoTablet, LeaderTablet, UbislateTablet, PocketBookTablet, KocasoTablet, Hudl, * TelstraTablet, GenericTablet
*
* If the device is not detected by the regular expressions from Mobile-Detect, a test is made against * the patterns of detectmobilebrowsers.com. If this test * is positive, a value of UnknownTablet or UnknownMobile is returned.
* When used in browser, the decision whether phone or tablet is made based on screen.width/height.
*
* When used server-side (node.js), there is no way to tell the difference between UnknownTablet * and UnknownMobile, so you will get null here, while {@link MobileDetect#mobile} * will return UnknownMobile.
* Be aware that since v1.0.0 in this special case you will get UnknownMobile only for: * {@link MobileDetect#mobile}, not for {@link MobileDetect#phone} and {@link MobileDetect#tablet}. * In versions before v1.0.0 all 3 methods returned UnknownMobile which was tedious to use. *
* In most cases you will use the return value just as a boolean. * * @returns {String} the key of the tablet family or producer, e.g. "SamsungTablet" * @function MobileDetect#tablet */ tablet: function () { impl.prepareDetectionCache(this._cache, this.ua, this.maxPhoneWidth); return this._cache.tablet; }, /** * Returns the (first) detected user-agent string or null. *
* The returned user-agent is one of following keys:
*
Vivaldi, Chrome, Dolfin, Opera, Skyfire, Edge, IE, Firefox, Bolt, TeaShark, * Blazer, Safari, Tizen, UCBrowser, baiduboxapp, baidubrowser, DiigoBrowser, * Puffin, Mercury, ObigoBrowser, NetFront, GenericBrowser, PaleMoon
*
* In most cases calling {@link MobileDetect#userAgent} will be sufficient. But there are rare * cases where a mobile device pretends to be more than one particular browser. You can get the * list of all matches with {@link MobileDetect#userAgents} or check for a particular value by * providing one of the defined keys as first argument to {@link MobileDetect#is}. * * @returns {String} the key for the detected user-agent or null * @function MobileDetect#userAgent */ userAgent: function () { if (this._cache.userAgent === undefined) { this._cache.userAgent = impl.findMatch(impl.mobileDetectRules.uas, this.ua); } return this._cache.userAgent; }, /** * Returns all detected user-agent strings. *
* The array is empty or contains one or more of following keys:
*
Vivaldi, Chrome, Dolfin, Opera, Skyfire, Edge, IE, Firefox, Bolt, TeaShark, * Blazer, Safari, Tizen, UCBrowser, baiduboxapp, baidubrowser, DiigoBrowser, * Puffin, Mercury, ObigoBrowser, NetFront, GenericBrowser, PaleMoon
*
* In most cases calling {@link MobileDetect#userAgent} will be sufficient. But there are rare * cases where a mobile device pretends to be more than one particular browser. You can get the * list of all matches with {@link MobileDetect#userAgents} or check for a particular value by * providing one of the defined keys as first argument to {@link MobileDetect#is}. * * @returns {Array} the array of detected user-agent keys or [] * @function MobileDetect#userAgents */ userAgents: function () { if (this._cache.userAgents === undefined) { this._cache.userAgents = impl.findMatches(impl.mobileDetectRules.uas, this.ua); } return this._cache.userAgents; }, /** * Returns the detected operating system string or null. *
* The operating system is one of following keys:
*
androids, BlackBerryOS, PalmOS, SymbianOS, WindowsMobileOS, WindowsPhoneOS, * iOS, MeeGoOS, MaemoOS, JavaOS, webOS, badaOS, BREWOS
* * @returns {String} the key for the detected operating system. * @function MobileDetect#os */ os: function () { if (this._cache.os === undefined) { this._cache.os = impl.detectOS(this.ua); } return this._cache.os; }, /** * Get the version (as Number) of the given property in the User-Agent. *
* Will return a float number. (eg. 2_0 will return 2.0, 4.3.1 will return 4.31) * * @param {String} key a key defining a thing which has a version.
* You can use one of following keys:
*
Mobile, Build, Version, VendorID, iPad, iPhone, iPod, Kindle, Chrome, Coast, * Dolfin, Firefox, Fennec, Edge, IE, NetFront, NokiaBrowser, Opera, Opera Mini, * Opera Mobi, UC Browser, MQQBrowser, MicroMessenger, baiduboxapp, baidubrowser, * Iron, Safari, Skyfire, Tizen, Webkit, PaleMoon, Gecko, Trident, Presto, Goanna, * iOS, Android, BlackBerry, BREW, Java, Windows Phone OS, Windows Phone, Windows * CE, Windows NT, Symbian, webOS
* * @returns {Number} the version as float or NaN if User-Agent doesn't contain this version. * Be careful when comparing this value with '==' operator! * @function MobileDetect#version */ version: function (key) { return impl.getVersion(key, this.ua); }, /** * Get the version (as String) of the given property in the User-Agent. *
* * @param {String} key a key defining a thing which has a version.
* You can use one of following keys:
*
Mobile, Build, Version, VendorID, iPad, iPhone, iPod, Kindle, Chrome, Coast, * Dolfin, Firefox, Fennec, Edge, IE, NetFront, NokiaBrowser, Opera, Opera Mini, * Opera Mobi, UC Browser, MQQBrowser, MicroMessenger, baiduboxapp, baidubrowser, * Iron, Safari, Skyfire, Tizen, Webkit, PaleMoon, Gecko, Trident, Presto, Goanna, * iOS, Android, BlackBerry, BREW, Java, Windows Phone OS, Windows Phone, Windows * CE, Windows NT, Symbian, webOS
* * @returns {String} the "raw" version as String or null if User-Agent doesn't contain this version. * * @function MobileDetect#versionStr */ versionStr: function (key) { return impl.getVersionStr(key, this.ua); }, /** * Global test key against userAgent, os, phone, tablet and some other properties of userAgent string. * * @param {String} key the key (case-insensitive) of a userAgent, an operating system, phone or * tablet family.
* For a complete list of possible values, see {@link MobileDetect#userAgent}, * {@link MobileDetect#os}, {@link MobileDetect#phone}, {@link MobileDetect#tablet}.
* Additionally you have following keys:
*
Bot, MobileBot, DesktopMode, TV, WebKit, Console, Watch
* * @returns {boolean} true when the given key is one of the defined keys of userAgent, os, phone, * tablet or one of the listed additional keys, otherwise false * @function MobileDetect#is */ is: function (key) { return containsIC(this.userAgents(), key) || equalIC(key, this.os()) || equalIC(key, this.phone()) || equalIC(key, this.tablet()) || containsIC(impl.findMatches(impl.mobileDetectRules.utils, this.ua), key); }, /** * Do a quick test against navigator::userAgent. * * @param {String|RegExp} pattern the pattern, either as String or RegExp * (a string will be converted to a case-insensitive RegExp). * @returns {boolean} true when the pattern matches, otherwise false * @function MobileDetect#match */ match: function (pattern) { if (!(pattern instanceof RegExp)) { pattern = new RegExp(pattern, 'i'); } return pattern.test(this.ua); }, /** * Checks whether the mobile device can be considered as phone regarding screen.width. *
* Obviously this method makes sense in browser environments only (not for Node.js)! * @param {number} [maxPhoneWidth] the maximum logical pixels (aka. CSS-pixels) to be considered as phone.
* The argument is optional and if not present or falsy, the value of the constructor is taken. * @returns {boolean|undefined} undefined if screen size wasn't detectable, else true * when screen.width is less or equal to maxPhoneWidth, otherwise false.
* Will always return undefined server-side. */ isPhoneSized: function (maxPhoneWidth) { return MobileDetect.isPhoneSized(maxPhoneWidth || this.maxPhoneWidth); }, /** * Returns the mobile grade ('A', 'B', 'C'). * * @returns {String} one of the mobile grades ('A', 'B', 'C'). * @function MobileDetect#mobileGrade */ mobileGrade: function () { if (this._cache.grade === undefined) { this._cache.grade = impl.mobileGrade(this); } return this._cache.grade; } }; // environment-dependent if (typeof window !== 'undefined' && window.screen) { MobileDetect.isPhoneSized = function (maxPhoneWidth) { return maxPhoneWidth < 0 ? undefined : impl.getDeviceSmallerSide() <= maxPhoneWidth; }; } else { MobileDetect.isPhoneSized = function () {}; } // should not be replaced by a completely new object - just overwrite existing methods MobileDetect._impl = impl; MobileDetect.version = '1.3.3 2016-07-31'; return MobileDetect;}); // end of call of define()})((function (undefined) { if (typeof module !== 'undefined' && module.exports) { return function (factory) { module.exports = factory(); }; } else if (typeof define === 'function' && define.amd) { return define; } else if (typeof window !== 'undefined') { return function (factory) { window.MobileDetect = factory(); }; } else { // please file a bug if you get this error! throw new Error('unknown environment'); }})()) : void > : ^^^^ ->(function (define, undefined) {define(function () { 'use strict'; var impl = {}; impl.mobileDetectRules = { "phones": { "iPhone": "\\biPhone\\b|\\biPod\\b", "BlackBerry": "BlackBerry|\\bBB10\\b|rim[0-9]+", "HTC": "HTC|HTC.*(Sensation|Evo|Vision|Explorer|6800|8100|8900|A7272|S510e|C110e|Legend|Desire|T8282)|APX515CKT|Qtek9090|APA9292KT|HD_mini|Sensation.*Z710e|PG86100|Z715e|Desire.*(A8181|HD)|ADR6200|ADR6400L|ADR6425|001HT|Inspire 4G|Android.*\\bEVO\\b|T-Mobile G1|Z520m", "Nexus": "Nexus One|Nexus S|Galaxy.*Nexus|Android.*Nexus.*Mobile|Nexus 4|Nexus 5|Nexus 6", "Dell": "Dell.*Streak|Dell.*Aero|Dell.*Venue|DELL.*Venue Pro|Dell Flash|Dell Smoke|Dell Mini 3iX|XCD28|XCD35|\\b001DL\\b|\\b101DL\\b|\\bGS01\\b", "Motorola": "Motorola|DROIDX|DROID BIONIC|\\bDroid\\b.*Build|Android.*Xoom|HRI39|MOT-|A1260|A1680|A555|A853|A855|A953|A955|A956|Motorola.*ELECTRIFY|Motorola.*i1|i867|i940|MB200|MB300|MB501|MB502|MB508|MB511|MB520|MB525|MB526|MB611|MB612|MB632|MB810|MB855|MB860|MB861|MB865|MB870|ME501|ME502|ME511|ME525|ME600|ME632|ME722|ME811|ME860|ME863|ME865|MT620|MT710|MT716|MT720|MT810|MT870|MT917|Motorola.*TITANIUM|WX435|WX445|XT300|XT301|XT311|XT316|XT317|XT319|XT320|XT390|XT502|XT530|XT531|XT532|XT535|XT603|XT610|XT611|XT615|XT681|XT701|XT702|XT711|XT720|XT800|XT806|XT860|XT862|XT875|XT882|XT883|XT894|XT901|XT907|XT909|XT910|XT912|XT928|XT926|XT915|XT919|XT925|XT1021|\\bMoto E\\b", "Samsung": "Samsung|SM-G9250|GT-19300|SGH-I337|BGT-S5230|GT-B2100|GT-B2700|GT-B2710|GT-B3210|GT-B3310|GT-B3410|GT-B3730|GT-B3740|GT-B5510|GT-B5512|GT-B5722|GT-B6520|GT-B7300|GT-B7320|GT-B7330|GT-B7350|GT-B7510|GT-B7722|GT-B7800|GT-C3010|GT-C3011|GT-C3060|GT-C3200|GT-C3212|GT-C3212I|GT-C3262|GT-C3222|GT-C3300|GT-C3300K|GT-C3303|GT-C3303K|GT-C3310|GT-C3322|GT-C3330|GT-C3350|GT-C3500|GT-C3510|GT-C3530|GT-C3630|GT-C3780|GT-C5010|GT-C5212|GT-C6620|GT-C6625|GT-C6712|GT-E1050|GT-E1070|GT-E1075|GT-E1080|GT-E1081|GT-E1085|GT-E1087|GT-E1100|GT-E1107|GT-E1110|GT-E1120|GT-E1125|GT-E1130|GT-E1160|GT-E1170|GT-E1175|GT-E1180|GT-E1182|GT-E1200|GT-E1210|GT-E1225|GT-E1230|GT-E1390|GT-E2100|GT-E2120|GT-E2121|GT-E2152|GT-E2220|GT-E2222|GT-E2230|GT-E2232|GT-E2250|GT-E2370|GT-E2550|GT-E2652|GT-E3210|GT-E3213|GT-I5500|GT-I5503|GT-I5700|GT-I5800|GT-I5801|GT-I6410|GT-I6420|GT-I7110|GT-I7410|GT-I7500|GT-I8000|GT-I8150|GT-I8160|GT-I8190|GT-I8320|GT-I8330|GT-I8350|GT-I8530|GT-I8700|GT-I8703|GT-I8910|GT-I9000|GT-I9001|GT-I9003|GT-I9010|GT-I9020|GT-I9023|GT-I9070|GT-I9082|GT-I9100|GT-I9103|GT-I9220|GT-I9250|GT-I9300|GT-I9305|GT-I9500|GT-I9505|GT-M3510|GT-M5650|GT-M7500|GT-M7600|GT-M7603|GT-M8800|GT-M8910|GT-N7000|GT-S3110|GT-S3310|GT-S3350|GT-S3353|GT-S3370|GT-S3650|GT-S3653|GT-S3770|GT-S3850|GT-S5210|GT-S5220|GT-S5229|GT-S5230|GT-S5233|GT-S5250|GT-S5253|GT-S5260|GT-S5263|GT-S5270|GT-S5300|GT-S5330|GT-S5350|GT-S5360|GT-S5363|GT-S5369|GT-S5380|GT-S5380D|GT-S5560|GT-S5570|GT-S5600|GT-S5603|GT-S5610|GT-S5620|GT-S5660|GT-S5670|GT-S5690|GT-S5750|GT-S5780|GT-S5830|GT-S5839|GT-S6102|GT-S6500|GT-S7070|GT-S7200|GT-S7220|GT-S7230|GT-S7233|GT-S7250|GT-S7500|GT-S7530|GT-S7550|GT-S7562|GT-S7710|GT-S8000|GT-S8003|GT-S8500|GT-S8530|GT-S8600|SCH-A310|SCH-A530|SCH-A570|SCH-A610|SCH-A630|SCH-A650|SCH-A790|SCH-A795|SCH-A850|SCH-A870|SCH-A890|SCH-A930|SCH-A950|SCH-A970|SCH-A990|SCH-I100|SCH-I110|SCH-I400|SCH-I405|SCH-I500|SCH-I510|SCH-I515|SCH-I600|SCH-I730|SCH-I760|SCH-I770|SCH-I830|SCH-I910|SCH-I920|SCH-I959|SCH-LC11|SCH-N150|SCH-N300|SCH-R100|SCH-R300|SCH-R351|SCH-R400|SCH-R410|SCH-T300|SCH-U310|SCH-U320|SCH-U350|SCH-U360|SCH-U365|SCH-U370|SCH-U380|SCH-U410|SCH-U430|SCH-U450|SCH-U460|SCH-U470|SCH-U490|SCH-U540|SCH-U550|SCH-U620|SCH-U640|SCH-U650|SCH-U660|SCH-U700|SCH-U740|SCH-U750|SCH-U810|SCH-U820|SCH-U900|SCH-U940|SCH-U960|SCS-26UC|SGH-A107|SGH-A117|SGH-A127|SGH-A137|SGH-A157|SGH-A167|SGH-A177|SGH-A187|SGH-A197|SGH-A227|SGH-A237|SGH-A257|SGH-A437|SGH-A517|SGH-A597|SGH-A637|SGH-A657|SGH-A667|SGH-A687|SGH-A697|SGH-A707|SGH-A717|SGH-A727|SGH-A737|SGH-A747|SGH-A767|SGH-A777|SGH-A797|SGH-A817|SGH-A827|SGH-A837|SGH-A847|SGH-A867|SGH-A877|SGH-A887|SGH-A897|SGH-A927|SGH-B100|SGH-B130|SGH-B200|SGH-B220|SGH-C100|SGH-C110|SGH-C120|SGH-C130|SGH-C140|SGH-C160|SGH-C170|SGH-C180|SGH-C200|SGH-C207|SGH-C210|SGH-C225|SGH-C230|SGH-C417|SGH-C450|SGH-D307|SGH-D347|SGH-D357|SGH-D407|SGH-D415|SGH-D780|SGH-D807|SGH-D980|SGH-E105|SGH-E200|SGH-E315|SGH-E316|SGH-E317|SGH-E335|SGH-E590|SGH-E635|SGH-E715|SGH-E890|SGH-F300|SGH-F480|SGH-I200|SGH-I300|SGH-I320|SGH-I550|SGH-I577|SGH-I600|SGH-I607|SGH-I617|SGH-I627|SGH-I637|SGH-I677|SGH-I700|SGH-I717|SGH-I727|SGH-i747M|SGH-I777|SGH-I780|SGH-I827|SGH-I847|SGH-I857|SGH-I896|SGH-I897|SGH-I900|SGH-I907|SGH-I917|SGH-I927|SGH-I937|SGH-I997|SGH-J150|SGH-J200|SGH-L170|SGH-L700|SGH-M110|SGH-M150|SGH-M200|SGH-N105|SGH-N500|SGH-N600|SGH-N620|SGH-N625|SGH-N700|SGH-N710|SGH-P107|SGH-P207|SGH-P300|SGH-P310|SGH-P520|SGH-P735|SGH-P777|SGH-Q105|SGH-R210|SGH-R220|SGH-R225|SGH-S105|SGH-S307|SGH-T109|SGH-T119|SGH-T139|SGH-T209|SGH-T219|SGH-T229|SGH-T239|SGH-T249|SGH-T259|SGH-T309|SGH-T319|SGH-T329|SGH-T339|SGH-T349|SGH-T359|SGH-T369|SGH-T379|SGH-T409|SGH-T429|SGH-T439|SGH-T459|SGH-T469|SGH-T479|SGH-T499|SGH-T509|SGH-T519|SGH-T539|SGH-T559|SGH-T589|SGH-T609|SGH-T619|SGH-T629|SGH-T639|SGH-T659|SGH-T669|SGH-T679|SGH-T709|SGH-T719|SGH-T729|SGH-T739|SGH-T746|SGH-T749|SGH-T759|SGH-T769|SGH-T809|SGH-T819|SGH-T839|SGH-T919|SGH-T929|SGH-T939|SGH-T959|SGH-T989|SGH-U100|SGH-U200|SGH-U800|SGH-V205|SGH-V206|SGH-X100|SGH-X105|SGH-X120|SGH-X140|SGH-X426|SGH-X427|SGH-X475|SGH-X495|SGH-X497|SGH-X507|SGH-X600|SGH-X610|SGH-X620|SGH-X630|SGH-X700|SGH-X820|SGH-X890|SGH-Z130|SGH-Z150|SGH-Z170|SGH-ZX10|SGH-ZX20|SHW-M110|SPH-A120|SPH-A400|SPH-A420|SPH-A460|SPH-A500|SPH-A560|SPH-A600|SPH-A620|SPH-A660|SPH-A700|SPH-A740|SPH-A760|SPH-A790|SPH-A800|SPH-A820|SPH-A840|SPH-A880|SPH-A900|SPH-A940|SPH-A960|SPH-D600|SPH-D700|SPH-D710|SPH-D720|SPH-I300|SPH-I325|SPH-I330|SPH-I350|SPH-I500|SPH-I600|SPH-I700|SPH-L700|SPH-M100|SPH-M220|SPH-M240|SPH-M300|SPH-M305|SPH-M320|SPH-M330|SPH-M350|SPH-M360|SPH-M370|SPH-M380|SPH-M510|SPH-M540|SPH-M550|SPH-M560|SPH-M570|SPH-M580|SPH-M610|SPH-M620|SPH-M630|SPH-M800|SPH-M810|SPH-M850|SPH-M900|SPH-M910|SPH-M920|SPH-M930|SPH-N100|SPH-N200|SPH-N240|SPH-N300|SPH-N400|SPH-Z400|SWC-E100|SCH-i909|GT-N7100|GT-N7105|SCH-I535|SM-N900A|SGH-I317|SGH-T999L|GT-S5360B|GT-I8262|GT-S6802|GT-S6312|GT-S6310|GT-S5312|GT-S5310|GT-I9105|GT-I8510|GT-S6790N|SM-G7105|SM-N9005|GT-S5301|GT-I9295|GT-I9195|SM-C101|GT-S7392|GT-S7560|GT-B7610|GT-I5510|GT-S7582|GT-S7530E|GT-I8750|SM-G9006V|SM-G9008V|SM-G9009D|SM-G900A|SM-G900D|SM-G900F|SM-G900H|SM-G900I|SM-G900J|SM-G900K|SM-G900L|SM-G900M|SM-G900P|SM-G900R4|SM-G900S|SM-G900T|SM-G900V|SM-G900W8|SHV-E160K|SCH-P709|SCH-P729|SM-T2558|GT-I9205|SM-G9350|SM-J120F", "LG": "\\bLG\\b;|LG[- ]?(C800|C900|E400|E610|E900|E-900|F160|F180K|F180L|F180S|730|855|L160|LS740|LS840|LS970|LU6200|MS690|MS695|MS770|MS840|MS870|MS910|P500|P700|P705|VM696|AS680|AS695|AX840|C729|E970|GS505|272|C395|E739BK|E960|L55C|L75C|LS696|LS860|P769BK|P350|P500|P509|P870|UN272|US730|VS840|VS950|LN272|LN510|LS670|LS855|LW690|MN270|MN510|P509|P769|P930|UN200|UN270|UN510|UN610|US670|US740|US760|UX265|UX840|VN271|VN530|VS660|VS700|VS740|VS750|VS910|VS920|VS930|VX9200|VX11000|AX840A|LW770|P506|P925|P999|E612|D955|D802|MS323)", "Sony": "SonyST|SonyLT|SonyEricsson|SonyEricssonLT15iv|LT18i|E10i|LT28h|LT26w|SonyEricssonMT27i|C5303|C6902|C6903|C6906|C6943|D2533", "Asus": "Asus.*Galaxy|PadFone.*Mobile", "NokiaLumia": "Lumia [0-9]{3,4}", "Micromax": "Micromax.*\\b(A210|A92|A88|A72|A111|A110Q|A115|A116|A110|A90S|A26|A51|A35|A54|A25|A27|A89|A68|A65|A57|A90)\\b", "Palm": "PalmSource|Palm", "Vertu": "Vertu|Vertu.*Ltd|Vertu.*Ascent|Vertu.*Ayxta|Vertu.*Constellation(F|Quest)?|Vertu.*Monika|Vertu.*Signature", "Pantech": "PANTECH|IM-A850S|IM-A840S|IM-A830L|IM-A830K|IM-A830S|IM-A820L|IM-A810K|IM-A810S|IM-A800S|IM-T100K|IM-A725L|IM-A780L|IM-A775C|IM-A770K|IM-A760S|IM-A750K|IM-A740S|IM-A730S|IM-A720L|IM-A710K|IM-A690L|IM-A690S|IM-A650S|IM-A630K|IM-A600S|VEGA PTL21|PT003|P8010|ADR910L|P6030|P6020|P9070|P4100|P9060|P5000|CDM8992|TXT8045|ADR8995|IS11PT|P2030|P6010|P8000|PT002|IS06|CDM8999|P9050|PT001|TXT8040|P2020|P9020|P2000|P7040|P7000|C790", "Fly": "IQ230|IQ444|IQ450|IQ440|IQ442|IQ441|IQ245|IQ256|IQ236|IQ255|IQ235|IQ245|IQ275|IQ240|IQ285|IQ280|IQ270|IQ260|IQ250", "Wiko": "KITE 4G|HIGHWAY|GETAWAY|STAIRWAY|DARKSIDE|DARKFULL|DARKNIGHT|DARKMOON|SLIDE|WAX 4G|RAINBOW|BLOOM|SUNSET|GOA(?!nna)|LENNY|BARRY|IGGY|OZZY|CINK FIVE|CINK PEAX|CINK PEAX 2|CINK SLIM|CINK SLIM 2|CINK +|CINK KING|CINK PEAX|CINK SLIM|SUBLIM", "iMobile": "i-mobile (IQ|i-STYLE|idea|ZAA|Hitz)", "SimValley": "\\b(SP-80|XT-930|SX-340|XT-930|SX-310|SP-360|SP60|SPT-800|SP-120|SPT-800|SP-140|SPX-5|SPX-8|SP-100|SPX-8|SPX-12)\\b", "Wolfgang": "AT-B24D|AT-AS50HD|AT-AS40W|AT-AS55HD|AT-AS45q2|AT-B26D|AT-AS50Q", "Alcatel": "Alcatel", "Nintendo": "Nintendo 3DS", "Amoi": "Amoi", "INQ": "INQ", "GenericPhone": "Tapatalk|PDA;|SAGEM|\\bmmp\\b|pocket|\\bpsp\\b|symbian|Smartphone|smartfon|treo|up.browser|up.link|vodafone|\\bwap\\b|nokia|Series40|Series60|S60|SonyEricsson|N900|MAUI.*WAP.*Browser" }, "tablets": { "iPad": "iPad|iPad.*Mobile", "NexusTablet": "Android.*Nexus[\\s]+(7|9|10)", "SamsungTablet": "SAMSUNG.*Tablet|Galaxy.*Tab|SC-01C|GT-P1000|GT-P1003|GT-P1010|GT-P3105|GT-P6210|GT-P6800|GT-P6810|GT-P7100|GT-P7300|GT-P7310|GT-P7500|GT-P7510|SCH-I800|SCH-I815|SCH-I905|SGH-I957|SGH-I987|SGH-T849|SGH-T859|SGH-T869|SPH-P100|GT-P3100|GT-P3108|GT-P3110|GT-P5100|GT-P5110|GT-P6200|GT-P7320|GT-P7511|GT-N8000|GT-P8510|SGH-I497|SPH-P500|SGH-T779|SCH-I705|SCH-I915|GT-N8013|GT-P3113|GT-P5113|GT-P8110|GT-N8010|GT-N8005|GT-N8020|GT-P1013|GT-P6201|GT-P7501|GT-N5100|GT-N5105|GT-N5110|SHV-E140K|SHV-E140L|SHV-E140S|SHV-E150S|SHV-E230K|SHV-E230L|SHV-E230S|SHW-M180K|SHW-M180L|SHW-M180S|SHW-M180W|SHW-M300W|SHW-M305W|SHW-M380K|SHW-M380S|SHW-M380W|SHW-M430W|SHW-M480K|SHW-M480S|SHW-M480W|SHW-M485W|SHW-M486W|SHW-M500W|GT-I9228|SCH-P739|SCH-I925|GT-I9200|GT-P5200|GT-P5210|GT-P5210X|SM-T311|SM-T310|SM-T310X|SM-T210|SM-T210R|SM-T211|SM-P600|SM-P601|SM-P605|SM-P900|SM-P901|SM-T217|SM-T217A|SM-T217S|SM-P6000|SM-T3100|SGH-I467|XE500|SM-T110|GT-P5220|GT-I9200X|GT-N5110X|GT-N5120|SM-P905|SM-T111|SM-T2105|SM-T315|SM-T320|SM-T320X|SM-T321|SM-T520|SM-T525|SM-T530NU|SM-T230NU|SM-T330NU|SM-T900|XE500T1C|SM-P605V|SM-P905V|SM-T337V|SM-T537V|SM-T707V|SM-T807V|SM-P600X|SM-P900X|SM-T210X|SM-T230|SM-T230X|SM-T325|GT-P7503|SM-T531|SM-T330|SM-T530|SM-T705|SM-T705C|SM-T535|SM-T331|SM-T800|SM-T700|SM-T537|SM-T807|SM-P907A|SM-T337A|SM-T537A|SM-T707A|SM-T807A|SM-T237|SM-T807P|SM-P607T|SM-T217T|SM-T337T|SM-T807T|SM-T116NQ|SM-P550|SM-T350|SM-T550|SM-T9000|SM-P9000|SM-T705Y|SM-T805|GT-P3113|SM-T710|SM-T810|SM-T815|SM-T360|SM-T533|SM-T113|SM-T335|SM-T715|SM-T560|SM-T670|SM-T677|SM-T377|SM-T567|SM-T357T|SM-T555|SM-T561", "Kindle": "Kindle|Silk.*Accelerated|Android.*\\b(KFOT|KFTT|KFJWI|KFJWA|KFOTE|KFSOWI|KFTHWI|KFTHWA|KFAPWI|KFAPWA|WFJWAE|KFSAWA|KFSAWI|KFASWI|KFARWI)\\b", "SurfaceTablet": "Windows NT [0-9.]+; ARM;.*(Tablet|ARMBJS)", "HPTablet": "HP Slate (7|8|10)|HP ElitePad 900|hp-tablet|EliteBook.*Touch|HP 8|Slate 21|HP SlateBook 10", "AsusTablet": "^.*PadFone((?!Mobile).)*$|Transformer|TF101|TF101G|TF300T|TF300TG|TF300TL|TF700T|TF700KL|TF701T|TF810C|ME171|ME301T|ME302C|ME371MG|ME370T|ME372MG|ME172V|ME173X|ME400C|Slider SL101|\\bK00F\\b|\\bK00C\\b|\\bK00E\\b|\\bK00L\\b|TX201LA|ME176C|ME102A|\\bM80TA\\b|ME372CL|ME560CG|ME372CG|ME302KL| K010 | K017 |ME572C|ME103K|ME170C|ME171C|\\bME70C\\b|ME581C|ME581CL|ME8510C|ME181C|P01Y|PO1MA", "BlackBerryTablet": "PlayBook|RIM Tablet", "HTCtablet": "HTC_Flyer_P512|HTC Flyer|HTC Jetstream|HTC-P715a|HTC EVO View 4G|PG41200|PG09410", "MotorolaTablet": "xoom|sholest|MZ615|MZ605|MZ505|MZ601|MZ602|MZ603|MZ604|MZ606|MZ607|MZ608|MZ609|MZ615|MZ616|MZ617", "NookTablet": "Android.*Nook|NookColor|nook browser|BNRV200|BNRV200A|BNTV250|BNTV250A|BNTV400|BNTV600|LogicPD Zoom2", "AcerTablet": "Android.*; \\b(A100|A101|A110|A200|A210|A211|A500|A501|A510|A511|A700|A701|W500|W500P|W501|W501P|W510|W511|W700|G100|G100W|B1-A71|B1-710|B1-711|A1-810|A1-811|A1-830)\\b|W3-810|\\bA3-A10\\b|\\bA3-A11\\b|\\bA3-A20", "ToshibaTablet": "Android.*(AT100|AT105|AT200|AT205|AT270|AT275|AT300|AT305|AT1S5|AT500|AT570|AT700|AT830)|TOSHIBA.*FOLIO", "LGTablet": "\\bL-06C|LG-V909|LG-V900|LG-V700|LG-V510|LG-V500|LG-V410|LG-V400|LG-VK810\\b", "FujitsuTablet": "Android.*\\b(F-01D|F-02F|F-05E|F-10D|M532|Q572)\\b", "PrestigioTablet": "PMP3170B|PMP3270B|PMP3470B|PMP7170B|PMP3370B|PMP3570C|PMP5870C|PMP3670B|PMP5570C|PMP5770D|PMP3970B|PMP3870C|PMP5580C|PMP5880D|PMP5780D|PMP5588C|PMP7280C|PMP7280C3G|PMP7280|PMP7880D|PMP5597D|PMP5597|PMP7100D|PER3464|PER3274|PER3574|PER3884|PER5274|PER5474|PMP5097CPRO|PMP5097|PMP7380D|PMP5297C|PMP5297C_QUAD|PMP812E|PMP812E3G|PMP812F|PMP810E|PMP880TD|PMT3017|PMT3037|PMT3047|PMT3057|PMT7008|PMT5887|PMT5001|PMT5002", "LenovoTablet": "Lenovo TAB|Idea(Tab|Pad)( A1|A10| K1|)|ThinkPad([ ]+)?Tablet|YT3-X90L|YT3-X90F|YT3-X90X|Lenovo.*(S2109|S2110|S5000|S6000|K3011|A3000|A3500|A1000|A2107|A2109|A1107|A5500|A7600|B6000|B8000|B8080)(-|)(FL|F|HV|H|)", "DellTablet": "Venue 11|Venue 8|Venue 7|Dell Streak 10|Dell Streak 7", "YarvikTablet": "Android.*\\b(TAB210|TAB211|TAB224|TAB250|TAB260|TAB264|TAB310|TAB360|TAB364|TAB410|TAB411|TAB420|TAB424|TAB450|TAB460|TAB461|TAB464|TAB465|TAB467|TAB468|TAB07-100|TAB07-101|TAB07-150|TAB07-151|TAB07-152|TAB07-200|TAB07-201-3G|TAB07-210|TAB07-211|TAB07-212|TAB07-214|TAB07-220|TAB07-400|TAB07-485|TAB08-150|TAB08-200|TAB08-201-3G|TAB08-201-30|TAB09-100|TAB09-211|TAB09-410|TAB10-150|TAB10-201|TAB10-211|TAB10-400|TAB10-410|TAB13-201|TAB274EUK|TAB275EUK|TAB374EUK|TAB462EUK|TAB474EUK|TAB9-200)\\b", "MedionTablet": "Android.*\\bOYO\\b|LIFE.*(P9212|P9514|P9516|S9512)|LIFETAB", "ArnovaTablet": "AN10G2|AN7bG3|AN7fG3|AN8G3|AN8cG3|AN7G3|AN9G3|AN7dG3|AN7dG3ST|AN7dG3ChildPad|AN10bG3|AN10bG3DT|AN9G2", "IntensoTablet": "INM8002KP|INM1010FP|INM805ND|Intenso Tab|TAB1004", "IRUTablet": "M702pro", "MegafonTablet": "MegaFon V9|\\bZTE V9\\b|Android.*\\bMT7A\\b", "EbodaTablet": "E-Boda (Supreme|Impresspeed|Izzycomm|Essential)", "AllViewTablet": "Allview.*(Viva|Alldro|City|Speed|All TV|Frenzy|Quasar|Shine|TX1|AX1|AX2)", "ArchosTablet": "\\b(101G9|80G9|A101IT)\\b|Qilive 97R|Archos5|\\bARCHOS (70|79|80|90|97|101|FAMILYPAD|)(b|)(G10| Cobalt| TITANIUM(HD|)| Xenon| Neon|XSK| 2| XS 2| PLATINUM| CARBON|GAMEPAD)\\b", "AinolTablet": "NOVO7|NOVO8|NOVO10|Novo7Aurora|Novo7Basic|NOVO7PALADIN|novo9-Spark", "NokiaLumiaTablet": "Lumia 2520", "SonyTablet": "Sony.*Tablet|Xperia Tablet|Sony Tablet S|SO-03E|SGPT12|SGPT13|SGPT114|SGPT121|SGPT122|SGPT123|SGPT111|SGPT112|SGPT113|SGPT131|SGPT132|SGPT133|SGPT211|SGPT212|SGPT213|SGP311|SGP312|SGP321|EBRD1101|EBRD1102|EBRD1201|SGP351|SGP341|SGP511|SGP512|SGP521|SGP541|SGP551|SGP621|SGP612|SOT31", "PhilipsTablet": "\\b(PI2010|PI3000|PI3100|PI3105|PI3110|PI3205|PI3210|PI3900|PI4010|PI7000|PI7100)\\b", "CubeTablet": "Android.*(K8GT|U9GT|U10GT|U16GT|U17GT|U18GT|U19GT|U20GT|U23GT|U30GT)|CUBE U8GT", "CobyTablet": "MID1042|MID1045|MID1125|MID1126|MID7012|MID7014|MID7015|MID7034|MID7035|MID7036|MID7042|MID7048|MID7127|MID8042|MID8048|MID8127|MID9042|MID9740|MID9742|MID7022|MID7010", "MIDTablet": "M9701|M9000|M9100|M806|M1052|M806|T703|MID701|MID713|MID710|MID727|MID760|MID830|MID728|MID933|MID125|MID810|MID732|MID120|MID930|MID800|MID731|MID900|MID100|MID820|MID735|MID980|MID130|MID833|MID737|MID960|MID135|MID860|MID736|MID140|MID930|MID835|MID733|MID4X10", "MSITablet": "MSI \\b(Primo 73K|Primo 73L|Primo 81L|Primo 77|Primo 93|Primo 75|Primo 76|Primo 73|Primo 81|Primo 91|Primo 90|Enjoy 71|Enjoy 7|Enjoy 10)\\b", "SMiTTablet": "Android.*(\\bMID\\b|MID-560|MTV-T1200|MTV-PND531|MTV-P1101|MTV-PND530)", "RockChipTablet": "Android.*(RK2818|RK2808A|RK2918|RK3066)|RK2738|RK2808A", "FlyTablet": "IQ310|Fly Vision", "bqTablet": "Android.*(bq)?.*(Elcano|Curie|Edison|Maxwell|Kepler|Pascal|Tesla|Hypatia|Platon|Newton|Livingstone|Cervantes|Avant|Aquaris E10)|Maxwell.*Lite|Maxwell.*Plus", "HuaweiTablet": "MediaPad|MediaPad 7 Youth|IDEOS S7|S7-201c|S7-202u|S7-101|S7-103|S7-104|S7-105|S7-106|S7-201|S7-Slim", "NecTablet": "\\bN-06D|\\bN-08D", "PantechTablet": "Pantech.*P4100", "BronchoTablet": "Broncho.*(N701|N708|N802|a710)", "VersusTablet": "TOUCHPAD.*[78910]|\\bTOUCHTAB\\b", "ZyncTablet": "z1000|Z99 2G|z99|z930|z999|z990|z909|Z919|z900", "PositivoTablet": "TB07STA|TB10STA|TB07FTA|TB10FTA", "NabiTablet": "Android.*\\bNabi", "KoboTablet": "Kobo Touch|\\bK080\\b|\\bVox\\b Build|\\bArc\\b Build", "DanewTablet": "DSlide.*\\b(700|701R|702|703R|704|802|970|971|972|973|974|1010|1012)\\b", "TexetTablet": "NaviPad|TB-772A|TM-7045|TM-7055|TM-9750|TM-7016|TM-7024|TM-7026|TM-7041|TM-7043|TM-7047|TM-8041|TM-9741|TM-9747|TM-9748|TM-9751|TM-7022|TM-7021|TM-7020|TM-7011|TM-7010|TM-7023|TM-7025|TM-7037W|TM-7038W|TM-7027W|TM-9720|TM-9725|TM-9737W|TM-1020|TM-9738W|TM-9740|TM-9743W|TB-807A|TB-771A|TB-727A|TB-725A|TB-719A|TB-823A|TB-805A|TB-723A|TB-715A|TB-707A|TB-705A|TB-709A|TB-711A|TB-890HD|TB-880HD|TB-790HD|TB-780HD|TB-770HD|TB-721HD|TB-710HD|TB-434HD|TB-860HD|TB-840HD|TB-760HD|TB-750HD|TB-740HD|TB-730HD|TB-722HD|TB-720HD|TB-700HD|TB-500HD|TB-470HD|TB-431HD|TB-430HD|TB-506|TB-504|TB-446|TB-436|TB-416|TB-146SE|TB-126SE", "PlaystationTablet": "Playstation.*(Portable|Vita)", "TrekstorTablet": "ST10416-1|VT10416-1|ST70408-1|ST702xx-1|ST702xx-2|ST80208|ST97216|ST70104-2|VT10416-2|ST10216-2A|SurfTab", "PyleAudioTablet": "\\b(PTBL10CEU|PTBL10C|PTBL72BC|PTBL72BCEU|PTBL7CEU|PTBL7C|PTBL92BC|PTBL92BCEU|PTBL9CEU|PTBL9CUK|PTBL9C)\\b", "AdvanTablet": "Android.* \\b(E3A|T3X|T5C|T5B|T3E|T3C|T3B|T1J|T1F|T2A|T1H|T1i|E1C|T1-E|T5-A|T4|E1-B|T2Ci|T1-B|T1-D|O1-A|E1-A|T1-A|T3A|T4i)\\b ", "DanyTechTablet": "Genius Tab G3|Genius Tab S2|Genius Tab Q3|Genius Tab G4|Genius Tab Q4|Genius Tab G-II|Genius TAB GII|Genius TAB GIII|Genius Tab S1", "GalapadTablet": "Android.*\\bG1\\b", "MicromaxTablet": "Funbook|Micromax.*\\b(P250|P560|P360|P362|P600|P300|P350|P500|P275)\\b", "KarbonnTablet": "Android.*\\b(A39|A37|A34|ST8|ST10|ST7|Smart Tab3|Smart Tab2)\\b", "AllFineTablet": "Fine7 Genius|Fine7 Shine|Fine7 Air|Fine8 Style|Fine9 More|Fine10 Joy|Fine11 Wide", "PROSCANTablet": "\\b(PEM63|PLT1023G|PLT1041|PLT1044|PLT1044G|PLT1091|PLT4311|PLT4311PL|PLT4315|PLT7030|PLT7033|PLT7033D|PLT7035|PLT7035D|PLT7044K|PLT7045K|PLT7045KB|PLT7071KG|PLT7072|PLT7223G|PLT7225G|PLT7777G|PLT7810K|PLT7849G|PLT7851G|PLT7852G|PLT8015|PLT8031|PLT8034|PLT8036|PLT8080K|PLT8082|PLT8088|PLT8223G|PLT8234G|PLT8235G|PLT8816K|PLT9011|PLT9045K|PLT9233G|PLT9735|PLT9760G|PLT9770G)\\b", "YONESTablet": "BQ1078|BC1003|BC1077|RK9702|BC9730|BC9001|IT9001|BC7008|BC7010|BC708|BC728|BC7012|BC7030|BC7027|BC7026", "ChangJiaTablet": "TPC7102|TPC7103|TPC7105|TPC7106|TPC7107|TPC7201|TPC7203|TPC7205|TPC7210|TPC7708|TPC7709|TPC7712|TPC7110|TPC8101|TPC8103|TPC8105|TPC8106|TPC8203|TPC8205|TPC8503|TPC9106|TPC9701|TPC97101|TPC97103|TPC97105|TPC97106|TPC97111|TPC97113|TPC97203|TPC97603|TPC97809|TPC97205|TPC10101|TPC10103|TPC10106|TPC10111|TPC10203|TPC10205|TPC10503", "GUTablet": "TX-A1301|TX-M9002|Q702|kf026", "PointOfViewTablet": "TAB-P506|TAB-navi-7-3G-M|TAB-P517|TAB-P-527|TAB-P701|TAB-P703|TAB-P721|TAB-P731N|TAB-P741|TAB-P825|TAB-P905|TAB-P925|TAB-PR945|TAB-PL1015|TAB-P1025|TAB-PI1045|TAB-P1325|TAB-PROTAB[0-9]+|TAB-PROTAB25|TAB-PROTAB26|TAB-PROTAB27|TAB-PROTAB26XL|TAB-PROTAB2-IPS9|TAB-PROTAB30-IPS9|TAB-PROTAB25XXL|TAB-PROTAB26-IPS10|TAB-PROTAB30-IPS10", "OvermaxTablet": "OV-(SteelCore|NewBase|Basecore|Baseone|Exellen|Quattor|EduTab|Solution|ACTION|BasicTab|TeddyTab|MagicTab|Stream|TB-08|TB-09)", "HCLTablet": "HCL.*Tablet|Connect-3G-2.0|Connect-2G-2.0|ME Tablet U1|ME Tablet U2|ME Tablet G1|ME Tablet X1|ME Tablet Y2|ME Tablet Sync", "DPSTablet": "DPS Dream 9|DPS Dual 7", "VistureTablet": "V97 HD|i75 3G|Visture V4( HD)?|Visture V5( HD)?|Visture V10", "CrestaTablet": "CTP(-)?810|CTP(-)?818|CTP(-)?828|CTP(-)?838|CTP(-)?888|CTP(-)?978|CTP(-)?980|CTP(-)?987|CTP(-)?988|CTP(-)?989", "MediatekTablet": "\\bMT8125|MT8389|MT8135|MT8377\\b", "ConcordeTablet": "Concorde([ ]+)?Tab|ConCorde ReadMan", "GoCleverTablet": "GOCLEVER TAB|A7GOCLEVER|M1042|M7841|M742|R1042BK|R1041|TAB A975|TAB A7842|TAB A741|TAB A741L|TAB M723G|TAB M721|TAB A1021|TAB I921|TAB R721|TAB I720|TAB T76|TAB R70|TAB R76.2|TAB R106|TAB R83.2|TAB M813G|TAB I721|GCTA722|TAB I70|TAB I71|TAB S73|TAB R73|TAB R74|TAB R93|TAB R75|TAB R76.1|TAB A73|TAB A93|TAB A93.2|TAB T72|TAB R83|TAB R974|TAB R973|TAB A101|TAB A103|TAB A104|TAB A104.2|R105BK|M713G|A972BK|TAB A971|TAB R974.2|TAB R104|TAB R83.3|TAB A1042", "ModecomTablet": "FreeTAB 9000|FreeTAB 7.4|FreeTAB 7004|FreeTAB 7800|FreeTAB 2096|FreeTAB 7.5|FreeTAB 1014|FreeTAB 1001 |FreeTAB 8001|FreeTAB 9706|FreeTAB 9702|FreeTAB 7003|FreeTAB 7002|FreeTAB 1002|FreeTAB 7801|FreeTAB 1331|FreeTAB 1004|FreeTAB 8002|FreeTAB 8014|FreeTAB 9704|FreeTAB 1003", "VoninoTablet": "\\b(Argus[ _]?S|Diamond[ _]?79HD|Emerald[ _]?78E|Luna[ _]?70C|Onyx[ _]?S|Onyx[ _]?Z|Orin[ _]?HD|Orin[ _]?S|Otis[ _]?S|SpeedStar[ _]?S|Magnet[ _]?M9|Primus[ _]?94[ _]?3G|Primus[ _]?94HD|Primus[ _]?QS|Android.*\\bQ8\\b|Sirius[ _]?EVO[ _]?QS|Sirius[ _]?QS|Spirit[ _]?S)\\b", "ECSTablet": "V07OT2|TM105A|S10OT1|TR10CS1", "StorexTablet": "eZee[_']?(Tab|Go)[0-9]+|TabLC7|Looney Tunes Tab", "VodafoneTablet": "SmartTab([ ]+)?[0-9]+|SmartTabII10|SmartTabII7|VF-1497", "EssentielBTablet": "Smart[ ']?TAB[ ]+?[0-9]+|Family[ ']?TAB2", "RossMoorTablet": "RM-790|RM-997|RMD-878G|RMD-974R|RMT-705A|RMT-701|RME-601|RMT-501|RMT-711", "iMobileTablet": "i-mobile i-note", "TolinoTablet": "tolino tab [0-9.]+|tolino shine", "AudioSonicTablet": "\\bC-22Q|T7-QC|T-17B|T-17P\\b", "AMPETablet": "Android.* A78 ", "SkkTablet": "Android.* (SKYPAD|PHOENIX|CYCLOPS)", "TecnoTablet": "TECNO P9", "JXDTablet": "Android.* \\b(F3000|A3300|JXD5000|JXD3000|JXD2000|JXD300B|JXD300|S5800|S7800|S602b|S5110b|S7300|S5300|S602|S603|S5100|S5110|S601|S7100a|P3000F|P3000s|P101|P200s|P1000m|P200m|P9100|P1000s|S6600b|S908|P1000|P300|S18|S6600|S9100)\\b", "iJoyTablet": "Tablet (Spirit 7|Essentia|Galatea|Fusion|Onix 7|Landa|Titan|Scooby|Deox|Stella|Themis|Argon|Unique 7|Sygnus|Hexen|Finity 7|Cream|Cream X2|Jade|Neon 7|Neron 7|Kandy|Scape|Saphyr 7|Rebel|Biox|Rebel|Rebel 8GB|Myst|Draco 7|Myst|Tab7-004|Myst|Tadeo Jones|Tablet Boing|Arrow|Draco Dual Cam|Aurix|Mint|Amity|Revolution|Finity 9|Neon 9|T9w|Amity 4GB Dual Cam|Stone 4GB|Stone 8GB|Andromeda|Silken|X2|Andromeda II|Halley|Flame|Saphyr 9,7|Touch 8|Planet|Triton|Unique 10|Hexen 10|Memphis 4GB|Memphis 8GB|Onix 10)", "FX2Tablet": "FX2 PAD7|FX2 PAD10", "XoroTablet": "KidsPAD 701|PAD[ ]?712|PAD[ ]?714|PAD[ ]?716|PAD[ ]?717|PAD[ ]?718|PAD[ ]?720|PAD[ ]?721|PAD[ ]?722|PAD[ ]?790|PAD[ ]?792|PAD[ ]?900|PAD[ ]?9715D|PAD[ ]?9716DR|PAD[ ]?9718DR|PAD[ ]?9719QR|PAD[ ]?9720QR|TelePAD1030|Telepad1032|TelePAD730|TelePAD731|TelePAD732|TelePAD735Q|TelePAD830|TelePAD9730|TelePAD795|MegaPAD 1331|MegaPAD 1851|MegaPAD 2151", "ViewsonicTablet": "ViewPad 10pi|ViewPad 10e|ViewPad 10s|ViewPad E72|ViewPad7|ViewPad E100|ViewPad 7e|ViewSonic VB733|VB100a", "OdysTablet": "LOOX|XENO10|ODYS[ -](Space|EVO|Xpress|NOON)|\\bXELIO\\b|Xelio10Pro|XELIO7PHONETAB|XELIO10EXTREME|XELIOPT2|NEO_QUAD10", "CaptivaTablet": "CAPTIVA PAD", "IconbitTablet": "NetTAB|NT-3702|NT-3702S|NT-3702S|NT-3603P|NT-3603P|NT-0704S|NT-0704S|NT-3805C|NT-3805C|NT-0806C|NT-0806C|NT-0909T|NT-0909T|NT-0907S|NT-0907S|NT-0902S|NT-0902S", "TeclastTablet": "T98 4G|\\bP80\\b|\\bX90HD\\b|X98 Air|X98 Air 3G|\\bX89\\b|P80 3G|\\bX80h\\b|P98 Air|\\bX89HD\\b|P98 3G|\\bP90HD\\b|P89 3G|X98 3G|\\bP70h\\b|P79HD 3G|G18d 3G|\\bP79HD\\b|\\bP89s\\b|\\bA88\\b|\\bP10HD\\b|\\bP19HD\\b|G18 3G|\\bP78HD\\b|\\bA78\\b|\\bP75\\b|G17s 3G|G17h 3G|\\bP85t\\b|\\bP90\\b|\\bP11\\b|\\bP98t\\b|\\bP98HD\\b|\\bG18d\\b|\\bP85s\\b|\\bP11HD\\b|\\bP88s\\b|\\bA80HD\\b|\\bA80se\\b|\\bA10h\\b|\\bP89\\b|\\bP78s\\b|\\bG18\\b|\\bP85\\b|\\bA70h\\b|\\bA70\\b|\\bG17\\b|\\bP18\\b|\\bA80s\\b|\\bA11s\\b|\\bP88HD\\b|\\bA80h\\b|\\bP76s\\b|\\bP76h\\b|\\bP98\\b|\\bA10HD\\b|\\bP78\\b|\\bP88\\b|\\bA11\\b|\\bA10t\\b|\\bP76a\\b|\\bP76t\\b|\\bP76e\\b|\\bP85HD\\b|\\bP85a\\b|\\bP86\\b|\\bP75HD\\b|\\bP76v\\b|\\bA12\\b|\\bP75a\\b|\\bA15\\b|\\bP76Ti\\b|\\bP81HD\\b|\\bA10\\b|\\bT760VE\\b|\\bT720HD\\b|\\bP76\\b|\\bP73\\b|\\bP71\\b|\\bP72\\b|\\bT720SE\\b|\\bC520Ti\\b|\\bT760\\b|\\bT720VE\\b|T720-3GE|T720-WiFi", "OndaTablet": "\\b(V975i|Vi30|VX530|V701|Vi60|V701s|Vi50|V801s|V719|Vx610w|VX610W|V819i|Vi10|VX580W|Vi10|V711s|V813|V811|V820w|V820|Vi20|V711|VI30W|V712|V891w|V972|V819w|V820w|Vi60|V820w|V711|V813s|V801|V819|V975s|V801|V819|V819|V818|V811|V712|V975m|V101w|V961w|V812|V818|V971|V971s|V919|V989|V116w|V102w|V973|Vi40)\\b[\\s]+", "JaytechTablet": "TPC-PA762", "BlaupunktTablet": "Endeavour 800NG|Endeavour 1010", "DigmaTablet": "\\b(iDx10|iDx9|iDx8|iDx7|iDxD7|iDxD8|iDsQ8|iDsQ7|iDsQ8|iDsD10|iDnD7|3TS804H|iDsQ11|iDj7|iDs10)\\b", "EvolioTablet": "ARIA_Mini_wifi|Aria[ _]Mini|Evolio X10|Evolio X7|Evolio X8|\\bEvotab\\b|\\bNeura\\b", "LavaTablet": "QPAD E704|\\bIvoryS\\b|E-TAB IVORY|\\bE-TAB\\b", "AocTablet": "MW0811|MW0812|MW0922|MTK8382|MW1031|MW0831|MW0821|MW0931|MW0712", "MpmanTablet": "MP11 OCTA|MP10 OCTA|MPQC1114|MPQC1004|MPQC994|MPQC974|MPQC973|MPQC804|MPQC784|MPQC780|\\bMPG7\\b|MPDCG75|MPDCG71|MPDC1006|MP101DC|MPDC9000|MPDC905|MPDC706HD|MPDC706|MPDC705|MPDC110|MPDC100|MPDC99|MPDC97|MPDC88|MPDC8|MPDC77|MP709|MID701|MID711|MID170|MPDC703|MPQC1010", "CelkonTablet": "CT695|CT888|CT[\\s]?910|CT7 Tab|CT9 Tab|CT3 Tab|CT2 Tab|CT1 Tab|C820|C720|\\bCT-1\\b", "WolderTablet": "miTab \\b(DIAMOND|SPACE|BROOKLYN|NEO|FLY|MANHATTAN|FUNK|EVOLUTION|SKY|GOCAR|IRON|GENIUS|POP|MINT|EPSILON|BROADWAY|JUMP|HOP|LEGEND|NEW AGE|LINE|ADVANCE|FEEL|FOLLOW|LIKE|LINK|LIVE|THINK|FREEDOM|CHICAGO|CLEVELAND|BALTIMORE-GH|IOWA|BOSTON|SEATTLE|PHOENIX|DALLAS|IN 101|MasterChef)\\b", "MiTablet": "\\bMI PAD\\b|\\bHM NOTE 1W\\b", "NibiruTablet": "Nibiru M1|Nibiru Jupiter One", "NexoTablet": "NEXO NOVA|NEXO 10|NEXO AVIO|NEXO FREE|NEXO GO|NEXO EVO|NEXO 3G|NEXO SMART|NEXO KIDDO|NEXO MOBI", "LeaderTablet": "TBLT10Q|TBLT10I|TBL-10WDKB|TBL-10WDKBO2013|TBL-W230V2|TBL-W450|TBL-W500|SV572|TBLT7I|TBA-AC7-8G|TBLT79|TBL-8W16|TBL-10W32|TBL-10WKB|TBL-W100", "UbislateTablet": "UbiSlate[\\s]?7C", "PocketBookTablet": "Pocketbook", "KocasoTablet": "\\b(TB-1207)\\b", "Hudl": "Hudl HT7S3|Hudl 2", "TelstraTablet": "T-Hub2", "GenericTablet": "Android.*\\b97D\\b|Tablet(?!.*PC)|BNTV250A|MID-WCDMA|LogicPD Zoom2|\\bA7EB\\b|CatNova8|A1_07|CT704|CT1002|\\bM721\\b|rk30sdk|\\bEVOTAB\\b|M758A|ET904|ALUMIUM10|Smartfren Tab|Endeavour 1010|Tablet-PC-4|Tagi Tab|\\bM6pro\\b|CT1020W|arc 10HD|\\bJolla\\b|\\bTP750\\b" }, "oss": { "AndroidOS": "Android", "BlackBerryOS": "blackberry|\\bBB10\\b|rim tablet os", "PalmOS": "PalmOS|avantgo|blazer|elaine|hiptop|palm|plucker|xiino", "SymbianOS": "Symbian|SymbOS|Series60|Series40|SYB-[0-9]+|\\bS60\\b", "WindowsMobileOS": "Windows CE.*(PPC|Smartphone|Mobile|[0-9]{3}x[0-9]{3})|Window Mobile|Windows Phone [0-9.]+|WCE;", "WindowsPhoneOS": "Windows Phone 10.0|Windows Phone 8.1|Windows Phone 8.0|Windows Phone OS|XBLWP7|ZuneWP7|Windows NT 6.[23]; ARM;", "iOS": "\\biPhone.*Mobile|\\biPod|\\biPad", "MeeGoOS": "MeeGo", "MaemoOS": "Maemo", "JavaOS": "J2ME\/|\\bMIDP\\b|\\bCLDC\\b", "webOS": "webOS|hpwOS", "badaOS": "\\bBada\\b", "BREWOS": "BREW" }, "uas": { "Vivaldi": "Vivaldi", "Chrome": "\\bCrMo\\b|CriOS|Android.*Chrome\/[.0-9]* (Mobile)?", "Dolfin": "\\bDolfin\\b", "Opera": "Opera.*Mini|Opera.*Mobi|Android.*Opera|Mobile.*OPR\/[0-9.]+|Coast\/[0-9.]+", "Skyfire": "Skyfire", "Edge": "Mobile Safari\/[.0-9]* Edge", "IE": "IEMobile|MSIEMobile", "Firefox": "fennec|firefox.*maemo|(Mobile|Tablet).*Firefox|Firefox.*Mobile", "Bolt": "bolt", "TeaShark": "teashark", "Blazer": "Blazer", "Safari": "Version.*Mobile.*Safari|Safari.*Mobile|MobileSafari", "Tizen": "Tizen", "UCBrowser": "UC.*Browser|UCWEB", "baiduboxapp": "baiduboxapp", "baidubrowser": "baidubrowser", "DiigoBrowser": "DiigoBrowser", "Puffin": "Puffin", "Mercury": "\\bMercury\\b", "ObigoBrowser": "Obigo", "NetFront": "NF-Browser", "GenericBrowser": "NokiaBrowser|OviBrowser|OneBrowser|TwonkyBeamBrowser|SEMC.*Browser|FlyFlow|Minimo|NetFront|Novarra-Vision|MQQBrowser|MicroMessenger", "PaleMoon": "Android.*PaleMoon|Mobile.*PaleMoon" }, "props": { "Mobile": "Mobile\/[VER]", "Build": "Build\/[VER]", "Version": "Version\/[VER]", "VendorID": "VendorID\/[VER]", "iPad": "iPad.*CPU[a-z ]+[VER]", "iPhone": "iPhone.*CPU[a-z ]+[VER]", "iPod": "iPod.*CPU[a-z ]+[VER]", "Kindle": "Kindle\/[VER]", "Chrome": [ "Chrome\/[VER]", "CriOS\/[VER]", "CrMo\/[VER]" ], "Coast": [ "Coast\/[VER]" ], "Dolfin": "Dolfin\/[VER]", "Firefox": "Firefox\/[VER]", "Fennec": "Fennec\/[VER]", "Edge": "Edge\/[VER]", "IE": [ "IEMobile\/[VER];", "IEMobile [VER]", "MSIE [VER];", "Trident\/[0-9.]+;.*rv:[VER]" ], "NetFront": "NetFront\/[VER]", "NokiaBrowser": "NokiaBrowser\/[VER]", "Opera": [ " OPR\/[VER]", "Opera Mini\/[VER]", "Version\/[VER]" ], "Opera Mini": "Opera Mini\/[VER]", "Opera Mobi": "Version\/[VER]", "UC Browser": "UC Browser[VER]", "MQQBrowser": "MQQBrowser\/[VER]", "MicroMessenger": "MicroMessenger\/[VER]", "baiduboxapp": "baiduboxapp\/[VER]", "baidubrowser": "baidubrowser\/[VER]", "Iron": "Iron\/[VER]", "Safari": [ "Version\/[VER]", "Safari\/[VER]" ], "Skyfire": "Skyfire\/[VER]", "Tizen": "Tizen\/[VER]", "Webkit": "webkit[ \/][VER]", "PaleMoon": "PaleMoon\/[VER]", "Gecko": "Gecko\/[VER]", "Trident": "Trident\/[VER]", "Presto": "Presto\/[VER]", "Goanna": "Goanna\/[VER]", "iOS": " \\bi?OS\\b [VER][ ;]{1}", "Android": "Android [VER]", "BlackBerry": [ "BlackBerry[\\w]+\/[VER]", "BlackBerry.*Version\/[VER]", "Version\/[VER]" ], "BREW": "BREW [VER]", "Java": "Java\/[VER]", "Windows Phone OS": [ "Windows Phone OS [VER]", "Windows Phone [VER]" ], "Windows Phone": "Windows Phone [VER]", "Windows CE": "Windows CE\/[VER]", "Windows NT": "Windows NT [VER]", "Symbian": [ "SymbianOS\/[VER]", "Symbian\/[VER]" ], "webOS": [ "webOS\/[VER]", "hpwOS\/[VER];" ] }, "utils": { "Bot": "Googlebot|facebookexternalhit|AdsBot-Google|Google Keyword Suggestion|Facebot|YandexBot|bingbot|ia_archiver|AhrefsBot|Ezooms|GSLFbot|WBSearchBot|Twitterbot|TweetmemeBot|Twikle|PaperLiBot|Wotbox|UnwindFetchor|Exabot|MJ12bot|YandexImages|TurnitinBot|Pingdom", "MobileBot": "Googlebot-Mobile|AdsBot-Google-Mobile|YahooSeeker\/M1A1-R2D2", "DesktopMode": "WPDesktop", "TV": "SonyDTV|HbbTV", "WebKit": "(webkit)[ \/]([\\w.]+)", "Console": "\\b(Nintendo|Nintendo WiiU|Nintendo 3DS|PLAYSTATION|Xbox)\\b", "Watch": "SM-V700" }}; // following patterns come from http://detectmobilebrowsers.com/ impl.detectMobileBrowsers = { fullPattern: /(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino/i, shortPattern: /1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i, tabletPattern: /android|ipad|playbook|silk/i }; var hasOwnProp = Object.prototype.hasOwnProperty, isArray; impl.FALLBACK_PHONE = 'UnknownPhone'; impl.FALLBACK_TABLET = 'UnknownTablet'; impl.FALLBACK_MOBILE = 'UnknownMobile'; isArray = ('isArray' in Array) ? Array.isArray : function (value) { return Object.prototype.toString.call(value) === '[object Array]'; }; isArray = 'isArray' in Array ? function (value) { return Object.prototype.toString.call(value) === '[object Array]'; } : Array.isArray; function equalIC(a, b) { return a != null && b != null && a.toLowerCase() === b.toLowerCase(); } function containsIC(array, value) { var valueLC, i, len = array.length; if (!len || !value) { return false; } valueLC = value.toLowerCase(); for (i = 0; i < len; ++i) { if (valueLC === array[i].toLowerCase()) { return true; } } return false; } function convertPropsToRegExp(object) { for (var key in object) { if (hasOwnProp.call(object, key)) { object[key] = new RegExp(object[key], 'i'); } } } (function init() { var key, values, value, i, len, verPos, mobileDetectRules = impl.mobileDetectRules; for (key in mobileDetectRules.props) { if (hasOwnProp.call(mobileDetectRules.props, key)) { values = mobileDetectRules.props[key]; if (!isArray(values)) { values = [values]; } len = values.length; for (i = 0; i < len; ++i) { value = values[i]; verPos = value.indexOf('[VER]'); if (verPos >= 0) { value = value.substring(0, verPos) + '([\\w._\\+]+)' + value.substring(verPos + 5); } values[i] = new RegExp(value, 'i'); } mobileDetectRules.props[key] = values; } } convertPropsToRegExp(mobileDetectRules.oss); convertPropsToRegExp(mobileDetectRules.phones); convertPropsToRegExp(mobileDetectRules.tablets); convertPropsToRegExp(mobileDetectRules.uas); convertPropsToRegExp(mobileDetectRules.utils); // copy some patterns to oss0 which are tested first (see issue#15) mobileDetectRules.oss0 = { WindowsPhoneOS: mobileDetectRules.oss.WindowsPhoneOS, WindowsMobileOS: mobileDetectRules.oss.WindowsMobileOS }; }()); /** * Test userAgent string against a set of rules and find the first matched key. * @param {Object} rules (key is String, value is RegExp) * @param {String} userAgent the navigator.userAgent (or HTTP-Header 'User-Agent'). * @returns {String|null} the matched key if found, otherwise null * @private */ impl.findMatch = function(rules, userAgent) { for (var key in rules) { if (hasOwnProp.call(rules, key)) { if (rules[key].test(userAgent)) { return key; } } } return null; }; /** * Test userAgent string against a set of rules and return an array of matched keys. * @param {Object} rules (key is String, value is RegExp) * @param {String} userAgent the navigator.userAgent (or HTTP-Header 'User-Agent'). * @returns {Array} an array of matched keys, may be empty when there is no match, but not null * @private */ impl.findMatches = function(rules, userAgent) { var result = []; for (var key in rules) { if (hasOwnProp.call(rules, key)) { if (rules[key].test(userAgent)) { result.push(key); } } } return result; }; /** * Check the version of the given property in the User-Agent. * * @param {String} propertyName * @param {String} userAgent * @return {String} version or null if version not found * @private */ impl.getVersionStr = function (propertyName, userAgent) { var props = impl.mobileDetectRules.props, patterns, i, len, match; if (hasOwnProp.call(props, propertyName)) { patterns = props[propertyName]; len = patterns.length; for (i = 0; i < len; ++i) { match = patterns[i].exec(userAgent); if (match !== null) { return match[1]; } } } return null; }; /** * Check the version of the given property in the User-Agent. * Will return a float number. (eg. 2_0 will return 2.0, 4.3.1 will return 4.31) * * @param {String} propertyName * @param {String} userAgent * @return {Number} version or NaN if version not found * @private */ impl.getVersion = function (propertyName, userAgent) { var version = impl.getVersionStr(propertyName, userAgent); return version ? impl.prepareVersionNo(version) : NaN; }; /** * Prepare the version number. * * @param {String} version * @return {Number} the version number as a floating number * @private */ impl.prepareVersionNo = function (version) { var numbers; numbers = version.split(/[a-z._ \/\-]/i); if (numbers.length === 1) { version = numbers[0]; } if (numbers.length > 1) { version = numbers[0] + '.'; numbers.shift(); version += numbers.join(''); } return Number(version); }; impl.isMobileFallback = function (userAgent) { return impl.detectMobileBrowsers.fullPattern.test(userAgent) || impl.detectMobileBrowsers.shortPattern.test(userAgent.substr(0,4)); }; impl.isTabletFallback = function (userAgent) { return impl.detectMobileBrowsers.tabletPattern.test(userAgent); }; impl.prepareDetectionCache = function (cache, userAgent, maxPhoneWidth) { if (cache.mobile !== undefined) { return; } var phone, tablet, phoneSized; // first check for stronger tablet rules, then phone (see issue#5) tablet = impl.findMatch(impl.mobileDetectRules.tablets, userAgent); if (tablet) { cache.mobile = cache.tablet = tablet; cache.phone = null; return; // unambiguously identified as tablet } phone = impl.findMatch(impl.mobileDetectRules.phones, userAgent); if (phone) { cache.mobile = cache.phone = phone; cache.tablet = null; return; // unambiguously identified as phone } // our rules haven't found a match -> try more general fallback rules if (impl.isMobileFallback(userAgent)) { phoneSized = MobileDetect.isPhoneSized(maxPhoneWidth); if (phoneSized === undefined) { cache.mobile = impl.FALLBACK_MOBILE; cache.tablet = cache.phone = null; } else if (phoneSized) { cache.mobile = cache.phone = impl.FALLBACK_PHONE; cache.tablet = null; } else { cache.mobile = cache.tablet = impl.FALLBACK_TABLET; cache.phone = null; } } else if (impl.isTabletFallback(userAgent)) { cache.mobile = cache.tablet = impl.FALLBACK_TABLET; cache.phone = null; } else { // not mobile at all! cache.mobile = cache.tablet = cache.phone = null; } }; // t is a reference to a MobileDetect instance impl.mobileGrade = function (t) { // impl note: // To keep in sync w/ Mobile_Detect.php easily, the following code is tightly aligned to the PHP version. // When changes are made in Mobile_Detect.php, copy this method and replace: // $this-> / t. // self::MOBILE_GRADE_(.) / '$1' // , self::VERSION_TYPE_FLOAT / (nothing) // isIOS() / os('iOS') // [reg] / (nothing) <-- jsdelivr complaining about unescaped unicode character U+00AE var $isMobile = t.mobile() !== null; if ( // Apple iOS 3.2-5.1 - Tested on the original iPad (4.3 / 5.0), iPad 2 (4.3), iPad 3 (5.1), original iPhone (3.1), iPhone 3 (3.2), 3GS (4.3), 4 (4.3 / 5.0), and 4S (5.1) t.os('iOS') && t.version('iPad')>=4.3 || t.os('iOS') && t.version('iPhone')>=3.1 || t.os('iOS') && t.version('iPod')>=3.1 || // Android 2.1-2.3 - Tested on the HTC Incredible (2.2), original Droid (2.2), HTC Aria (2.1), Google Nexus S (2.3). Functional on 1.5 & 1.6 but performance may be sluggish, tested on Google G1 (1.5) // Android 3.1 (Honeycomb) - Tested on the Samsung Galaxy Tab 10.1 and Motorola XOOM // Android 4.0 (ICS) - Tested on a Galaxy Nexus. Note: transition performance can be poor on upgraded devices // Android 4.1 (Jelly Bean) - Tested on a Galaxy Nexus and Galaxy 7 ( t.version('Android')>2.1 && t.is('Webkit') ) || // Windows Phone 7-7.5 - Tested on the HTC Surround (7.0) HTC Trophy (7.5), LG-E900 (7.5), Nokia Lumia 800 t.version('Windows Phone OS')>=7.0 || // Blackberry 7 - Tested on BlackBerry Torch 9810 // Blackberry 6.0 - Tested on the Torch 9800 and Style 9670 t.is('BlackBerry') && t.version('BlackBerry')>=6.0 || // Blackberry Playbook (1.0-2.0) - Tested on PlayBook t.match('Playbook.*Tablet') || // Palm WebOS (1.4-2.0) - Tested on the Palm Pixi (1.4), Pre (1.4), Pre 2 (2.0) ( t.version('webOS')>=1.4 && t.match('Palm|Pre|Pixi') ) || // Palm WebOS 3.0 - Tested on HP TouchPad t.match('hp.*TouchPad') || // Firefox Mobile (12 Beta) - Tested on Android 2.3 device ( t.is('Firefox') && t.version('Firefox')>=12 ) || // Chrome for Android - Tested on Android 4.0, 4.1 device ( t.is('Chrome') && t.is('AndroidOS') && t.version('Android')>=4.0 ) || // Skyfire 4.1 - Tested on Android 2.3 device ( t.is('Skyfire') && t.version('Skyfire')>=4.1 && t.is('AndroidOS') && t.version('Android')>=2.3 ) || // Opera Mobile 11.5-12: Tested on Android 2.3 ( t.is('Opera') && t.version('Opera Mobi')>11 && t.is('AndroidOS') ) || // Meego 1.2 - Tested on Nokia 950 and N9 t.is('MeeGoOS') || // Tizen (pre-release) - Tested on early hardware t.is('Tizen') || // Samsung Bada 2.0 - Tested on a Samsung Wave 3, Dolphin browser // @todo: more tests here! t.is('Dolfin') && t.version('Bada')>=2.0 || // UC Browser - Tested on Android 2.3 device ( (t.is('UC Browser') || t.is('Dolfin')) && t.version('Android')>=2.3 ) || // Kindle 3 and Fire - Tested on the built-in WebKit browser for each ( t.match('Kindle Fire') || t.is('Kindle') && t.version('Kindle')>=3.0 ) || // Nook Color 1.4.1 - Tested on original Nook Color, not Nook Tablet t.is('AndroidOS') && t.is('NookTablet') || // Chrome Desktop 11-21 - Tested on OS X 10.7 and Windows 7 t.version('Chrome')>=11 && !$isMobile || // Safari Desktop 4-5 - Tested on OS X 10.7 and Windows 7 t.version('Safari')>=5.0 && !$isMobile || // Firefox Desktop 4-13 - Tested on OS X 10.7 and Windows 7 t.version('Firefox')>=4.0 && !$isMobile || // Internet Explorer 7-9 - Tested on Windows XP, Vista and 7 t.version('MSIE')>=7.0 && !$isMobile || // Opera Desktop 10-12 - Tested on OS X 10.7 and Windows 7 // @reference: http://my.opera.com/community/openweb/idopera/ t.version('Opera')>=10 && !$isMobile ){ return 'A'; } if ( t.os('iOS') && t.version('iPad')<4.3 || t.os('iOS') && t.version('iPhone')<3.1 || t.os('iOS') && t.version('iPod')<3.1 || // Blackberry 5.0: Tested on the Storm 2 9550, Bold 9770 t.is('Blackberry') && t.version('BlackBerry')>=5 && t.version('BlackBerry')<6 || //Opera Mini (5.0-6.5) - Tested on iOS 3.2/4.3 and Android 2.3 ( t.version('Opera Mini')>=5.0 && t.version('Opera Mini')<=6.5 && (t.version('Android')>=2.3 || t.is('iOS')) ) || // Nokia Symbian^3 - Tested on Nokia N8 (Symbian^3), C7 (Symbian^3), also works on N97 (Symbian^1) t.match('NokiaN8|NokiaC7|N97.*Series60|Symbian/3') || // @todo: report this (tested on Nokia N71) t.version('Opera Mobi')>=11 && t.is('SymbianOS') ){ return 'B'; } if ( // Blackberry 4.x - Tested on the Curve 8330 t.version('BlackBerry')<5.0 || // Windows Mobile - Tested on the HTC Leo (WinMo 5.2) t.match('MSIEMobile|Windows CE.*Mobile') || t.version('Windows Mobile')<=5.2 ){ return 'C'; } //All older smartphone platforms and featurephones - Any device that doesn't support media queries //will receive the basic, C grade experience. return 'C'; }; impl.detectOS = function (ua) { return impl.findMatch(impl.mobileDetectRules.oss0, ua) || impl.findMatch(impl.mobileDetectRules.oss, ua); }; impl.getDeviceSmallerSide = function () { return window.screen.width < window.screen.height ? window.screen.width : window.screen.height; }; /** * Constructor for MobileDetect object. *
* Such an object will keep a reference to the given user-agent string and cache most of the detect queries.
*
* Find information how to download and install: * github.com/hgoebl/mobile-detect.js/ *
* * @example 
     *     var md = new MobileDetect(window.navigator.userAgent);     *     if (md.mobile()) {     *         location.href = (md.mobileGrade() === 'A') ? '/mobile/' : '/lynx/';     *     }     *
* * @param {string} userAgent typically taken from window.navigator.userAgent or http_header['User-Agent'] * @param {number} [maxPhoneWidth=600] only for browsers specify a value for the maximum * width of smallest device side (in logical "CSS" pixels) until a device detected as mobile will be handled * as phone. * This is only used in cases where the device cannot be classified as phone or tablet.
* See Declaring Tablet Layouts * for Android.
* If you provide a value < 0, then this "fuzzy" check is disabled. * @constructor * @global */ function MobileDetect(userAgent, maxPhoneWidth) { this.ua = userAgent || ''; this._cache = {}; //600dp is typical 7" tablet minimum width this.maxPhoneWidth = maxPhoneWidth || 600; } MobileDetect.prototype = { constructor: MobileDetect, /** * Returns the detected phone or tablet type or null if it is not a mobile device. *
* For a list of possible return values see {@link MobileDetect#phone} and {@link MobileDetect#tablet}.
*
* If the device is not detected by the regular expressions from Mobile-Detect, a test is made against * the patterns of detectmobilebrowsers.com. If this test * is positive, a value of UnknownPhone, UnknownTablet or * UnknownMobile is returned.
* When used in browser, the decision whether phone or tablet is made based on screen.width/height.
*
* When used server-side (node.js), there is no way to tell the difference between UnknownTablet * and UnknownMobile, so you will get UnknownMobile here.
* Be aware that since v1.0.0 in this special case you will get UnknownMobile only for: * {@link MobileDetect#mobile}, not for {@link MobileDetect#phone} and {@link MobileDetect#tablet}. * In versions before v1.0.0 all 3 methods returned UnknownMobile which was tedious to use. *
* In most cases you will use the return value just as a boolean. * * @returns {String} the key for the phone family or tablet family, e.g. "Nexus". * @function MobileDetect#mobile */ mobile: function () { impl.prepareDetectionCache(this._cache, this.ua, this.maxPhoneWidth); return this._cache.mobile; }, /** * Returns the detected phone type/family string or null. *
* The returned tablet (family or producer) is one of following keys:
*
iPhone, BlackBerry, HTC, Nexus, Dell, Motorola, Samsung, LG, Sony, Asus, * NokiaLumia, Micromax, Palm, Vertu, Pantech, Fly, Wiko, iMobile, SimValley, * Wolfgang, Alcatel, Nintendo, Amoi, INQ, GenericPhone
*
* If the device is not detected by the regular expressions from Mobile-Detect, a test is made against * the patterns of detectmobilebrowsers.com. If this test * is positive, a value of UnknownPhone or UnknownMobile is returned.
* When used in browser, the decision whether phone or tablet is made based on screen.width/height.
*
* When used server-side (node.js), there is no way to tell the difference between UnknownTablet * and UnknownMobile, so you will get null here, while {@link MobileDetect#mobile} * will return UnknownMobile.
* Be aware that since v1.0.0 in this special case you will get UnknownMobile only for: * {@link MobileDetect#mobile}, not for {@link MobileDetect#phone} and {@link MobileDetect#tablet}. * In versions before v1.0.0 all 3 methods returned UnknownMobile which was tedious to use. *
* In most cases you will use the return value just as a boolean. * * @returns {String} the key of the phone family or producer, e.g. "iPhone" * @function MobileDetect#phone */ phone: function () { impl.prepareDetectionCache(this._cache, this.ua, this.maxPhoneWidth); return this._cache.phone; }, /** * Returns the detected tablet type/family string or null. *
* The returned tablet (family or producer) is one of following keys:
*
iPad, NexusTablet, SamsungTablet, Kindle, SurfaceTablet, HPTablet, AsusTablet, * BlackBerryTablet, HTCtablet, MotorolaTablet, NookTablet, AcerTablet, * ToshibaTablet, LGTablet, FujitsuTablet, PrestigioTablet, LenovoTablet, * DellTablet, YarvikTablet, MedionTablet, ArnovaTablet, IntensoTablet, IRUTablet, * MegafonTablet, EbodaTablet, AllViewTablet, ArchosTablet, AinolTablet, * NokiaLumiaTablet, SonyTablet, PhilipsTablet, CubeTablet, CobyTablet, MIDTablet, * MSITablet, SMiTTablet, RockChipTablet, FlyTablet, bqTablet, HuaweiTablet, * NecTablet, PantechTablet, BronchoTablet, VersusTablet, ZyncTablet, * PositivoTablet, NabiTablet, KoboTablet, DanewTablet, TexetTablet, * PlaystationTablet, TrekstorTablet, PyleAudioTablet, AdvanTablet, * DanyTechTablet, GalapadTablet, MicromaxTablet, KarbonnTablet, AllFineTablet, * PROSCANTablet, YONESTablet, ChangJiaTablet, GUTablet, PointOfViewTablet, * OvermaxTablet, HCLTablet, DPSTablet, VistureTablet, CrestaTablet, * MediatekTablet, ConcordeTablet, GoCleverTablet, ModecomTablet, VoninoTablet, * ECSTablet, StorexTablet, VodafoneTablet, EssentielBTablet, RossMoorTablet, * iMobileTablet, TolinoTablet, AudioSonicTablet, AMPETablet, SkkTablet, * TecnoTablet, JXDTablet, iJoyTablet, FX2Tablet, XoroTablet, ViewsonicTablet, * OdysTablet, CaptivaTablet, IconbitTablet, TeclastTablet, OndaTablet, * JaytechTablet, BlaupunktTablet, DigmaTablet, EvolioTablet, LavaTablet, * AocTablet, MpmanTablet, CelkonTablet, WolderTablet, MiTablet, NibiruTablet, * NexoTablet, LeaderTablet, UbislateTablet, PocketBookTablet, KocasoTablet, Hudl, * TelstraTablet, GenericTablet
*
* If the device is not detected by the regular expressions from Mobile-Detect, a test is made against * the patterns of detectmobilebrowsers.com. If this test * is positive, a value of UnknownTablet or UnknownMobile is returned.
* When used in browser, the decision whether phone or tablet is made based on screen.width/height.
*
* When used server-side (node.js), there is no way to tell the difference between UnknownTablet * and UnknownMobile, so you will get null here, while {@link MobileDetect#mobile} * will return UnknownMobile.
* Be aware that since v1.0.0 in this special case you will get UnknownMobile only for: * {@link MobileDetect#mobile}, not for {@link MobileDetect#phone} and {@link MobileDetect#tablet}. * In versions before v1.0.0 all 3 methods returned UnknownMobile which was tedious to use. *
* In most cases you will use the return value just as a boolean. * * @returns {String} the key of the tablet family or producer, e.g. "SamsungTablet" * @function MobileDetect#tablet */ tablet: function () { impl.prepareDetectionCache(this._cache, this.ua, this.maxPhoneWidth); return this._cache.tablet; }, /** * Returns the (first) detected user-agent string or null. *
* The returned user-agent is one of following keys:
*
Vivaldi, Chrome, Dolfin, Opera, Skyfire, Edge, IE, Firefox, Bolt, TeaShark, * Blazer, Safari, Tizen, UCBrowser, baiduboxapp, baidubrowser, DiigoBrowser, * Puffin, Mercury, ObigoBrowser, NetFront, GenericBrowser, PaleMoon
*
* In most cases calling {@link MobileDetect#userAgent} will be sufficient. But there are rare * cases where a mobile device pretends to be more than one particular browser. You can get the * list of all matches with {@link MobileDetect#userAgents} or check for a particular value by * providing one of the defined keys as first argument to {@link MobileDetect#is}. * * @returns {String} the key for the detected user-agent or null * @function MobileDetect#userAgent */ userAgent: function () { if (this._cache.userAgent === undefined) { this._cache.userAgent = impl.findMatch(impl.mobileDetectRules.uas, this.ua); } return this._cache.userAgent; }, /** * Returns all detected user-agent strings. *
* The array is empty or contains one or more of following keys:
*
Vivaldi, Chrome, Dolfin, Opera, Skyfire, Edge, IE, Firefox, Bolt, TeaShark, * Blazer, Safari, Tizen, UCBrowser, baiduboxapp, baidubrowser, DiigoBrowser, * Puffin, Mercury, ObigoBrowser, NetFront, GenericBrowser, PaleMoon
*
* In most cases calling {@link MobileDetect#userAgent} will be sufficient. But there are rare * cases where a mobile device pretends to be more than one particular browser. You can get the * list of all matches with {@link MobileDetect#userAgents} or check for a particular value by * providing one of the defined keys as first argument to {@link MobileDetect#is}. * * @returns {Array} the array of detected user-agent keys or [] * @function MobileDetect#userAgents */ userAgents: function () { if (this._cache.userAgents === undefined) { this._cache.userAgents = impl.findMatches(impl.mobileDetectRules.uas, this.ua); } return this._cache.userAgents; }, /** * Returns the detected operating system string or null. *
* The operating system is one of following keys:
*
AndroidOS, BlackBerryOS, PalmOS, SymbianOS, WindowsMobileOS, WindowsPhoneOS, * iOS, MeeGoOS, MaemoOS, JavaOS, webOS, badaOS, BREWOS
* * @returns {String} the key for the detected operating system. * @function MobileDetect#os */ os: function () { if (this._cache.os === undefined) { this._cache.os = impl.detectOS(this.ua); } return this._cache.os; }, /** * Get the version (as Number) of the given property in the User-Agent. *
* Will return a float number. (eg. 2_0 will return 2.0, 4.3.1 will return 4.31) * * @param {String} key a key defining a thing which has a version.
* You can use one of following keys:
*
Mobile, Build, Version, VendorID, iPad, iPhone, iPod, Kindle, Chrome, Coast, * Dolfin, Firefox, Fennec, Edge, IE, NetFront, NokiaBrowser, Opera, Opera Mini, * Opera Mobi, UC Browser, MQQBrowser, MicroMessenger, baiduboxapp, baidubrowser, * Iron, Safari, Skyfire, Tizen, Webkit, PaleMoon, Gecko, Trident, Presto, Goanna, * iOS, Android, BlackBerry, BREW, Java, Windows Phone OS, Windows Phone, Windows * CE, Windows NT, Symbian, webOS
* * @returns {Number} the version as float or NaN if User-Agent doesn't contain this version. * Be careful when comparing this value with '==' operator! * @function MobileDetect#version */ version: function (key) { return impl.getVersion(key, this.ua); }, /** * Get the version (as String) of the given property in the User-Agent. *
* * @param {String} key a key defining a thing which has a version.
* You can use one of following keys:
*
Mobile, Build, Version, VendorID, iPad, iPhone, iPod, Kindle, Chrome, Coast, * Dolfin, Firefox, Fennec, Edge, IE, NetFront, NokiaBrowser, Opera, Opera Mini, * Opera Mobi, UC Browser, MQQBrowser, MicroMessenger, baiduboxapp, baidubrowser, * Iron, Safari, Skyfire, Tizen, Webkit, PaleMoon, Gecko, Trident, Presto, Goanna, * iOS, Android, BlackBerry, BREW, Java, Windows Phone OS, Windows Phone, Windows * CE, Windows NT, Symbian, webOS
* * @returns {String} the "raw" version as String or null if User-Agent doesn't contain this version. * * @function MobileDetect#versionStr */ versionStr: function (key) { return impl.getVersionStr(key, this.ua); }, /** * Global test key against userAgent, os, phone, tablet and some other properties of userAgent string. * * @param {String} key the key (case-insensitive) of a userAgent, an operating system, phone or * tablet family.
* For a complete list of possible values, see {@link MobileDetect#userAgent}, * {@link MobileDetect#os}, {@link MobileDetect#phone}, {@link MobileDetect#tablet}.
* Additionally you have following keys:
*
Bot, MobileBot, DesktopMode, TV, WebKit, Console, Watch
* * @returns {boolean} true when the given key is one of the defined keys of userAgent, os, phone, * tablet or one of the listed additional keys, otherwise false * @function MobileDetect#is */ is: function (key) { return containsIC(this.userAgents(), key) || equalIC(key, this.os()) || equalIC(key, this.phone()) || equalIC(key, this.tablet()) || containsIC(impl.findMatches(impl.mobileDetectRules.utils, this.ua), key); }, /** * Do a quick test against navigator::userAgent. * * @param {String|RegExp} pattern the pattern, either as String or RegExp * (a string will be converted to a case-insensitive RegExp). * @returns {boolean} true when the pattern matches, otherwise false * @function MobileDetect#match */ match: function (pattern) { if (!(pattern instanceof RegExp)) { pattern = new RegExp(pattern, 'i'); } return pattern.test(this.ua); }, /** * Checks whether the mobile device can be considered as phone regarding screen.width. *
* Obviously this method makes sense in browser environments only (not for Node.js)! * @param {number} [maxPhoneWidth] the maximum logical pixels (aka. CSS-pixels) to be considered as phone.
* The argument is optional and if not present or falsy, the value of the constructor is taken. * @returns {boolean|undefined} undefined if screen size wasn't detectable, else true * when screen.width is less or equal to maxPhoneWidth, otherwise false.
* Will always return undefined server-side. */ isPhoneSized: function (maxPhoneWidth) { return MobileDetect.isPhoneSized(maxPhoneWidth || this.maxPhoneWidth); }, /** * Returns the mobile grade ('A', 'B', 'C'). * * @returns {String} one of the mobile grades ('A', 'B', 'C'). * @function MobileDetect#mobileGrade */ mobileGrade: function () { if (this._cache.grade === undefined) { this._cache.grade = impl.mobileGrade(this); } return this._cache.grade; } }; // environment-dependent if (typeof window !== 'undefined' && window.screen) { MobileDetect.isPhoneSized = function (maxPhoneWidth) { return maxPhoneWidth < 0 ? undefined : impl.getDeviceSmallerSide() <= maxPhoneWidth; }; } else { MobileDetect.isPhoneSized = function () {}; } // should not be replaced by a completely new object - just overwrite existing methods MobileDetect._impl = impl; MobileDetect.version = '1.3.3 2016-07-31'; return MobileDetect;}); // end of call of define()}) : (define: any, undefined?: any) => void +>(function (define, undefined) {define(function () { 'use strict'; var impl = {}; impl.mobileDetectRules = { "phones": { "iPhone": "\\biPhone\\b|\\biPod\\b", "BlackBerry": "BlackBerry|\\bBB10\\b|rim[0-9]+", "HTC": "HTC|HTC.*(Sensation|Evo|Vision|Explorer|6800|8100|8900|A7272|S510e|C110e|Legend|Desire|T8282)|APX515CKT|Qtek9090|APA9292KT|HD_mini|Sensation.*Z710e|PG86100|Z715e|Desire.*(A8181|HD)|ADR6200|ADR6400L|ADR6425|001HT|Inspire 4G|Android.*\\bEVO\\b|T-Mobile G1|Z520m", "Nexus": "Nexus One|Nexus S|Galaxy.*Nexus|Android.*Nexus.*Mobile|Nexus 4|Nexus 5|Nexus 6", "Dell": "Dell.*Streak|Dell.*Aero|Dell.*Venue|DELL.*Venue Pro|Dell Flash|Dell Smoke|Dell Mini 3iX|XCD28|XCD35|\\b001DL\\b|\\b101DL\\b|\\bGS01\\b", "Motorola": "Motorola|DROIDX|DROID BIONIC|\\bDroid\\b.*Build|Android.*Xoom|HRI39|MOT-|A1260|A1680|A555|A853|A855|A953|A955|A956|Motorola.*ELECTRIFY|Motorola.*i1|i867|i940|MB200|MB300|MB501|MB502|MB508|MB511|MB520|MB525|MB526|MB611|MB612|MB632|MB810|MB855|MB860|MB861|MB865|MB870|ME501|ME502|ME511|ME525|ME600|ME632|ME722|ME811|ME860|ME863|ME865|MT620|MT710|MT716|MT720|MT810|MT870|MT917|Motorola.*TITANIUM|WX435|WX445|XT300|XT301|XT311|XT316|XT317|XT319|XT320|XT390|XT502|XT530|XT531|XT532|XT535|XT603|XT610|XT611|XT615|XT681|XT701|XT702|XT711|XT720|XT800|XT806|XT860|XT862|XT875|XT882|XT883|XT894|XT901|XT907|XT909|XT910|XT912|XT928|XT926|XT915|XT919|XT925|XT1021|\\bMoto E\\b", "Samsung": "Samsung|SM-G9250|GT-19300|SGH-I337|BGT-S5230|GT-B2100|GT-B2700|GT-B2710|GT-B3210|GT-B3310|GT-B3410|GT-B3730|GT-B3740|GT-B5510|GT-B5512|GT-B5722|GT-B6520|GT-B7300|GT-B7320|GT-B7330|GT-B7350|GT-B7510|GT-B7722|GT-B7800|GT-C3010|GT-C3011|GT-C3060|GT-C3200|GT-C3212|GT-C3212I|GT-C3262|GT-C3222|GT-C3300|GT-C3300K|GT-C3303|GT-C3303K|GT-C3310|GT-C3322|GT-C3330|GT-C3350|GT-C3500|GT-C3510|GT-C3530|GT-C3630|GT-C3780|GT-C5010|GT-C5212|GT-C6620|GT-C6625|GT-C6712|GT-E1050|GT-E1070|GT-E1075|GT-E1080|GT-E1081|GT-E1085|GT-E1087|GT-E1100|GT-E1107|GT-E1110|GT-E1120|GT-E1125|GT-E1130|GT-E1160|GT-E1170|GT-E1175|GT-E1180|GT-E1182|GT-E1200|GT-E1210|GT-E1225|GT-E1230|GT-E1390|GT-E2100|GT-E2120|GT-E2121|GT-E2152|GT-E2220|GT-E2222|GT-E2230|GT-E2232|GT-E2250|GT-E2370|GT-E2550|GT-E2652|GT-E3210|GT-E3213|GT-I5500|GT-I5503|GT-I5700|GT-I5800|GT-I5801|GT-I6410|GT-I6420|GT-I7110|GT-I7410|GT-I7500|GT-I8000|GT-I8150|GT-I8160|GT-I8190|GT-I8320|GT-I8330|GT-I8350|GT-I8530|GT-I8700|GT-I8703|GT-I8910|GT-I9000|GT-I9001|GT-I9003|GT-I9010|GT-I9020|GT-I9023|GT-I9070|GT-I9082|GT-I9100|GT-I9103|GT-I9220|GT-I9250|GT-I9300|GT-I9305|GT-I9500|GT-I9505|GT-M3510|GT-M5650|GT-M7500|GT-M7600|GT-M7603|GT-M8800|GT-M8910|GT-N7000|GT-S3110|GT-S3310|GT-S3350|GT-S3353|GT-S3370|GT-S3650|GT-S3653|GT-S3770|GT-S3850|GT-S5210|GT-S5220|GT-S5229|GT-S5230|GT-S5233|GT-S5250|GT-S5253|GT-S5260|GT-S5263|GT-S5270|GT-S5300|GT-S5330|GT-S5350|GT-S5360|GT-S5363|GT-S5369|GT-S5380|GT-S5380D|GT-S5560|GT-S5570|GT-S5600|GT-S5603|GT-S5610|GT-S5620|GT-S5660|GT-S5670|GT-S5690|GT-S5750|GT-S5780|GT-S5830|GT-S5839|GT-S6102|GT-S6500|GT-S7070|GT-S7200|GT-S7220|GT-S7230|GT-S7233|GT-S7250|GT-S7500|GT-S7530|GT-S7550|GT-S7562|GT-S7710|GT-S8000|GT-S8003|GT-S8500|GT-S8530|GT-S8600|SCH-A310|SCH-A530|SCH-A570|SCH-A610|SCH-A630|SCH-A650|SCH-A790|SCH-A795|SCH-A850|SCH-A870|SCH-A890|SCH-A930|SCH-A950|SCH-A970|SCH-A990|SCH-I100|SCH-I110|SCH-I400|SCH-I405|SCH-I500|SCH-I510|SCH-I515|SCH-I600|SCH-I730|SCH-I760|SCH-I770|SCH-I830|SCH-I910|SCH-I920|SCH-I959|SCH-LC11|SCH-N150|SCH-N300|SCH-R100|SCH-R300|SCH-R351|SCH-R400|SCH-R410|SCH-T300|SCH-U310|SCH-U320|SCH-U350|SCH-U360|SCH-U365|SCH-U370|SCH-U380|SCH-U410|SCH-U430|SCH-U450|SCH-U460|SCH-U470|SCH-U490|SCH-U540|SCH-U550|SCH-U620|SCH-U640|SCH-U650|SCH-U660|SCH-U700|SCH-U740|SCH-U750|SCH-U810|SCH-U820|SCH-U900|SCH-U940|SCH-U960|SCS-26UC|SGH-A107|SGH-A117|SGH-A127|SGH-A137|SGH-A157|SGH-A167|SGH-A177|SGH-A187|SGH-A197|SGH-A227|SGH-A237|SGH-A257|SGH-A437|SGH-A517|SGH-A597|SGH-A637|SGH-A657|SGH-A667|SGH-A687|SGH-A697|SGH-A707|SGH-A717|SGH-A727|SGH-A737|SGH-A747|SGH-A767|SGH-A777|SGH-A797|SGH-A817|SGH-A827|SGH-A837|SGH-A847|SGH-A867|SGH-A877|SGH-A887|SGH-A897|SGH-A927|SGH-B100|SGH-B130|SGH-B200|SGH-B220|SGH-C100|SGH-C110|SGH-C120|SGH-C130|SGH-C140|SGH-C160|SGH-C170|SGH-C180|SGH-C200|SGH-C207|SGH-C210|SGH-C225|SGH-C230|SGH-C417|SGH-C450|SGH-D307|SGH-D347|SGH-D357|SGH-D407|SGH-D415|SGH-D780|SGH-D807|SGH-D980|SGH-E105|SGH-E200|SGH-E315|SGH-E316|SGH-E317|SGH-E335|SGH-E590|SGH-E635|SGH-E715|SGH-E890|SGH-F300|SGH-F480|SGH-I200|SGH-I300|SGH-I320|SGH-I550|SGH-I577|SGH-I600|SGH-I607|SGH-I617|SGH-I627|SGH-I637|SGH-I677|SGH-I700|SGH-I717|SGH-I727|SGH-i747M|SGH-I777|SGH-I780|SGH-I827|SGH-I847|SGH-I857|SGH-I896|SGH-I897|SGH-I900|SGH-I907|SGH-I917|SGH-I927|SGH-I937|SGH-I997|SGH-J150|SGH-J200|SGH-L170|SGH-L700|SGH-M110|SGH-M150|SGH-M200|SGH-N105|SGH-N500|SGH-N600|SGH-N620|SGH-N625|SGH-N700|SGH-N710|SGH-P107|SGH-P207|SGH-P300|SGH-P310|SGH-P520|SGH-P735|SGH-P777|SGH-Q105|SGH-R210|SGH-R220|SGH-R225|SGH-S105|SGH-S307|SGH-T109|SGH-T119|SGH-T139|SGH-T209|SGH-T219|SGH-T229|SGH-T239|SGH-T249|SGH-T259|SGH-T309|SGH-T319|SGH-T329|SGH-T339|SGH-T349|SGH-T359|SGH-T369|SGH-T379|SGH-T409|SGH-T429|SGH-T439|SGH-T459|SGH-T469|SGH-T479|SGH-T499|SGH-T509|SGH-T519|SGH-T539|SGH-T559|SGH-T589|SGH-T609|SGH-T619|SGH-T629|SGH-T639|SGH-T659|SGH-T669|SGH-T679|SGH-T709|SGH-T719|SGH-T729|SGH-T739|SGH-T746|SGH-T749|SGH-T759|SGH-T769|SGH-T809|SGH-T819|SGH-T839|SGH-T919|SGH-T929|SGH-T939|SGH-T959|SGH-T989|SGH-U100|SGH-U200|SGH-U800|SGH-V205|SGH-V206|SGH-X100|SGH-X105|SGH-X120|SGH-X140|SGH-X426|SGH-X427|SGH-X475|SGH-X495|SGH-X497|SGH-X507|SGH-X600|SGH-X610|SGH-X620|SGH-X630|SGH-X700|SGH-X820|SGH-X890|SGH-Z130|SGH-Z150|SGH-Z170|SGH-ZX10|SGH-ZX20|SHW-M110|SPH-A120|SPH-A400|SPH-A420|SPH-A460|SPH-A500|SPH-A560|SPH-A600|SPH-A620|SPH-A660|SPH-A700|SPH-A740|SPH-A760|SPH-A790|SPH-A800|SPH-A820|SPH-A840|SPH-A880|SPH-A900|SPH-A940|SPH-A960|SPH-D600|SPH-D700|SPH-D710|SPH-D720|SPH-I300|SPH-I325|SPH-I330|SPH-I350|SPH-I500|SPH-I600|SPH-I700|SPH-L700|SPH-M100|SPH-M220|SPH-M240|SPH-M300|SPH-M305|SPH-M320|SPH-M330|SPH-M350|SPH-M360|SPH-M370|SPH-M380|SPH-M510|SPH-M540|SPH-M550|SPH-M560|SPH-M570|SPH-M580|SPH-M610|SPH-M620|SPH-M630|SPH-M800|SPH-M810|SPH-M850|SPH-M900|SPH-M910|SPH-M920|SPH-M930|SPH-N100|SPH-N200|SPH-N240|SPH-N300|SPH-N400|SPH-Z400|SWC-E100|SCH-i909|GT-N7100|GT-N7105|SCH-I535|SM-N900A|SGH-I317|SGH-T999L|GT-S5360B|GT-I8262|GT-S6802|GT-S6312|GT-S6310|GT-S5312|GT-S5310|GT-I9105|GT-I8510|GT-S6790N|SM-G7105|SM-N9005|GT-S5301|GT-I9295|GT-I9195|SM-C101|GT-S7392|GT-S7560|GT-B7610|GT-I5510|GT-S7582|GT-S7530E|GT-I8750|SM-G9006V|SM-G9008V|SM-G9009D|SM-G900A|SM-G900D|SM-G900F|SM-G900H|SM-G900I|SM-G900J|SM-G900K|SM-G900L|SM-G900M|SM-G900P|SM-G900R4|SM-G900S|SM-G900T|SM-G900V|SM-G900W8|SHV-E160K|SCH-P709|SCH-P729|SM-T2558|GT-I9205|SM-G9350|SM-J120F", "LG": "\\bLG\\b;|LG[- ]?(C800|C900|E400|E610|E900|E-900|F160|F180K|F180L|F180S|730|855|L160|LS740|LS840|LS970|LU6200|MS690|MS695|MS770|MS840|MS870|MS910|P500|P700|P705|VM696|AS680|AS695|AX840|C729|E970|GS505|272|C395|E739BK|E960|L55C|L75C|LS696|LS860|P769BK|P350|P500|P509|P870|UN272|US730|VS840|VS950|LN272|LN510|LS670|LS855|LW690|MN270|MN510|P509|P769|P930|UN200|UN270|UN510|UN610|US670|US740|US760|UX265|UX840|VN271|VN530|VS660|VS700|VS740|VS750|VS910|VS920|VS930|VX9200|VX11000|AX840A|LW770|P506|P925|P999|E612|D955|D802|MS323)", "Sony": "SonyST|SonyLT|SonyEricsson|SonyEricssonLT15iv|LT18i|E10i|LT28h|LT26w|SonyEricssonMT27i|C5303|C6902|C6903|C6906|C6943|D2533", "Asus": "Asus.*Galaxy|PadFone.*Mobile", "NokiaLumia": "Lumia [0-9]{3,4}", "Micromax": "Micromax.*\\b(A210|A92|A88|A72|A111|A110Q|A115|A116|A110|A90S|A26|A51|A35|A54|A25|A27|A89|A68|A65|A57|A90)\\b", "Palm": "PalmSource|Palm", "Vertu": "Vertu|Vertu.*Ltd|Vertu.*Ascent|Vertu.*Ayxta|Vertu.*Constellation(F|Quest)?|Vertu.*Monika|Vertu.*Signature", "Pantech": "PANTECH|IM-A850S|IM-A840S|IM-A830L|IM-A830K|IM-A830S|IM-A820L|IM-A810K|IM-A810S|IM-A800S|IM-T100K|IM-A725L|IM-A780L|IM-A775C|IM-A770K|IM-A760S|IM-A750K|IM-A740S|IM-A730S|IM-A720L|IM-A710K|IM-A690L|IM-A690S|IM-A650S|IM-A630K|IM-A600S|VEGA PTL21|PT003|P8010|ADR910L|P6030|P6020|P9070|P4100|P9060|P5000|CDM8992|TXT8045|ADR8995|IS11PT|P2030|P6010|P8000|PT002|IS06|CDM8999|P9050|PT001|TXT8040|P2020|P9020|P2000|P7040|P7000|C790", "Fly": "IQ230|IQ444|IQ450|IQ440|IQ442|IQ441|IQ245|IQ256|IQ236|IQ255|IQ235|IQ245|IQ275|IQ240|IQ285|IQ280|IQ270|IQ260|IQ250", "Wiko": "KITE 4G|HIGHWAY|GETAWAY|STAIRWAY|DARKSIDE|DARKFULL|DARKNIGHT|DARKMOON|SLIDE|WAX 4G|RAINBOW|BLOOM|SUNSET|GOA(?!nna)|LENNY|BARRY|IGGY|OZZY|CINK FIVE|CINK PEAX|CINK PEAX 2|CINK SLIM|CINK SLIM 2|CINK +|CINK KING|CINK PEAX|CINK SLIM|SUBLIM", "iMobile": "i-mobile (IQ|i-STYLE|idea|ZAA|Hitz)", "SimValley": "\\b(SP-80|XT-930|SX-340|XT-930|SX-310|SP-360|SP60|SPT-800|SP-120|SPT-800|SP-140|SPX-5|SPX-8|SP-100|SPX-8|SPX-12)\\b", "Wolfgang": "AT-B24D|AT-AS50HD|AT-AS40W|AT-AS55HD|AT-AS45q2|AT-B26D|AT-AS50Q", "Alcatel": "Alcatel", "Nintendo": "Nintendo 3DS", "Amoi": "Amoi", "INQ": "INQ", "GenericPhone": "Tapatalk|PDA;|SAGEM|\\bmmp\\b|pocket|\\bpsp\\b|symbian|Smartphone|smartfon|treo|up.browser|up.link|vodafone|\\bwap\\b|nokia|Series40|Series60|S60|SonyEricsson|N900|MAUI.*WAP.*Browser" }, "tablets": { "iPad": "iPad|iPad.*Mobile", "NexusTablet": "Android.*Nexus[\\s]+(7|9|10)", "SamsungTablet": "SAMSUNG.*Tablet|Galaxy.*Tab|SC-01C|GT-P1000|GT-P1003|GT-P1010|GT-P3105|GT-P6210|GT-P6800|GT-P6810|GT-P7100|GT-P7300|GT-P7310|GT-P7500|GT-P7510|SCH-I800|SCH-I815|SCH-I905|SGH-I957|SGH-I987|SGH-T849|SGH-T859|SGH-T869|SPH-P100|GT-P3100|GT-P3108|GT-P3110|GT-P5100|GT-P5110|GT-P6200|GT-P7320|GT-P7511|GT-N8000|GT-P8510|SGH-I497|SPH-P500|SGH-T779|SCH-I705|SCH-I915|GT-N8013|GT-P3113|GT-P5113|GT-P8110|GT-N8010|GT-N8005|GT-N8020|GT-P1013|GT-P6201|GT-P7501|GT-N5100|GT-N5105|GT-N5110|SHV-E140K|SHV-E140L|SHV-E140S|SHV-E150S|SHV-E230K|SHV-E230L|SHV-E230S|SHW-M180K|SHW-M180L|SHW-M180S|SHW-M180W|SHW-M300W|SHW-M305W|SHW-M380K|SHW-M380S|SHW-M380W|SHW-M430W|SHW-M480K|SHW-M480S|SHW-M480W|SHW-M485W|SHW-M486W|SHW-M500W|GT-I9228|SCH-P739|SCH-I925|GT-I9200|GT-P5200|GT-P5210|GT-P5210X|SM-T311|SM-T310|SM-T310X|SM-T210|SM-T210R|SM-T211|SM-P600|SM-P601|SM-P605|SM-P900|SM-P901|SM-T217|SM-T217A|SM-T217S|SM-P6000|SM-T3100|SGH-I467|XE500|SM-T110|GT-P5220|GT-I9200X|GT-N5110X|GT-N5120|SM-P905|SM-T111|SM-T2105|SM-T315|SM-T320|SM-T320X|SM-T321|SM-T520|SM-T525|SM-T530NU|SM-T230NU|SM-T330NU|SM-T900|XE500T1C|SM-P605V|SM-P905V|SM-T337V|SM-T537V|SM-T707V|SM-T807V|SM-P600X|SM-P900X|SM-T210X|SM-T230|SM-T230X|SM-T325|GT-P7503|SM-T531|SM-T330|SM-T530|SM-T705|SM-T705C|SM-T535|SM-T331|SM-T800|SM-T700|SM-T537|SM-T807|SM-P907A|SM-T337A|SM-T537A|SM-T707A|SM-T807A|SM-T237|SM-T807P|SM-P607T|SM-T217T|SM-T337T|SM-T807T|SM-T116NQ|SM-P550|SM-T350|SM-T550|SM-T9000|SM-P9000|SM-T705Y|SM-T805|GT-P3113|SM-T710|SM-T810|SM-T815|SM-T360|SM-T533|SM-T113|SM-T335|SM-T715|SM-T560|SM-T670|SM-T677|SM-T377|SM-T567|SM-T357T|SM-T555|SM-T561", "Kindle": "Kindle|Silk.*Accelerated|Android.*\\b(KFOT|KFTT|KFJWI|KFJWA|KFOTE|KFSOWI|KFTHWI|KFTHWA|KFAPWI|KFAPWA|WFJWAE|KFSAWA|KFSAWI|KFASWI|KFARWI)\\b", "SurfaceTablet": "Windows NT [0-9.]+; ARM;.*(Tablet|ARMBJS)", "HPTablet": "HP Slate (7|8|10)|HP ElitePad 900|hp-tablet|EliteBook.*Touch|HP 8|Slate 21|HP SlateBook 10", "AsusTablet": "^.*PadFone((?!Mobile).)*$|Transformer|TF101|TF101G|TF300T|TF300TG|TF300TL|TF700T|TF700KL|TF701T|TF810C|ME171|ME301T|ME302C|ME371MG|ME370T|ME372MG|ME172V|ME173X|ME400C|Slider SL101|\\bK00F\\b|\\bK00C\\b|\\bK00E\\b|\\bK00L\\b|TX201LA|ME176C|ME102A|\\bM80TA\\b|ME372CL|ME560CG|ME372CG|ME302KL| K010 | K017 |ME572C|ME103K|ME170C|ME171C|\\bME70C\\b|ME581C|ME581CL|ME8510C|ME181C|P01Y|PO1MA", "BlackBerryTablet": "PlayBook|RIM Tablet", "HTCtablet": "HTC_Flyer_P512|HTC Flyer|HTC Jetstream|HTC-P715a|HTC EVO View 4G|PG41200|PG09410", "MotorolaTablet": "xoom|sholest|MZ615|MZ605|MZ505|MZ601|MZ602|MZ603|MZ604|MZ606|MZ607|MZ608|MZ609|MZ615|MZ616|MZ617", "NookTablet": "Android.*Nook|NookColor|nook browser|BNRV200|BNRV200A|BNTV250|BNTV250A|BNTV400|BNTV600|LogicPD Zoom2", "AcerTablet": "Android.*; \\b(A100|A101|A110|A200|A210|A211|A500|A501|A510|A511|A700|A701|W500|W500P|W501|W501P|W510|W511|W700|G100|G100W|B1-A71|B1-710|B1-711|A1-810|A1-811|A1-830)\\b|W3-810|\\bA3-A10\\b|\\bA3-A11\\b|\\bA3-A20", "ToshibaTablet": "Android.*(AT100|AT105|AT200|AT205|AT270|AT275|AT300|AT305|AT1S5|AT500|AT570|AT700|AT830)|TOSHIBA.*FOLIO", "LGTablet": "\\bL-06C|LG-V909|LG-V900|LG-V700|LG-V510|LG-V500|LG-V410|LG-V400|LG-VK810\\b", "FujitsuTablet": "Android.*\\b(F-01D|F-02F|F-05E|F-10D|M532|Q572)\\b", "PrestigioTablet": "PMP3170B|PMP3270B|PMP3470B|PMP7170B|PMP3370B|PMP3570C|PMP5870C|PMP3670B|PMP5570C|PMP5770D|PMP3970B|PMP3870C|PMP5580C|PMP5880D|PMP5780D|PMP5588C|PMP7280C|PMP7280C3G|PMP7280|PMP7880D|PMP5597D|PMP5597|PMP7100D|PER3464|PER3274|PER3574|PER3884|PER5274|PER5474|PMP5097CPRO|PMP5097|PMP7380D|PMP5297C|PMP5297C_QUAD|PMP812E|PMP812E3G|PMP812F|PMP810E|PMP880TD|PMT3017|PMT3037|PMT3047|PMT3057|PMT7008|PMT5887|PMT5001|PMT5002", "LenovoTablet": "Lenovo TAB|Idea(Tab|Pad)( A1|A10| K1|)|ThinkPad([ ]+)?Tablet|YT3-X90L|YT3-X90F|YT3-X90X|Lenovo.*(S2109|S2110|S5000|S6000|K3011|A3000|A3500|A1000|A2107|A2109|A1107|A5500|A7600|B6000|B8000|B8080)(-|)(FL|F|HV|H|)", "DellTablet": "Venue 11|Venue 8|Venue 7|Dell Streak 10|Dell Streak 7", "YarvikTablet": "Android.*\\b(TAB210|TAB211|TAB224|TAB250|TAB260|TAB264|TAB310|TAB360|TAB364|TAB410|TAB411|TAB420|TAB424|TAB450|TAB460|TAB461|TAB464|TAB465|TAB467|TAB468|TAB07-100|TAB07-101|TAB07-150|TAB07-151|TAB07-152|TAB07-200|TAB07-201-3G|TAB07-210|TAB07-211|TAB07-212|TAB07-214|TAB07-220|TAB07-400|TAB07-485|TAB08-150|TAB08-200|TAB08-201-3G|TAB08-201-30|TAB09-100|TAB09-211|TAB09-410|TAB10-150|TAB10-201|TAB10-211|TAB10-400|TAB10-410|TAB13-201|TAB274EUK|TAB275EUK|TAB374EUK|TAB462EUK|TAB474EUK|TAB9-200)\\b", "MedionTablet": "Android.*\\bOYO\\b|LIFE.*(P9212|P9514|P9516|S9512)|LIFETAB", "ArnovaTablet": "AN10G2|AN7bG3|AN7fG3|AN8G3|AN8cG3|AN7G3|AN9G3|AN7dG3|AN7dG3ST|AN7dG3ChildPad|AN10bG3|AN10bG3DT|AN9G2", "IntensoTablet": "INM8002KP|INM1010FP|INM805ND|Intenso Tab|TAB1004", "IRUTablet": "M702pro", "MegafonTablet": "MegaFon V9|\\bZTE V9\\b|Android.*\\bMT7A\\b", "EbodaTablet": "E-Boda (Supreme|Impresspeed|Izzycomm|Essential)", "AllViewTablet": "Allview.*(Viva|Alldro|City|Speed|All TV|Frenzy|Quasar|Shine|TX1|AX1|AX2)", "ArchosTablet": "\\b(101G9|80G9|A101IT)\\b|Qilive 97R|Archos5|\\bARCHOS (70|79|80|90|97|101|FAMILYPAD|)(b|)(G10| Cobalt| TITANIUM(HD|)| Xenon| Neon|XSK| 2| XS 2| PLATINUM| CARBON|GAMEPAD)\\b", "AinolTablet": "NOVO7|NOVO8|NOVO10|Novo7Aurora|Novo7Basic|NOVO7PALADIN|novo9-Spark", "NokiaLumiaTablet": "Lumia 2520", "SonyTablet": "Sony.*Tablet|Xperia Tablet|Sony Tablet S|SO-03E|SGPT12|SGPT13|SGPT114|SGPT121|SGPT122|SGPT123|SGPT111|SGPT112|SGPT113|SGPT131|SGPT132|SGPT133|SGPT211|SGPT212|SGPT213|SGP311|SGP312|SGP321|EBRD1101|EBRD1102|EBRD1201|SGP351|SGP341|SGP511|SGP512|SGP521|SGP541|SGP551|SGP621|SGP612|SOT31", "PhilipsTablet": "\\b(PI2010|PI3000|PI3100|PI3105|PI3110|PI3205|PI3210|PI3900|PI4010|PI7000|PI7100)\\b", "CubeTablet": "Android.*(K8GT|U9GT|U10GT|U16GT|U17GT|U18GT|U19GT|U20GT|U23GT|U30GT)|CUBE U8GT", "CobyTablet": "MID1042|MID1045|MID1125|MID1126|MID7012|MID7014|MID7015|MID7034|MID7035|MID7036|MID7042|MID7048|MID7127|MID8042|MID8048|MID8127|MID9042|MID9740|MID9742|MID7022|MID7010", "MIDTablet": "M9701|M9000|M9100|M806|M1052|M806|T703|MID701|MID713|MID710|MID727|MID760|MID830|MID728|MID933|MID125|MID810|MID732|MID120|MID930|MID800|MID731|MID900|MID100|MID820|MID735|MID980|MID130|MID833|MID737|MID960|MID135|MID860|MID736|MID140|MID930|MID835|MID733|MID4X10", "MSITablet": "MSI \\b(Primo 73K|Primo 73L|Primo 81L|Primo 77|Primo 93|Primo 75|Primo 76|Primo 73|Primo 81|Primo 91|Primo 90|Enjoy 71|Enjoy 7|Enjoy 10)\\b", "SMiTTablet": "Android.*(\\bMID\\b|MID-560|MTV-T1200|MTV-PND531|MTV-P1101|MTV-PND530)", "RockChipTablet": "Android.*(RK2818|RK2808A|RK2918|RK3066)|RK2738|RK2808A", "FlyTablet": "IQ310|Fly Vision", "bqTablet": "Android.*(bq)?.*(Elcano|Curie|Edison|Maxwell|Kepler|Pascal|Tesla|Hypatia|Platon|Newton|Livingstone|Cervantes|Avant|Aquaris E10)|Maxwell.*Lite|Maxwell.*Plus", "HuaweiTablet": "MediaPad|MediaPad 7 Youth|IDEOS S7|S7-201c|S7-202u|S7-101|S7-103|S7-104|S7-105|S7-106|S7-201|S7-Slim", "NecTablet": "\\bN-06D|\\bN-08D", "PantechTablet": "Pantech.*P4100", "BronchoTablet": "Broncho.*(N701|N708|N802|a710)", "VersusTablet": "TOUCHPAD.*[78910]|\\bTOUCHTAB\\b", "ZyncTablet": "z1000|Z99 2G|z99|z930|z999|z990|z909|Z919|z900", "PositivoTablet": "TB07STA|TB10STA|TB07FTA|TB10FTA", "NabiTablet": "Android.*\\bNabi", "KoboTablet": "Kobo Touch|\\bK080\\b|\\bVox\\b Build|\\bArc\\b Build", "DanewTablet": "DSlide.*\\b(700|701R|702|703R|704|802|970|971|972|973|974|1010|1012)\\b", "TexetTablet": "NaviPad|TB-772A|TM-7045|TM-7055|TM-9750|TM-7016|TM-7024|TM-7026|TM-7041|TM-7043|TM-7047|TM-8041|TM-9741|TM-9747|TM-9748|TM-9751|TM-7022|TM-7021|TM-7020|TM-7011|TM-7010|TM-7023|TM-7025|TM-7037W|TM-7038W|TM-7027W|TM-9720|TM-9725|TM-9737W|TM-1020|TM-9738W|TM-9740|TM-9743W|TB-807A|TB-771A|TB-727A|TB-725A|TB-719A|TB-823A|TB-805A|TB-723A|TB-715A|TB-707A|TB-705A|TB-709A|TB-711A|TB-890HD|TB-880HD|TB-790HD|TB-780HD|TB-770HD|TB-721HD|TB-710HD|TB-434HD|TB-860HD|TB-840HD|TB-760HD|TB-750HD|TB-740HD|TB-730HD|TB-722HD|TB-720HD|TB-700HD|TB-500HD|TB-470HD|TB-431HD|TB-430HD|TB-506|TB-504|TB-446|TB-436|TB-416|TB-146SE|TB-126SE", "PlaystationTablet": "Playstation.*(Portable|Vita)", "TrekstorTablet": "ST10416-1|VT10416-1|ST70408-1|ST702xx-1|ST702xx-2|ST80208|ST97216|ST70104-2|VT10416-2|ST10216-2A|SurfTab", "PyleAudioTablet": "\\b(PTBL10CEU|PTBL10C|PTBL72BC|PTBL72BCEU|PTBL7CEU|PTBL7C|PTBL92BC|PTBL92BCEU|PTBL9CEU|PTBL9CUK|PTBL9C)\\b", "AdvanTablet": "Android.* \\b(E3A|T3X|T5C|T5B|T3E|T3C|T3B|T1J|T1F|T2A|T1H|T1i|E1C|T1-E|T5-A|T4|E1-B|T2Ci|T1-B|T1-D|O1-A|E1-A|T1-A|T3A|T4i)\\b ", "DanyTechTablet": "Genius Tab G3|Genius Tab S2|Genius Tab Q3|Genius Tab G4|Genius Tab Q4|Genius Tab G-II|Genius TAB GII|Genius TAB GIII|Genius Tab S1", "GalapadTablet": "Android.*\\bG1\\b", "MicromaxTablet": "Funbook|Micromax.*\\b(P250|P560|P360|P362|P600|P300|P350|P500|P275)\\b", "KarbonnTablet": "Android.*\\b(A39|A37|A34|ST8|ST10|ST7|Smart Tab3|Smart Tab2)\\b", "AllFineTablet": "Fine7 Genius|Fine7 Shine|Fine7 Air|Fine8 Style|Fine9 More|Fine10 Joy|Fine11 Wide", "PROSCANTablet": "\\b(PEM63|PLT1023G|PLT1041|PLT1044|PLT1044G|PLT1091|PLT4311|PLT4311PL|PLT4315|PLT7030|PLT7033|PLT7033D|PLT7035|PLT7035D|PLT7044K|PLT7045K|PLT7045KB|PLT7071KG|PLT7072|PLT7223G|PLT7225G|PLT7777G|PLT7810K|PLT7849G|PLT7851G|PLT7852G|PLT8015|PLT8031|PLT8034|PLT8036|PLT8080K|PLT8082|PLT8088|PLT8223G|PLT8234G|PLT8235G|PLT8816K|PLT9011|PLT9045K|PLT9233G|PLT9735|PLT9760G|PLT9770G)\\b", "YONESTablet": "BQ1078|BC1003|BC1077|RK9702|BC9730|BC9001|IT9001|BC7008|BC7010|BC708|BC728|BC7012|BC7030|BC7027|BC7026", "ChangJiaTablet": "TPC7102|TPC7103|TPC7105|TPC7106|TPC7107|TPC7201|TPC7203|TPC7205|TPC7210|TPC7708|TPC7709|TPC7712|TPC7110|TPC8101|TPC8103|TPC8105|TPC8106|TPC8203|TPC8205|TPC8503|TPC9106|TPC9701|TPC97101|TPC97103|TPC97105|TPC97106|TPC97111|TPC97113|TPC97203|TPC97603|TPC97809|TPC97205|TPC10101|TPC10103|TPC10106|TPC10111|TPC10203|TPC10205|TPC10503", "GUTablet": "TX-A1301|TX-M9002|Q702|kf026", "PointOfViewTablet": "TAB-P506|TAB-navi-7-3G-M|TAB-P517|TAB-P-527|TAB-P701|TAB-P703|TAB-P721|TAB-P731N|TAB-P741|TAB-P825|TAB-P905|TAB-P925|TAB-PR945|TAB-PL1015|TAB-P1025|TAB-PI1045|TAB-P1325|TAB-PROTAB[0-9]+|TAB-PROTAB25|TAB-PROTAB26|TAB-PROTAB27|TAB-PROTAB26XL|TAB-PROTAB2-IPS9|TAB-PROTAB30-IPS9|TAB-PROTAB25XXL|TAB-PROTAB26-IPS10|TAB-PROTAB30-IPS10", "OvermaxTablet": "OV-(SteelCore|NewBase|Basecore|Baseone|Exellen|Quattor|EduTab|Solution|ACTION|BasicTab|TeddyTab|MagicTab|Stream|TB-08|TB-09)", "HCLTablet": "HCL.*Tablet|Connect-3G-2.0|Connect-2G-2.0|ME Tablet U1|ME Tablet U2|ME Tablet G1|ME Tablet X1|ME Tablet Y2|ME Tablet Sync", "DPSTablet": "DPS Dream 9|DPS Dual 7", "VistureTablet": "V97 HD|i75 3G|Visture V4( HD)?|Visture V5( HD)?|Visture V10", "CrestaTablet": "CTP(-)?810|CTP(-)?818|CTP(-)?828|CTP(-)?838|CTP(-)?888|CTP(-)?978|CTP(-)?980|CTP(-)?987|CTP(-)?988|CTP(-)?989", "MediatekTablet": "\\bMT8125|MT8389|MT8135|MT8377\\b", "ConcordeTablet": "Concorde([ ]+)?Tab|ConCorde ReadMan", "GoCleverTablet": "GOCLEVER TAB|A7GOCLEVER|M1042|M7841|M742|R1042BK|R1041|TAB A975|TAB A7842|TAB A741|TAB A741L|TAB M723G|TAB M721|TAB A1021|TAB I921|TAB R721|TAB I720|TAB T76|TAB R70|TAB R76.2|TAB R106|TAB R83.2|TAB M813G|TAB I721|GCTA722|TAB I70|TAB I71|TAB S73|TAB R73|TAB R74|TAB R93|TAB R75|TAB R76.1|TAB A73|TAB A93|TAB A93.2|TAB T72|TAB R83|TAB R974|TAB R973|TAB A101|TAB A103|TAB A104|TAB A104.2|R105BK|M713G|A972BK|TAB A971|TAB R974.2|TAB R104|TAB R83.3|TAB A1042", "ModecomTablet": "FreeTAB 9000|FreeTAB 7.4|FreeTAB 7004|FreeTAB 7800|FreeTAB 2096|FreeTAB 7.5|FreeTAB 1014|FreeTAB 1001 |FreeTAB 8001|FreeTAB 9706|FreeTAB 9702|FreeTAB 7003|FreeTAB 7002|FreeTAB 1002|FreeTAB 7801|FreeTAB 1331|FreeTAB 1004|FreeTAB 8002|FreeTAB 8014|FreeTAB 9704|FreeTAB 1003", "VoninoTablet": "\\b(Argus[ _]?S|Diamond[ _]?79HD|Emerald[ _]?78E|Luna[ _]?70C|Onyx[ _]?S|Onyx[ _]?Z|Orin[ _]?HD|Orin[ _]?S|Otis[ _]?S|SpeedStar[ _]?S|Magnet[ _]?M9|Primus[ _]?94[ _]?3G|Primus[ _]?94HD|Primus[ _]?QS|Android.*\\bQ8\\b|Sirius[ _]?EVO[ _]?QS|Sirius[ _]?QS|Spirit[ _]?S)\\b", "ECSTablet": "V07OT2|TM105A|S10OT1|TR10CS1", "StorexTablet": "eZee[_']?(Tab|Go)[0-9]+|TabLC7|Looney Tunes Tab", "VodafoneTablet": "SmartTab([ ]+)?[0-9]+|SmartTabII10|SmartTabII7|VF-1497", "EssentielBTablet": "Smart[ ']?TAB[ ]+?[0-9]+|Family[ ']?TAB2", "RossMoorTablet": "RM-790|RM-997|RMD-878G|RMD-974R|RMT-705A|RMT-701|RME-601|RMT-501|RMT-711", "iMobileTablet": "i-mobile i-note", "TolinoTablet": "tolino tab [0-9.]+|tolino shine", "AudioSonicTablet": "\\bC-22Q|T7-QC|T-17B|T-17P\\b", "AMPETablet": "Android.* A78 ", "SkkTablet": "Android.* (SKYPAD|PHOENIX|CYCLOPS)", "TecnoTablet": "TECNO P9", "JXDTablet": "Android.* \\b(F3000|A3300|JXD5000|JXD3000|JXD2000|JXD300B|JXD300|S5800|S7800|S602b|S5110b|S7300|S5300|S602|S603|S5100|S5110|S601|S7100a|P3000F|P3000s|P101|P200s|P1000m|P200m|P9100|P1000s|S6600b|S908|P1000|P300|S18|S6600|S9100)\\b", "iJoyTablet": "Tablet (Spirit 7|Essentia|Galatea|Fusion|Onix 7|Landa|Titan|Scooby|Deox|Stella|Themis|Argon|Unique 7|Sygnus|Hexen|Finity 7|Cream|Cream X2|Jade|Neon 7|Neron 7|Kandy|Scape|Saphyr 7|Rebel|Biox|Rebel|Rebel 8GB|Myst|Draco 7|Myst|Tab7-004|Myst|Tadeo Jones|Tablet Boing|Arrow|Draco Dual Cam|Aurix|Mint|Amity|Revolution|Finity 9|Neon 9|T9w|Amity 4GB Dual Cam|Stone 4GB|Stone 8GB|Andromeda|Silken|X2|Andromeda II|Halley|Flame|Saphyr 9,7|Touch 8|Planet|Triton|Unique 10|Hexen 10|Memphis 4GB|Memphis 8GB|Onix 10)", "FX2Tablet": "FX2 PAD7|FX2 PAD10", "XoroTablet": "KidsPAD 701|PAD[ ]?712|PAD[ ]?714|PAD[ ]?716|PAD[ ]?717|PAD[ ]?718|PAD[ ]?720|PAD[ ]?721|PAD[ ]?722|PAD[ ]?790|PAD[ ]?792|PAD[ ]?900|PAD[ ]?9715D|PAD[ ]?9716DR|PAD[ ]?9718DR|PAD[ ]?9719QR|PAD[ ]?9720QR|TelePAD1030|Telepad1032|TelePAD730|TelePAD731|TelePAD732|TelePAD735Q|TelePAD830|TelePAD9730|TelePAD795|MegaPAD 1331|MegaPAD 1851|MegaPAD 2151", "ViewsonicTablet": "ViewPad 10pi|ViewPad 10e|ViewPad 10s|ViewPad E72|ViewPad7|ViewPad E100|ViewPad 7e|ViewSonic VB733|VB100a", "OdysTablet": "LOOX|XENO10|ODYS[ -](Space|EVO|Xpress|NOON)|\\bXELIO\\b|Xelio10Pro|XELIO7PHONETAB|XELIO10EXTREME|XELIOPT2|NEO_QUAD10", "CaptivaTablet": "CAPTIVA PAD", "IconbitTablet": "NetTAB|NT-3702|NT-3702S|NT-3702S|NT-3603P|NT-3603P|NT-0704S|NT-0704S|NT-3805C|NT-3805C|NT-0806C|NT-0806C|NT-0909T|NT-0909T|NT-0907S|NT-0907S|NT-0902S|NT-0902S", "TeclastTablet": "T98 4G|\\bP80\\b|\\bX90HD\\b|X98 Air|X98 Air 3G|\\bX89\\b|P80 3G|\\bX80h\\b|P98 Air|\\bX89HD\\b|P98 3G|\\bP90HD\\b|P89 3G|X98 3G|\\bP70h\\b|P79HD 3G|G18d 3G|\\bP79HD\\b|\\bP89s\\b|\\bA88\\b|\\bP10HD\\b|\\bP19HD\\b|G18 3G|\\bP78HD\\b|\\bA78\\b|\\bP75\\b|G17s 3G|G17h 3G|\\bP85t\\b|\\bP90\\b|\\bP11\\b|\\bP98t\\b|\\bP98HD\\b|\\bG18d\\b|\\bP85s\\b|\\bP11HD\\b|\\bP88s\\b|\\bA80HD\\b|\\bA80se\\b|\\bA10h\\b|\\bP89\\b|\\bP78s\\b|\\bG18\\b|\\bP85\\b|\\bA70h\\b|\\bA70\\b|\\bG17\\b|\\bP18\\b|\\bA80s\\b|\\bA11s\\b|\\bP88HD\\b|\\bA80h\\b|\\bP76s\\b|\\bP76h\\b|\\bP98\\b|\\bA10HD\\b|\\bP78\\b|\\bP88\\b|\\bA11\\b|\\bA10t\\b|\\bP76a\\b|\\bP76t\\b|\\bP76e\\b|\\bP85HD\\b|\\bP85a\\b|\\bP86\\b|\\bP75HD\\b|\\bP76v\\b|\\bA12\\b|\\bP75a\\b|\\bA15\\b|\\bP76Ti\\b|\\bP81HD\\b|\\bA10\\b|\\bT760VE\\b|\\bT720HD\\b|\\bP76\\b|\\bP73\\b|\\bP71\\b|\\bP72\\b|\\bT720SE\\b|\\bC520Ti\\b|\\bT760\\b|\\bT720VE\\b|T720-3GE|T720-WiFi", "OndaTablet": "\\b(V975i|Vi30|VX530|V701|Vi60|V701s|Vi50|V801s|V719|Vx610w|VX610W|V819i|Vi10|VX580W|Vi10|V711s|V813|V811|V820w|V820|Vi20|V711|VI30W|V712|V891w|V972|V819w|V820w|Vi60|V820w|V711|V813s|V801|V819|V975s|V801|V819|V819|V818|V811|V712|V975m|V101w|V961w|V812|V818|V971|V971s|V919|V989|V116w|V102w|V973|Vi40)\\b[\\s]+", "JaytechTablet": "TPC-PA762", "BlaupunktTablet": "Endeavour 800NG|Endeavour 1010", "DigmaTablet": "\\b(iDx10|iDx9|iDx8|iDx7|iDxD7|iDxD8|iDsQ8|iDsQ7|iDsQ8|iDsD10|iDnD7|3TS804H|iDsQ11|iDj7|iDs10)\\b", "EvolioTablet": "ARIA_Mini_wifi|Aria[ _]Mini|Evolio X10|Evolio X7|Evolio X8|\\bEvotab\\b|\\bNeura\\b", "LavaTablet": "QPAD E704|\\bIvoryS\\b|E-TAB IVORY|\\bE-TAB\\b", "AocTablet": "MW0811|MW0812|MW0922|MTK8382|MW1031|MW0831|MW0821|MW0931|MW0712", "MpmanTablet": "MP11 OCTA|MP10 OCTA|MPQC1114|MPQC1004|MPQC994|MPQC974|MPQC973|MPQC804|MPQC784|MPQC780|\\bMPG7\\b|MPDCG75|MPDCG71|MPDC1006|MP101DC|MPDC9000|MPDC905|MPDC706HD|MPDC706|MPDC705|MPDC110|MPDC100|MPDC99|MPDC97|MPDC88|MPDC8|MPDC77|MP709|MID701|MID711|MID170|MPDC703|MPQC1010", "CelkonTablet": "CT695|CT888|CT[\\s]?910|CT7 Tab|CT9 Tab|CT3 Tab|CT2 Tab|CT1 Tab|C820|C720|\\bCT-1\\b", "WolderTablet": "miTab \\b(DIAMOND|SPACE|BROOKLYN|NEO|FLY|MANHATTAN|FUNK|EVOLUTION|SKY|GOCAR|IRON|GENIUS|POP|MINT|EPSILON|BROADWAY|JUMP|HOP|LEGEND|NEW AGE|LINE|ADVANCE|FEEL|FOLLOW|LIKE|LINK|LIVE|THINK|FREEDOM|CHICAGO|CLEVELAND|BALTIMORE-GH|IOWA|BOSTON|SEATTLE|PHOENIX|DALLAS|IN 101|MasterChef)\\b", "MiTablet": "\\bMI PAD\\b|\\bHM NOTE 1W\\b", "NibiruTablet": "Nibiru M1|Nibiru Jupiter One", "NexoTablet": "NEXO NOVA|NEXO 10|NEXO AVIO|NEXO FREE|NEXO GO|NEXO EVO|NEXO 3G|NEXO SMART|NEXO KIDDO|NEXO MOBI", "LeaderTablet": "TBLT10Q|TBLT10I|TBL-10WDKB|TBL-10WDKBO2013|TBL-W230V2|TBL-W450|TBL-W500|SV572|TBLT7I|TBA-AC7-8G|TBLT79|TBL-8W16|TBL-10W32|TBL-10WKB|TBL-W100", "UbislateTablet": "UbiSlate[\\s]?7C", "PocketBookTablet": "Pocketbook", "KocasoTablet": "\\b(TB-1207)\\b", "Hudl": "Hudl HT7S3|Hudl 2", "TelstraTablet": "T-Hub2", "GenericTablet": "Android.*\\b97D\\b|Tablet(?!.*PC)|BNTV250A|MID-WCDMA|LogicPD Zoom2|\\bA7EB\\b|CatNova8|A1_07|CT704|CT1002|\\bM721\\b|rk30sdk|\\bEVOTAB\\b|M758A|ET904|ALUMIUM10|Smartfren Tab|Endeavour 1010|Tablet-PC-4|Tagi Tab|\\bM6pro\\b|CT1020W|arc 10HD|\\bJolla\\b|\\bTP750\\b" }, "oss": { "androids": "Android", "BlackBerryOS": "blackberry|\\bBB10\\b|rim tablet os", "PalmOS": "PalmOS|avantgo|blazer|elaine|hiptop|palm|plucker|xiino", "SymbianOS": "Symbian|symbols|Series60|Series40|SYB-[0-9]+|\\bS60\\b", "WindowsMobileOS": "Windows CE.*(PPC|Smartphone|Mobile|[0-9]{3}x[0-9]{3})|Window Mobile|Windows Phone [0-9.]+|WCE;", "WindowsPhoneOS": "Windows Phone 10.0|Windows Phone 8.1|Windows Phone 8.0|Windows Phone OS|XBLWP7|ZuneWP7|Windows NT 6.[23]; ARM;", "iOS": "\\biPhone.*Mobile|\\biPod|\\biPad", "MeeGoOS": "MeeGo", "MaemoOS": "Maemo", "JavaOS": "J2ME\/|\\bMIDP\\b|\\bCLDC\\b", "webOS": "webOS|hpwOS", "badaOS": "\\bBada\\b", "BREWOS": "BREW" }, "uas": { "Vivaldi": "Vivaldi", "Chrome": "\\bCrMo\\b|CriOS|Android.*Chrome\/[.0-9]* (Mobile)?", "Dolfin": "\\bDolfin\\b", "Opera": "Opera.*Mini|Opera.*Mobi|Android.*Opera|Mobile.*OPR\/[0-9.]+|Coast\/[0-9.]+", "Skyfire": "Skyfire", "Edge": "Mobile Safari\/[.0-9]* Edge", "IE": "IEMobile|MSIEMobile", "Firefox": "fennec|firefox.*maemo|(Mobile|Tablet).*Firefox|Firefox.*Mobile", "Bolt": "bolt", "TeaShark": "teashark", "Blazer": "Blazer", "Safari": "Version.*Mobile.*Safari|Safari.*Mobile|MobileSafari", "Tizen": "Tizen", "UCBrowser": "UC.*Browser|UCWEB", "baiduboxapp": "baiduboxapp", "baidubrowser": "baidubrowser", "DiigoBrowser": "DiigoBrowser", "Puffin": "Puffin", "Mercury": "\\bMercury\\b", "ObigoBrowser": "Obigo", "NetFront": "NF-Browser", "GenericBrowser": "NokiaBrowser|OviBrowser|OneBrowser|TwonkyBeamBrowser|SEMC.*Browser|FlyFlow|Minimo|NetFront|Novarra-Vision|MQQBrowser|MicroMessenger", "PaleMoon": "Android.*PaleMoon|Mobile.*PaleMoon" }, "props": { "Mobile": "Mobile\/[VER]", "Build": "Build\/[VER]", "Version": "Version\/[VER]", "VendorID": "VendorID\/[VER]", "iPad": "iPad.*CPU[a-z ]+[VER]", "iPhone": "iPhone.*CPU[a-z ]+[VER]", "iPod": "iPod.*CPU[a-z ]+[VER]", "Kindle": "Kindle\/[VER]", "Chrome": [ "Chrome\/[VER]", "CriOS\/[VER]", "CrMo\/[VER]" ], "Coast": [ "Coast\/[VER]" ], "Dolfin": "Dolfin\/[VER]", "Firefox": "Firefox\/[VER]", "Fennec": "Fennec\/[VER]", "Edge": "Edge\/[VER]", "IE": [ "IEMobile\/[VER];", "IEMobile [VER]", "MSIE [VER];", "Trident\/[0-9.]+;.*rv:[VER]" ], "NetFront": "NetFront\/[VER]", "NokiaBrowser": "NokiaBrowser\/[VER]", "Opera": [ " OPR\/[VER]", "Opera Mini\/[VER]", "Version\/[VER]" ], "Opera Mini": "Opera Mini\/[VER]", "Opera Mobi": "Version\/[VER]", "UC Browser": "UC Browser[VER]", "MQQBrowser": "MQQBrowser\/[VER]", "MicroMessenger": "MicroMessenger\/[VER]", "baiduboxapp": "baiduboxapp\/[VER]", "baidubrowser": "baidubrowser\/[VER]", "Iron": "Iron\/[VER]", "Safari": [ "Version\/[VER]", "Safari\/[VER]" ], "Skyfire": "Skyfire\/[VER]", "Tizen": "Tizen\/[VER]", "Webkit": "webkit[ \/][VER]", "PaleMoon": "PaleMoon\/[VER]", "Gecko": "Gecko\/[VER]", "Trident": "Trident\/[VER]", "Presto": "Presto\/[VER]", "Goanna": "Goanna\/[VER]", "iOS": " \\bi?OS\\b [VER][ ;]{1}", "Android": "Android [VER]", "BlackBerry": [ "BlackBerry[\\w]+\/[VER]", "BlackBerry.*Version\/[VER]", "Version\/[VER]" ], "BREW": "BREW [VER]", "Java": "Java\/[VER]", "Windows Phone OS": [ "Windows Phone OS [VER]", "Windows Phone [VER]" ], "Windows Phone": "Windows Phone [VER]", "Windows CE": "Windows CE\/[VER]", "Windows NT": "Windows NT [VER]", "Symbian": [ "SymbianOS\/[VER]", "Symbian\/[VER]" ], "webOS": [ "webOS\/[VER]", "hpwOS\/[VER];" ] }, "utils": { "Bot": "Googlebot|facebookexternalhit|AdsBot-Google|Google Keyword Suggestion|Facebot|YandexBot|bingbot|ia_archiver|AhrefsBot|Ezooms|GSLFbot|WBSearchBot|Twitterbot|TweetmemeBot|Twikle|PaperLiBot|Wotbox|UnwindFetchor|Exabot|MJ12bot|YandexImages|TurnitinBot|Pingdom", "MobileBot": "Googlebot-Mobile|AdsBot-Google-Mobile|YahooSeeker\/M1A1-R2D2", "DesktopMode": "WPDesktop", "TV": "SonyDTV|HbbTV", "WebKit": "(webkit)[ \/]([\\w.]+)", "Console": "\\b(Nintendo|Nintendo WiiU|Nintendo 3DS|PLAYSTATION|Xbox)\\b", "Watch": "SM-V700" }}; // following patterns come from http://detectmobilebrowsers.com/ impl.detectMobileBrowsers = { fullPattern: /(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino/i, shortPattern: /1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i, tabletPattern: /android|ipad|playbook|silk/i }; var hasOwnProp = Object.prototype.hasOwnProperty, isArray; impl.FALLBACK_PHONE = 'UnknownPhone'; impl.FALLBACK_TABLET = 'UnknownTablet'; impl.FALLBACK_MOBILE = 'UnknownMobile'; isArray = ('isArray' in Array) ? Array.isArray : function (value) { return Object.prototype.toString.call(value) === '[object Array]'; }; isArray = 'isArray' in Array ? function (value) { return Object.prototype.toString.call(value) === '[object Array]'; } : Array.isArray; function equalIC(a, b) { return a != null && b != null && a.toLowerCase() === b.toLowerCase(); } function containsIC(array, value) { var valueLC, i, len = array.length; if (!len || !value) { return false; } valueLC = value.toLowerCase(); for (i = 0; i < len; ++i) { if (valueLC === array[i].toLowerCase()) { return true; } } return false; } function convertPropsToRegExp(object) { for (var key in object) { if (hasOwnProp.call(object, key)) { object[key] = new RegExp(object[key], 'i'); } } } (function init() { var key, values, value, i, len, verPos, mobileDetectRules = impl.mobileDetectRules; for (key in mobileDetectRules.props) { if (hasOwnProp.call(mobileDetectRules.props, key)) { values = mobileDetectRules.props[key]; if (!isArray(values)) { values = [values]; } len = values.length; for (i = 0; i < len; ++i) { value = values[i]; verPos = value.indexOf('[VER]'); if (verPos >= 0) { value = value.substring(0, verPos) + '([\\w._\\+]+)' + value.substring(verPos + 5); } values[i] = new RegExp(value, 'i'); } mobileDetectRules.props[key] = values; } } convertPropsToRegExp(mobileDetectRules.oss); convertPropsToRegExp(mobileDetectRules.phones); convertPropsToRegExp(mobileDetectRules.tablets); convertPropsToRegExp(mobileDetectRules.uas); convertPropsToRegExp(mobileDetectRules.utils); // copy some patterns to oss0 which are tested first (see issue#15) mobileDetectRules.oss0 = { WindowsPhoneOS: mobileDetectRules.oss.WindowsPhoneOS, WindowsMobileOS: mobileDetectRules.oss.WindowsMobileOS }; }()); /** * Test userAgent string against a set of rules and find the first matched key. * @param {Object} rules (key is String, value is RegExp) * @param {String} userAgent the navigator.userAgent (or HTTP-Header 'User-Agent'). * @returns {String|null} the matched key if found, otherwise null * @private */ impl.findMatch = function(rules, userAgent) { for (var key in rules) { if (hasOwnProp.call(rules, key)) { if (rules[key].test(userAgent)) { return key; } } } return null; }; /** * Test userAgent string against a set of rules and return an array of matched keys. * @param {Object} rules (key is String, value is RegExp) * @param {String} userAgent the navigator.userAgent (or HTTP-Header 'User-Agent'). * @returns {Array} an array of matched keys, may be empty when there is no match, but not null * @private */ impl.findMatches = function(rules, userAgent) { var result = []; for (var key in rules) { if (hasOwnProp.call(rules, key)) { if (rules[key].test(userAgent)) { result.push(key); } } } return result; }; /** * Check the version of the given property in the User-Agent. * * @param {String} propertyName * @param {String} userAgent * @return {String} version or null if version not found * @private */ impl.getVersionStr = function (propertyName, userAgent) { var props = impl.mobileDetectRules.props, patterns, i, len, match; if (hasOwnProp.call(props, propertyName)) { patterns = props[propertyName]; len = patterns.length; for (i = 0; i < len; ++i) { match = patterns[i].exec(userAgent); if (match !== null) { return match[1]; } } } return null; }; /** * Check the version of the given property in the User-Agent. * Will return a float number. (eg. 2_0 will return 2.0, 4.3.1 will return 4.31) * * @param {String} propertyName * @param {String} userAgent * @return {Number} version or NaN if version not found * @private */ impl.getVersion = function (propertyName, userAgent) { var version = impl.getVersionStr(propertyName, userAgent); return version ? impl.prepareVersionNo(version) : NaN; }; /** * Prepare the version number. * * @param {String} version * @return {Number} the version number as a floating number * @private */ impl.prepareVersionNo = function (version) { var numbers; numbers = version.split(/[a-z._ \/\-]/i); if (numbers.length === 1) { version = numbers[0]; } if (numbers.length > 1) { version = numbers[0] + '.'; numbers.shift(); version += numbers.join(''); } return Number(version); }; impl.isMobileFallback = function (userAgent) { return impl.detectMobileBrowsers.fullPattern.test(userAgent) || impl.detectMobileBrowsers.shortPattern.test(userAgent.substr(0,4)); }; impl.isTabletFallback = function (userAgent) { return impl.detectMobileBrowsers.tabletPattern.test(userAgent); }; impl.prepareDetectionCache = function (cache, userAgent, maxPhoneWidth) { if (cache.mobile !== undefined) { return; } var phone, tablet, phoneSized; // first check for stronger tablet rules, then phone (see issue#5) tablet = impl.findMatch(impl.mobileDetectRules.tablets, userAgent); if (tablet) { cache.mobile = cache.tablet = tablet; cache.phone = null; return; // unambiguously identified as tablet } phone = impl.findMatch(impl.mobileDetectRules.phones, userAgent); if (phone) { cache.mobile = cache.phone = phone; cache.tablet = null; return; // unambiguously identified as phone } // our rules haven't found a match -> try more general fallback rules if (impl.isMobileFallback(userAgent)) { phoneSized = MobileDetect.isPhoneSized(maxPhoneWidth); if (phoneSized === undefined) { cache.mobile = impl.FALLBACK_MOBILE; cache.tablet = cache.phone = null; } else if (phoneSized) { cache.mobile = cache.phone = impl.FALLBACK_PHONE; cache.tablet = null; } else { cache.mobile = cache.tablet = impl.FALLBACK_TABLET; cache.phone = null; } } else if (impl.isTabletFallback(userAgent)) { cache.mobile = cache.tablet = impl.FALLBACK_TABLET; cache.phone = null; } else { // not mobile at all! cache.mobile = cache.tablet = cache.phone = null; } }; // t is a reference to a MobileDetect instance impl.mobileGrade = function (t) { // impl note: // To keep in sync w/ Mobile_Detect.php easily, the following code is tightly aligned to the PHP version. // When changes are made in Mobile_Detect.php, copy this method and replace: // $this-> / t. // self::MOBILE_GRADE_(.) / '$1' // , self::VERSION_TYPE_FLOAT / (nothing) // isIOS() / os('iOS') // [reg] / (nothing) <-- jsdelivr complaining about unescaped unicode character U+00AE var $isMobile = t.mobile() !== null; if ( // Apple iOS 3.2-5.1 - Tested on the original iPad (4.3 / 5.0), iPad 2 (4.3), iPad 3 (5.1), original iPhone (3.1), iPhone 3 (3.2), 3GS (4.3), 4 (4.3 / 5.0), and 4S (5.1) t.os('iOS') && t.version('iPad')>=4.3 || t.os('iOS') && t.version('iPhone')>=3.1 || t.os('iOS') && t.version('iPod')>=3.1 || // Android 2.1-2.3 - Tested on the HTC Incredible (2.2), original Droid (2.2), HTC Aria (2.1), Google Nexus S (2.3). Functional on 1.5 & 1.6 but performance may be sluggish, tested on Google G1 (1.5) // Android 3.1 (Honeycomb) - Tested on the Samsung Galaxy Tab 10.1 and Motorola XOOM // Android 4.0 (ICS) - Tested on a Galaxy Nexus. Note: transition performance can be poor on upgraded devices // Android 4.1 (Jelly Bean) - Tested on a Galaxy Nexus and Galaxy 7 ( t.version('Android')>2.1 && t.is('Webkit') ) || // Windows Phone 7-7.5 - Tested on the HTC Surround (7.0) HTC Trophy (7.5), LG-E900 (7.5), Nokia Lumia 800 t.version('Windows Phone OS')>=7.0 || // Blackberry 7 - Tested on BlackBerry Torch 9810 // Blackberry 6.0 - Tested on the Torch 9800 and Style 9670 t.is('BlackBerry') && t.version('BlackBerry')>=6.0 || // Blackberry Playbook (1.0-2.0) - Tested on PlayBook t.match('Playbook.*Tablet') || // Palm WebOS (1.4-2.0) - Tested on the Palm Pixi (1.4), Pre (1.4), Pre 2 (2.0) ( t.version('webOS')>=1.4 && t.match('Palm|Pre|Pixi') ) || // Palm WebOS 3.0 - Tested on HP TouchPad t.match('hp.*TouchPad') || // Firefox Mobile (12 Beta) - Tested on Android 2.3 device ( t.is('Firefox') && t.version('Firefox')>=12 ) || // Chrome for Android - Tested on Android 4.0, 4.1 device ( t.is('Chrome') && t.is('androids') && t.version('Android')>=4.0 ) || // Skyfire 4.1 - Tested on Android 2.3 device ( t.is('Skyfire') && t.version('Skyfire')>=4.1 && t.is('androids') && t.version('Android')>=2.3 ) || // Opera Mobile 11.5-12: Tested on Android 2.3 ( t.is('Opera') && t.version('Opera Mobi')>11 && t.is('androids') ) || // Meego 1.2 - Tested on Nokia 950 and N9 t.is('MeeGoOS') || // Tizen (pre-release) - Tested on early hardware t.is('Tizen') || // Samsung Bada 2.0 - Tested on a Samsung Wave 3, Dolphin browser // @todo: more tests here! t.is('Dolfin') && t.version('Bada')>=2.0 || // UC Browser - Tested on Android 2.3 device ( (t.is('UC Browser') || t.is('Dolfin')) && t.version('Android')>=2.3 ) || // Kindle 3 and Fire - Tested on the built-in WebKit browser for each ( t.match('Kindle Fire') || t.is('Kindle') && t.version('Kindle')>=3.0 ) || // Nook Color 1.4.1 - Tested on original Nook Color, not Nook Tablet t.is('androids') && t.is('NookTablet') || // Chrome Desktop 11-21 - Tested on OS X 10.7 and Windows 7 t.version('Chrome')>=11 && !$isMobile || // Safari Desktop 4-5 - Tested on OS X 10.7 and Windows 7 t.version('Safari')>=5.0 && !$isMobile || // Firefox Desktop 4-13 - Tested on OS X 10.7 and Windows 7 t.version('Firefox')>=4.0 && !$isMobile || // Internet Explorer 7-9 - Tested on Windows XP, Vista and 7 t.version('MSIE')>=7.0 && !$isMobile || // Opera Desktop 10-12 - Tested on OS X 10.7 and Windows 7 // @reference: http://my.opera.com/community/openweb/idopera/ t.version('Opera')>=10 && !$isMobile ){ return 'A'; } if ( t.os('iOS') && t.version('iPad')<4.3 || t.os('iOS') && t.version('iPhone')<3.1 || t.os('iOS') && t.version('iPod')<3.1 || // Blackberry 5.0: Tested on the Storm 2 9550, Bold 9770 t.is('Blackberry') && t.version('BlackBerry')>=5 && t.version('BlackBerry')<6 || //Opera Mini (5.0-6.5) - Tested on iOS 3.2/4.3 and Android 2.3 ( t.version('Opera Mini')>=5.0 && t.version('Opera Mini')<=6.5 && (t.version('Android')>=2.3 || t.is('iOS')) ) || // Nokia Symbian^3 - Tested on Nokia N8 (Symbian^3), C7 (Symbian^3), also works on N97 (Symbian^1) t.match('NokiaN8|NokiaC7|N97.*Series60|Symbian/3') || // @todo: report this (tested on Nokia N71) t.version('Opera Mobi')>=11 && t.is('SymbianOS') ){ return 'B'; } if ( // Blackberry 4.x - Tested on the Curve 8330 t.version('BlackBerry')<5.0 || // Windows Mobile - Tested on the HTC Leo (WinMo 5.2) t.match('MSIEMobile|Windows CE.*Mobile') || t.version('Windows Mobile')<=5.2 ){ return 'C'; } //All older smartphone platforms and featurephones - Any device that doesn't support media queries //will receive the basic, C grade experience. return 'C'; }; impl.detectOS = function (ua) { return impl.findMatch(impl.mobileDetectRules.oss0, ua) || impl.findMatch(impl.mobileDetectRules.oss, ua); }; impl.getDeviceSmallerSide = function () { return window.screen.width < window.screen.height ? window.screen.width : window.screen.height; }; /** * Constructor for MobileDetect object. *
* Such an object will keep a reference to the given user-agent string and cache most of the detect queries.
*
* Find information how to download and install: * github.com/hgoebl/mobile-detect.js/ *
* * @example 
     *     var md = new MobileDetect(window.navigator.userAgent);     *     if (md.mobile()) {     *         location.href = (md.mobileGrade() === 'A') ? '/mobile/' : '/lynx/';     *     }     *
* * @param {string} userAgent typically taken from window.navigator.userAgent or http_header['User-Agent'] * @param {number} [maxPhoneWidth=600] only for browsers specify a value for the maximum * width of smallest device side (in logical "CSS" pixels) until a device detected as mobile will be handled * as phone. * This is only used in cases where the device cannot be classified as phone or tablet.
* See Declaring Tablet Layouts * for Android.
* If you provide a value < 0, then this "fuzzy" check is disabled. * @constructor * @global */ function MobileDetect(userAgent, maxPhoneWidth) { this.ua = userAgent || ''; this._cache = {}; //600dp is typical 7" tablet minimum width this.maxPhoneWidth = maxPhoneWidth || 600; } MobileDetect.prototype = { constructor: MobileDetect, /** * Returns the detected phone or tablet type or null if it is not a mobile device. *
* For a list of possible return values see {@link MobileDetect#phone} and {@link MobileDetect#tablet}.
*
* If the device is not detected by the regular expressions from Mobile-Detect, a test is made against * the patterns of detectmobilebrowsers.com. If this test * is positive, a value of UnknownPhone, UnknownTablet or * UnknownMobile is returned.
* When used in browser, the decision whether phone or tablet is made based on screen.width/height.
*
* When used server-side (node.js), there is no way to tell the difference between UnknownTablet * and UnknownMobile, so you will get UnknownMobile here.
* Be aware that since v1.0.0 in this special case you will get UnknownMobile only for: * {@link MobileDetect#mobile}, not for {@link MobileDetect#phone} and {@link MobileDetect#tablet}. * In versions before v1.0.0 all 3 methods returned UnknownMobile which was tedious to use. *
* In most cases you will use the return value just as a boolean. * * @returns {String} the key for the phone family or tablet family, e.g. "Nexus". * @function MobileDetect#mobile */ mobile: function () { impl.prepareDetectionCache(this._cache, this.ua, this.maxPhoneWidth); return this._cache.mobile; }, /** * Returns the detected phone type/family string or null. *
* The returned tablet (family or producer) is one of following keys:
*
iPhone, BlackBerry, HTC, Nexus, Dell, Motorola, Samsung, LG, Sony, Asus, * NokiaLumia, Micromax, Palm, Vertu, Pantech, Fly, Wiko, iMobile, SimValley, * Wolfgang, Alcatel, Nintendo, Amoi, INQ, GenericPhone
*
* If the device is not detected by the regular expressions from Mobile-Detect, a test is made against * the patterns of detectmobilebrowsers.com. If this test * is positive, a value of UnknownPhone or UnknownMobile is returned.
* When used in browser, the decision whether phone or tablet is made based on screen.width/height.
*
* When used server-side (node.js), there is no way to tell the difference between UnknownTablet * and UnknownMobile, so you will get null here, while {@link MobileDetect#mobile} * will return UnknownMobile.
* Be aware that since v1.0.0 in this special case you will get UnknownMobile only for: * {@link MobileDetect#mobile}, not for {@link MobileDetect#phone} and {@link MobileDetect#tablet}. * In versions before v1.0.0 all 3 methods returned UnknownMobile which was tedious to use. *
* In most cases you will use the return value just as a boolean. * * @returns {String} the key of the phone family or producer, e.g. "iPhone" * @function MobileDetect#phone */ phone: function () { impl.prepareDetectionCache(this._cache, this.ua, this.maxPhoneWidth); return this._cache.phone; }, /** * Returns the detected tablet type/family string or null. *
* The returned tablet (family or producer) is one of following keys:
*
iPad, NexusTablet, SamsungTablet, Kindle, SurfaceTablet, HPTablet, AsusTablet, * BlackBerryTablet, HTCtablet, MotorolaTablet, NookTablet, AcerTablet, * ToshibaTablet, LGTablet, FujitsuTablet, PrestigioTablet, LenovoTablet, * DellTablet, YarvikTablet, MedionTablet, ArnovaTablet, IntensoTablet, IRUTablet, * MegafonTablet, EbodaTablet, AllViewTablet, ArchosTablet, AinolTablet, * NokiaLumiaTablet, SonyTablet, PhilipsTablet, CubeTablet, CobyTablet, MIDTablet, * MSITablet, SMiTTablet, RockChipTablet, FlyTablet, bqTablet, HuaweiTablet, * NecTablet, PantechTablet, BronchoTablet, VersusTablet, ZyncTablet, * PositivoTablet, NabiTablet, KoboTablet, DanewTablet, TexetTablet, * PlaystationTablet, TrekstorTablet, PyleAudioTablet, AdvanTablet, * DanyTechTablet, GalapadTablet, MicromaxTablet, KarbonnTablet, AllFineTablet, * PROSCANTablet, YONESTablet, ChangJiaTablet, GUTablet, PointOfViewTablet, * OvermaxTablet, HCLTablet, DPSTablet, VistureTablet, CrestaTablet, * MediatekTablet, ConcordeTablet, GoCleverTablet, ModecomTablet, VoninoTablet, * ECSTablet, StorexTablet, VodafoneTablet, EssentielBTablet, RossMoorTablet, * iMobileTablet, TolinoTablet, AudioSonicTablet, AMPETablet, SkkTablet, * TecnoTablet, JXDTablet, iJoyTablet, FX2Tablet, XoroTablet, ViewsonicTablet, * OdysTablet, CaptivaTablet, IconbitTablet, TeclastTablet, OndaTablet, * JaytechTablet, BlaupunktTablet, DigmaTablet, EvolioTablet, LavaTablet, * AocTablet, MpmanTablet, CelkonTablet, WolderTablet, MiTablet, NibiruTablet, * NexoTablet, LeaderTablet, UbislateTablet, PocketBookTablet, KocasoTablet, Hudl, * TelstraTablet, GenericTablet
*
* If the device is not detected by the regular expressions from Mobile-Detect, a test is made against * the patterns of detectmobilebrowsers.com. If this test * is positive, a value of UnknownTablet or UnknownMobile is returned.
* When used in browser, the decision whether phone or tablet is made based on screen.width/height.
*
* When used server-side (node.js), there is no way to tell the difference between UnknownTablet * and UnknownMobile, so you will get null here, while {@link MobileDetect#mobile} * will return UnknownMobile.
* Be aware that since v1.0.0 in this special case you will get UnknownMobile only for: * {@link MobileDetect#mobile}, not for {@link MobileDetect#phone} and {@link MobileDetect#tablet}. * In versions before v1.0.0 all 3 methods returned UnknownMobile which was tedious to use. *
* In most cases you will use the return value just as a boolean. * * @returns {String} the key of the tablet family or producer, e.g. "SamsungTablet" * @function MobileDetect#tablet */ tablet: function () { impl.prepareDetectionCache(this._cache, this.ua, this.maxPhoneWidth); return this._cache.tablet; }, /** * Returns the (first) detected user-agent string or null. *
* The returned user-agent is one of following keys:
*
Vivaldi, Chrome, Dolfin, Opera, Skyfire, Edge, IE, Firefox, Bolt, TeaShark, * Blazer, Safari, Tizen, UCBrowser, baiduboxapp, baidubrowser, DiigoBrowser, * Puffin, Mercury, ObigoBrowser, NetFront, GenericBrowser, PaleMoon
*
* In most cases calling {@link MobileDetect#userAgent} will be sufficient. But there are rare * cases where a mobile device pretends to be more than one particular browser. You can get the * list of all matches with {@link MobileDetect#userAgents} or check for a particular value by * providing one of the defined keys as first argument to {@link MobileDetect#is}. * * @returns {String} the key for the detected user-agent or null * @function MobileDetect#userAgent */ userAgent: function () { if (this._cache.userAgent === undefined) { this._cache.userAgent = impl.findMatch(impl.mobileDetectRules.uas, this.ua); } return this._cache.userAgent; }, /** * Returns all detected user-agent strings. *
* The array is empty or contains one or more of following keys:
*
Vivaldi, Chrome, Dolfin, Opera, Skyfire, Edge, IE, Firefox, Bolt, TeaShark, * Blazer, Safari, Tizen, UCBrowser, baiduboxapp, baidubrowser, DiigoBrowser, * Puffin, Mercury, ObigoBrowser, NetFront, GenericBrowser, PaleMoon
*
* In most cases calling {@link MobileDetect#userAgent} will be sufficient. But there are rare * cases where a mobile device pretends to be more than one particular browser. You can get the * list of all matches with {@link MobileDetect#userAgents} or check for a particular value by * providing one of the defined keys as first argument to {@link MobileDetect#is}. * * @returns {Array} the array of detected user-agent keys or [] * @function MobileDetect#userAgents */ userAgents: function () { if (this._cache.userAgents === undefined) { this._cache.userAgents = impl.findMatches(impl.mobileDetectRules.uas, this.ua); } return this._cache.userAgents; }, /** * Returns the detected operating system string or null. *
* The operating system is one of following keys:
*
androids, BlackBerryOS, PalmOS, SymbianOS, WindowsMobileOS, WindowsPhoneOS, * iOS, MeeGoOS, MaemoOS, JavaOS, webOS, badaOS, BREWOS
* * @returns {String} the key for the detected operating system. * @function MobileDetect#os */ os: function () { if (this._cache.os === undefined) { this._cache.os = impl.detectOS(this.ua); } return this._cache.os; }, /** * Get the version (as Number) of the given property in the User-Agent. *
* Will return a float number. (eg. 2_0 will return 2.0, 4.3.1 will return 4.31) * * @param {String} key a key defining a thing which has a version.
* You can use one of following keys:
*
Mobile, Build, Version, VendorID, iPad, iPhone, iPod, Kindle, Chrome, Coast, * Dolfin, Firefox, Fennec, Edge, IE, NetFront, NokiaBrowser, Opera, Opera Mini, * Opera Mobi, UC Browser, MQQBrowser, MicroMessenger, baiduboxapp, baidubrowser, * Iron, Safari, Skyfire, Tizen, Webkit, PaleMoon, Gecko, Trident, Presto, Goanna, * iOS, Android, BlackBerry, BREW, Java, Windows Phone OS, Windows Phone, Windows * CE, Windows NT, Symbian, webOS
* * @returns {Number} the version as float or NaN if User-Agent doesn't contain this version. * Be careful when comparing this value with '==' operator! * @function MobileDetect#version */ version: function (key) { return impl.getVersion(key, this.ua); }, /** * Get the version (as String) of the given property in the User-Agent. *
* * @param {String} key a key defining a thing which has a version.
* You can use one of following keys:
*
Mobile, Build, Version, VendorID, iPad, iPhone, iPod, Kindle, Chrome, Coast, * Dolfin, Firefox, Fennec, Edge, IE, NetFront, NokiaBrowser, Opera, Opera Mini, * Opera Mobi, UC Browser, MQQBrowser, MicroMessenger, baiduboxapp, baidubrowser, * Iron, Safari, Skyfire, Tizen, Webkit, PaleMoon, Gecko, Trident, Presto, Goanna, * iOS, Android, BlackBerry, BREW, Java, Windows Phone OS, Windows Phone, Windows * CE, Windows NT, Symbian, webOS
* * @returns {String} the "raw" version as String or null if User-Agent doesn't contain this version. * * @function MobileDetect#versionStr */ versionStr: function (key) { return impl.getVersionStr(key, this.ua); }, /** * Global test key against userAgent, os, phone, tablet and some other properties of userAgent string. * * @param {String} key the key (case-insensitive) of a userAgent, an operating system, phone or * tablet family.
* For a complete list of possible values, see {@link MobileDetect#userAgent}, * {@link MobileDetect#os}, {@link MobileDetect#phone}, {@link MobileDetect#tablet}.
* Additionally you have following keys:
*
Bot, MobileBot, DesktopMode, TV, WebKit, Console, Watch
* * @returns {boolean} true when the given key is one of the defined keys of userAgent, os, phone, * tablet or one of the listed additional keys, otherwise false * @function MobileDetect#is */ is: function (key) { return containsIC(this.userAgents(), key) || equalIC(key, this.os()) || equalIC(key, this.phone()) || equalIC(key, this.tablet()) || containsIC(impl.findMatches(impl.mobileDetectRules.utils, this.ua), key); }, /** * Do a quick test against navigator::userAgent. * * @param {String|RegExp} pattern the pattern, either as String or RegExp * (a string will be converted to a case-insensitive RegExp). * @returns {boolean} true when the pattern matches, otherwise false * @function MobileDetect#match */ match: function (pattern) { if (!(pattern instanceof RegExp)) { pattern = new RegExp(pattern, 'i'); } return pattern.test(this.ua); }, /** * Checks whether the mobile device can be considered as phone regarding screen.width. *
* Obviously this method makes sense in browser environments only (not for Node.js)! * @param {number} [maxPhoneWidth] the maximum logical pixels (aka. CSS-pixels) to be considered as phone.
* The argument is optional and if not present or falsy, the value of the constructor is taken. * @returns {boolean|undefined} undefined if screen size wasn't detectable, else true * when screen.width is less or equal to maxPhoneWidth, otherwise false.
* Will always return undefined server-side. */ isPhoneSized: function (maxPhoneWidth) { return MobileDetect.isPhoneSized(maxPhoneWidth || this.maxPhoneWidth); }, /** * Returns the mobile grade ('A', 'B', 'C'). * * @returns {String} one of the mobile grades ('A', 'B', 'C'). * @function MobileDetect#mobileGrade */ mobileGrade: function () { if (this._cache.grade === undefined) { this._cache.grade = impl.mobileGrade(this); } return this._cache.grade; } }; // environment-dependent if (typeof window !== 'undefined' && window.screen) { MobileDetect.isPhoneSized = function (maxPhoneWidth) { return maxPhoneWidth < 0 ? undefined : impl.getDeviceSmallerSide() <= maxPhoneWidth; }; } else { MobileDetect.isPhoneSized = function () {}; } // should not be replaced by a completely new object - just overwrite existing methods MobileDetect._impl = impl; MobileDetect.version = '1.3.3 2016-07-31'; return MobileDetect;}); // end of call of define()}) : (define: any, undefined?: any) => void > : ^ ^^^^^^^ ^^^^^^^^^^^^^^^ ->function (define, undefined) {define(function () { 'use strict'; var impl = {}; impl.mobileDetectRules = { "phones": { "iPhone": "\\biPhone\\b|\\biPod\\b", "BlackBerry": "BlackBerry|\\bBB10\\b|rim[0-9]+", "HTC": "HTC|HTC.*(Sensation|Evo|Vision|Explorer|6800|8100|8900|A7272|S510e|C110e|Legend|Desire|T8282)|APX515CKT|Qtek9090|APA9292KT|HD_mini|Sensation.*Z710e|PG86100|Z715e|Desire.*(A8181|HD)|ADR6200|ADR6400L|ADR6425|001HT|Inspire 4G|Android.*\\bEVO\\b|T-Mobile G1|Z520m", "Nexus": "Nexus One|Nexus S|Galaxy.*Nexus|Android.*Nexus.*Mobile|Nexus 4|Nexus 5|Nexus 6", "Dell": "Dell.*Streak|Dell.*Aero|Dell.*Venue|DELL.*Venue Pro|Dell Flash|Dell Smoke|Dell Mini 3iX|XCD28|XCD35|\\b001DL\\b|\\b101DL\\b|\\bGS01\\b", "Motorola": "Motorola|DROIDX|DROID BIONIC|\\bDroid\\b.*Build|Android.*Xoom|HRI39|MOT-|A1260|A1680|A555|A853|A855|A953|A955|A956|Motorola.*ELECTRIFY|Motorola.*i1|i867|i940|MB200|MB300|MB501|MB502|MB508|MB511|MB520|MB525|MB526|MB611|MB612|MB632|MB810|MB855|MB860|MB861|MB865|MB870|ME501|ME502|ME511|ME525|ME600|ME632|ME722|ME811|ME860|ME863|ME865|MT620|MT710|MT716|MT720|MT810|MT870|MT917|Motorola.*TITANIUM|WX435|WX445|XT300|XT301|XT311|XT316|XT317|XT319|XT320|XT390|XT502|XT530|XT531|XT532|XT535|XT603|XT610|XT611|XT615|XT681|XT701|XT702|XT711|XT720|XT800|XT806|XT860|XT862|XT875|XT882|XT883|XT894|XT901|XT907|XT909|XT910|XT912|XT928|XT926|XT915|XT919|XT925|XT1021|\\bMoto E\\b", "Samsung": "Samsung|SM-G9250|GT-19300|SGH-I337|BGT-S5230|GT-B2100|GT-B2700|GT-B2710|GT-B3210|GT-B3310|GT-B3410|GT-B3730|GT-B3740|GT-B5510|GT-B5512|GT-B5722|GT-B6520|GT-B7300|GT-B7320|GT-B7330|GT-B7350|GT-B7510|GT-B7722|GT-B7800|GT-C3010|GT-C3011|GT-C3060|GT-C3200|GT-C3212|GT-C3212I|GT-C3262|GT-C3222|GT-C3300|GT-C3300K|GT-C3303|GT-C3303K|GT-C3310|GT-C3322|GT-C3330|GT-C3350|GT-C3500|GT-C3510|GT-C3530|GT-C3630|GT-C3780|GT-C5010|GT-C5212|GT-C6620|GT-C6625|GT-C6712|GT-E1050|GT-E1070|GT-E1075|GT-E1080|GT-E1081|GT-E1085|GT-E1087|GT-E1100|GT-E1107|GT-E1110|GT-E1120|GT-E1125|GT-E1130|GT-E1160|GT-E1170|GT-E1175|GT-E1180|GT-E1182|GT-E1200|GT-E1210|GT-E1225|GT-E1230|GT-E1390|GT-E2100|GT-E2120|GT-E2121|GT-E2152|GT-E2220|GT-E2222|GT-E2230|GT-E2232|GT-E2250|GT-E2370|GT-E2550|GT-E2652|GT-E3210|GT-E3213|GT-I5500|GT-I5503|GT-I5700|GT-I5800|GT-I5801|GT-I6410|GT-I6420|GT-I7110|GT-I7410|GT-I7500|GT-I8000|GT-I8150|GT-I8160|GT-I8190|GT-I8320|GT-I8330|GT-I8350|GT-I8530|GT-I8700|GT-I8703|GT-I8910|GT-I9000|GT-I9001|GT-I9003|GT-I9010|GT-I9020|GT-I9023|GT-I9070|GT-I9082|GT-I9100|GT-I9103|GT-I9220|GT-I9250|GT-I9300|GT-I9305|GT-I9500|GT-I9505|GT-M3510|GT-M5650|GT-M7500|GT-M7600|GT-M7603|GT-M8800|GT-M8910|GT-N7000|GT-S3110|GT-S3310|GT-S3350|GT-S3353|GT-S3370|GT-S3650|GT-S3653|GT-S3770|GT-S3850|GT-S5210|GT-S5220|GT-S5229|GT-S5230|GT-S5233|GT-S5250|GT-S5253|GT-S5260|GT-S5263|GT-S5270|GT-S5300|GT-S5330|GT-S5350|GT-S5360|GT-S5363|GT-S5369|GT-S5380|GT-S5380D|GT-S5560|GT-S5570|GT-S5600|GT-S5603|GT-S5610|GT-S5620|GT-S5660|GT-S5670|GT-S5690|GT-S5750|GT-S5780|GT-S5830|GT-S5839|GT-S6102|GT-S6500|GT-S7070|GT-S7200|GT-S7220|GT-S7230|GT-S7233|GT-S7250|GT-S7500|GT-S7530|GT-S7550|GT-S7562|GT-S7710|GT-S8000|GT-S8003|GT-S8500|GT-S8530|GT-S8600|SCH-A310|SCH-A530|SCH-A570|SCH-A610|SCH-A630|SCH-A650|SCH-A790|SCH-A795|SCH-A850|SCH-A870|SCH-A890|SCH-A930|SCH-A950|SCH-A970|SCH-A990|SCH-I100|SCH-I110|SCH-I400|SCH-I405|SCH-I500|SCH-I510|SCH-I515|SCH-I600|SCH-I730|SCH-I760|SCH-I770|SCH-I830|SCH-I910|SCH-I920|SCH-I959|SCH-LC11|SCH-N150|SCH-N300|SCH-R100|SCH-R300|SCH-R351|SCH-R400|SCH-R410|SCH-T300|SCH-U310|SCH-U320|SCH-U350|SCH-U360|SCH-U365|SCH-U370|SCH-U380|SCH-U410|SCH-U430|SCH-U450|SCH-U460|SCH-U470|SCH-U490|SCH-U540|SCH-U550|SCH-U620|SCH-U640|SCH-U650|SCH-U660|SCH-U700|SCH-U740|SCH-U750|SCH-U810|SCH-U820|SCH-U900|SCH-U940|SCH-U960|SCS-26UC|SGH-A107|SGH-A117|SGH-A127|SGH-A137|SGH-A157|SGH-A167|SGH-A177|SGH-A187|SGH-A197|SGH-A227|SGH-A237|SGH-A257|SGH-A437|SGH-A517|SGH-A597|SGH-A637|SGH-A657|SGH-A667|SGH-A687|SGH-A697|SGH-A707|SGH-A717|SGH-A727|SGH-A737|SGH-A747|SGH-A767|SGH-A777|SGH-A797|SGH-A817|SGH-A827|SGH-A837|SGH-A847|SGH-A867|SGH-A877|SGH-A887|SGH-A897|SGH-A927|SGH-B100|SGH-B130|SGH-B200|SGH-B220|SGH-C100|SGH-C110|SGH-C120|SGH-C130|SGH-C140|SGH-C160|SGH-C170|SGH-C180|SGH-C200|SGH-C207|SGH-C210|SGH-C225|SGH-C230|SGH-C417|SGH-C450|SGH-D307|SGH-D347|SGH-D357|SGH-D407|SGH-D415|SGH-D780|SGH-D807|SGH-D980|SGH-E105|SGH-E200|SGH-E315|SGH-E316|SGH-E317|SGH-E335|SGH-E590|SGH-E635|SGH-E715|SGH-E890|SGH-F300|SGH-F480|SGH-I200|SGH-I300|SGH-I320|SGH-I550|SGH-I577|SGH-I600|SGH-I607|SGH-I617|SGH-I627|SGH-I637|SGH-I677|SGH-I700|SGH-I717|SGH-I727|SGH-i747M|SGH-I777|SGH-I780|SGH-I827|SGH-I847|SGH-I857|SGH-I896|SGH-I897|SGH-I900|SGH-I907|SGH-I917|SGH-I927|SGH-I937|SGH-I997|SGH-J150|SGH-J200|SGH-L170|SGH-L700|SGH-M110|SGH-M150|SGH-M200|SGH-N105|SGH-N500|SGH-N600|SGH-N620|SGH-N625|SGH-N700|SGH-N710|SGH-P107|SGH-P207|SGH-P300|SGH-P310|SGH-P520|SGH-P735|SGH-P777|SGH-Q105|SGH-R210|SGH-R220|SGH-R225|SGH-S105|SGH-S307|SGH-T109|SGH-T119|SGH-T139|SGH-T209|SGH-T219|SGH-T229|SGH-T239|SGH-T249|SGH-T259|SGH-T309|SGH-T319|SGH-T329|SGH-T339|SGH-T349|SGH-T359|SGH-T369|SGH-T379|SGH-T409|SGH-T429|SGH-T439|SGH-T459|SGH-T469|SGH-T479|SGH-T499|SGH-T509|SGH-T519|SGH-T539|SGH-T559|SGH-T589|SGH-T609|SGH-T619|SGH-T629|SGH-T639|SGH-T659|SGH-T669|SGH-T679|SGH-T709|SGH-T719|SGH-T729|SGH-T739|SGH-T746|SGH-T749|SGH-T759|SGH-T769|SGH-T809|SGH-T819|SGH-T839|SGH-T919|SGH-T929|SGH-T939|SGH-T959|SGH-T989|SGH-U100|SGH-U200|SGH-U800|SGH-V205|SGH-V206|SGH-X100|SGH-X105|SGH-X120|SGH-X140|SGH-X426|SGH-X427|SGH-X475|SGH-X495|SGH-X497|SGH-X507|SGH-X600|SGH-X610|SGH-X620|SGH-X630|SGH-X700|SGH-X820|SGH-X890|SGH-Z130|SGH-Z150|SGH-Z170|SGH-ZX10|SGH-ZX20|SHW-M110|SPH-A120|SPH-A400|SPH-A420|SPH-A460|SPH-A500|SPH-A560|SPH-A600|SPH-A620|SPH-A660|SPH-A700|SPH-A740|SPH-A760|SPH-A790|SPH-A800|SPH-A820|SPH-A840|SPH-A880|SPH-A900|SPH-A940|SPH-A960|SPH-D600|SPH-D700|SPH-D710|SPH-D720|SPH-I300|SPH-I325|SPH-I330|SPH-I350|SPH-I500|SPH-I600|SPH-I700|SPH-L700|SPH-M100|SPH-M220|SPH-M240|SPH-M300|SPH-M305|SPH-M320|SPH-M330|SPH-M350|SPH-M360|SPH-M370|SPH-M380|SPH-M510|SPH-M540|SPH-M550|SPH-M560|SPH-M570|SPH-M580|SPH-M610|SPH-M620|SPH-M630|SPH-M800|SPH-M810|SPH-M850|SPH-M900|SPH-M910|SPH-M920|SPH-M930|SPH-N100|SPH-N200|SPH-N240|SPH-N300|SPH-N400|SPH-Z400|SWC-E100|SCH-i909|GT-N7100|GT-N7105|SCH-I535|SM-N900A|SGH-I317|SGH-T999L|GT-S5360B|GT-I8262|GT-S6802|GT-S6312|GT-S6310|GT-S5312|GT-S5310|GT-I9105|GT-I8510|GT-S6790N|SM-G7105|SM-N9005|GT-S5301|GT-I9295|GT-I9195|SM-C101|GT-S7392|GT-S7560|GT-B7610|GT-I5510|GT-S7582|GT-S7530E|GT-I8750|SM-G9006V|SM-G9008V|SM-G9009D|SM-G900A|SM-G900D|SM-G900F|SM-G900H|SM-G900I|SM-G900J|SM-G900K|SM-G900L|SM-G900M|SM-G900P|SM-G900R4|SM-G900S|SM-G900T|SM-G900V|SM-G900W8|SHV-E160K|SCH-P709|SCH-P729|SM-T2558|GT-I9205|SM-G9350|SM-J120F", "LG": "\\bLG\\b;|LG[- ]?(C800|C900|E400|E610|E900|E-900|F160|F180K|F180L|F180S|730|855|L160|LS740|LS840|LS970|LU6200|MS690|MS695|MS770|MS840|MS870|MS910|P500|P700|P705|VM696|AS680|AS695|AX840|C729|E970|GS505|272|C395|E739BK|E960|L55C|L75C|LS696|LS860|P769BK|P350|P500|P509|P870|UN272|US730|VS840|VS950|LN272|LN510|LS670|LS855|LW690|MN270|MN510|P509|P769|P930|UN200|UN270|UN510|UN610|US670|US740|US760|UX265|UX840|VN271|VN530|VS660|VS700|VS740|VS750|VS910|VS920|VS930|VX9200|VX11000|AX840A|LW770|P506|P925|P999|E612|D955|D802|MS323)", "Sony": "SonyST|SonyLT|SonyEricsson|SonyEricssonLT15iv|LT18i|E10i|LT28h|LT26w|SonyEricssonMT27i|C5303|C6902|C6903|C6906|C6943|D2533", "Asus": "Asus.*Galaxy|PadFone.*Mobile", "NokiaLumia": "Lumia [0-9]{3,4}", "Micromax": "Micromax.*\\b(A210|A92|A88|A72|A111|A110Q|A115|A116|A110|A90S|A26|A51|A35|A54|A25|A27|A89|A68|A65|A57|A90)\\b", "Palm": "PalmSource|Palm", "Vertu": "Vertu|Vertu.*Ltd|Vertu.*Ascent|Vertu.*Ayxta|Vertu.*Constellation(F|Quest)?|Vertu.*Monika|Vertu.*Signature", "Pantech": "PANTECH|IM-A850S|IM-A840S|IM-A830L|IM-A830K|IM-A830S|IM-A820L|IM-A810K|IM-A810S|IM-A800S|IM-T100K|IM-A725L|IM-A780L|IM-A775C|IM-A770K|IM-A760S|IM-A750K|IM-A740S|IM-A730S|IM-A720L|IM-A710K|IM-A690L|IM-A690S|IM-A650S|IM-A630K|IM-A600S|VEGA PTL21|PT003|P8010|ADR910L|P6030|P6020|P9070|P4100|P9060|P5000|CDM8992|TXT8045|ADR8995|IS11PT|P2030|P6010|P8000|PT002|IS06|CDM8999|P9050|PT001|TXT8040|P2020|P9020|P2000|P7040|P7000|C790", "Fly": "IQ230|IQ444|IQ450|IQ440|IQ442|IQ441|IQ245|IQ256|IQ236|IQ255|IQ235|IQ245|IQ275|IQ240|IQ285|IQ280|IQ270|IQ260|IQ250", "Wiko": "KITE 4G|HIGHWAY|GETAWAY|STAIRWAY|DARKSIDE|DARKFULL|DARKNIGHT|DARKMOON|SLIDE|WAX 4G|RAINBOW|BLOOM|SUNSET|GOA(?!nna)|LENNY|BARRY|IGGY|OZZY|CINK FIVE|CINK PEAX|CINK PEAX 2|CINK SLIM|CINK SLIM 2|CINK +|CINK KING|CINK PEAX|CINK SLIM|SUBLIM", "iMobile": "i-mobile (IQ|i-STYLE|idea|ZAA|Hitz)", "SimValley": "\\b(SP-80|XT-930|SX-340|XT-930|SX-310|SP-360|SP60|SPT-800|SP-120|SPT-800|SP-140|SPX-5|SPX-8|SP-100|SPX-8|SPX-12)\\b", "Wolfgang": "AT-B24D|AT-AS50HD|AT-AS40W|AT-AS55HD|AT-AS45q2|AT-B26D|AT-AS50Q", "Alcatel": "Alcatel", "Nintendo": "Nintendo 3DS", "Amoi": "Amoi", "INQ": "INQ", "GenericPhone": "Tapatalk|PDA;|SAGEM|\\bmmp\\b|pocket|\\bpsp\\b|symbian|Smartphone|smartfon|treo|up.browser|up.link|vodafone|\\bwap\\b|nokia|Series40|Series60|S60|SonyEricsson|N900|MAUI.*WAP.*Browser" }, "tablets": { "iPad": "iPad|iPad.*Mobile", "NexusTablet": "Android.*Nexus[\\s]+(7|9|10)", "SamsungTablet": "SAMSUNG.*Tablet|Galaxy.*Tab|SC-01C|GT-P1000|GT-P1003|GT-P1010|GT-P3105|GT-P6210|GT-P6800|GT-P6810|GT-P7100|GT-P7300|GT-P7310|GT-P7500|GT-P7510|SCH-I800|SCH-I815|SCH-I905|SGH-I957|SGH-I987|SGH-T849|SGH-T859|SGH-T869|SPH-P100|GT-P3100|GT-P3108|GT-P3110|GT-P5100|GT-P5110|GT-P6200|GT-P7320|GT-P7511|GT-N8000|GT-P8510|SGH-I497|SPH-P500|SGH-T779|SCH-I705|SCH-I915|GT-N8013|GT-P3113|GT-P5113|GT-P8110|GT-N8010|GT-N8005|GT-N8020|GT-P1013|GT-P6201|GT-P7501|GT-N5100|GT-N5105|GT-N5110|SHV-E140K|SHV-E140L|SHV-E140S|SHV-E150S|SHV-E230K|SHV-E230L|SHV-E230S|SHW-M180K|SHW-M180L|SHW-M180S|SHW-M180W|SHW-M300W|SHW-M305W|SHW-M380K|SHW-M380S|SHW-M380W|SHW-M430W|SHW-M480K|SHW-M480S|SHW-M480W|SHW-M485W|SHW-M486W|SHW-M500W|GT-I9228|SCH-P739|SCH-I925|GT-I9200|GT-P5200|GT-P5210|GT-P5210X|SM-T311|SM-T310|SM-T310X|SM-T210|SM-T210R|SM-T211|SM-P600|SM-P601|SM-P605|SM-P900|SM-P901|SM-T217|SM-T217A|SM-T217S|SM-P6000|SM-T3100|SGH-I467|XE500|SM-T110|GT-P5220|GT-I9200X|GT-N5110X|GT-N5120|SM-P905|SM-T111|SM-T2105|SM-T315|SM-T320|SM-T320X|SM-T321|SM-T520|SM-T525|SM-T530NU|SM-T230NU|SM-T330NU|SM-T900|XE500T1C|SM-P605V|SM-P905V|SM-T337V|SM-T537V|SM-T707V|SM-T807V|SM-P600X|SM-P900X|SM-T210X|SM-T230|SM-T230X|SM-T325|GT-P7503|SM-T531|SM-T330|SM-T530|SM-T705|SM-T705C|SM-T535|SM-T331|SM-T800|SM-T700|SM-T537|SM-T807|SM-P907A|SM-T337A|SM-T537A|SM-T707A|SM-T807A|SM-T237|SM-T807P|SM-P607T|SM-T217T|SM-T337T|SM-T807T|SM-T116NQ|SM-P550|SM-T350|SM-T550|SM-T9000|SM-P9000|SM-T705Y|SM-T805|GT-P3113|SM-T710|SM-T810|SM-T815|SM-T360|SM-T533|SM-T113|SM-T335|SM-T715|SM-T560|SM-T670|SM-T677|SM-T377|SM-T567|SM-T357T|SM-T555|SM-T561", "Kindle": "Kindle|Silk.*Accelerated|Android.*\\b(KFOT|KFTT|KFJWI|KFJWA|KFOTE|KFSOWI|KFTHWI|KFTHWA|KFAPWI|KFAPWA|WFJWAE|KFSAWA|KFSAWI|KFASWI|KFARWI)\\b", "SurfaceTablet": "Windows NT [0-9.]+; ARM;.*(Tablet|ARMBJS)", "HPTablet": "HP Slate (7|8|10)|HP ElitePad 900|hp-tablet|EliteBook.*Touch|HP 8|Slate 21|HP SlateBook 10", "AsusTablet": "^.*PadFone((?!Mobile).)*$|Transformer|TF101|TF101G|TF300T|TF300TG|TF300TL|TF700T|TF700KL|TF701T|TF810C|ME171|ME301T|ME302C|ME371MG|ME370T|ME372MG|ME172V|ME173X|ME400C|Slider SL101|\\bK00F\\b|\\bK00C\\b|\\bK00E\\b|\\bK00L\\b|TX201LA|ME176C|ME102A|\\bM80TA\\b|ME372CL|ME560CG|ME372CG|ME302KL| K010 | K017 |ME572C|ME103K|ME170C|ME171C|\\bME70C\\b|ME581C|ME581CL|ME8510C|ME181C|P01Y|PO1MA", "BlackBerryTablet": "PlayBook|RIM Tablet", "HTCtablet": "HTC_Flyer_P512|HTC Flyer|HTC Jetstream|HTC-P715a|HTC EVO View 4G|PG41200|PG09410", "MotorolaTablet": "xoom|sholest|MZ615|MZ605|MZ505|MZ601|MZ602|MZ603|MZ604|MZ606|MZ607|MZ608|MZ609|MZ615|MZ616|MZ617", "NookTablet": "Android.*Nook|NookColor|nook browser|BNRV200|BNRV200A|BNTV250|BNTV250A|BNTV400|BNTV600|LogicPD Zoom2", "AcerTablet": "Android.*; \\b(A100|A101|A110|A200|A210|A211|A500|A501|A510|A511|A700|A701|W500|W500P|W501|W501P|W510|W511|W700|G100|G100W|B1-A71|B1-710|B1-711|A1-810|A1-811|A1-830)\\b|W3-810|\\bA3-A10\\b|\\bA3-A11\\b|\\bA3-A20", "ToshibaTablet": "Android.*(AT100|AT105|AT200|AT205|AT270|AT275|AT300|AT305|AT1S5|AT500|AT570|AT700|AT830)|TOSHIBA.*FOLIO", "LGTablet": "\\bL-06C|LG-V909|LG-V900|LG-V700|LG-V510|LG-V500|LG-V410|LG-V400|LG-VK810\\b", "FujitsuTablet": "Android.*\\b(F-01D|F-02F|F-05E|F-10D|M532|Q572)\\b", "PrestigioTablet": "PMP3170B|PMP3270B|PMP3470B|PMP7170B|PMP3370B|PMP3570C|PMP5870C|PMP3670B|PMP5570C|PMP5770D|PMP3970B|PMP3870C|PMP5580C|PMP5880D|PMP5780D|PMP5588C|PMP7280C|PMP7280C3G|PMP7280|PMP7880D|PMP5597D|PMP5597|PMP7100D|PER3464|PER3274|PER3574|PER3884|PER5274|PER5474|PMP5097CPRO|PMP5097|PMP7380D|PMP5297C|PMP5297C_QUAD|PMP812E|PMP812E3G|PMP812F|PMP810E|PMP880TD|PMT3017|PMT3037|PMT3047|PMT3057|PMT7008|PMT5887|PMT5001|PMT5002", "LenovoTablet": "Lenovo TAB|Idea(Tab|Pad)( A1|A10| K1|)|ThinkPad([ ]+)?Tablet|YT3-X90L|YT3-X90F|YT3-X90X|Lenovo.*(S2109|S2110|S5000|S6000|K3011|A3000|A3500|A1000|A2107|A2109|A1107|A5500|A7600|B6000|B8000|B8080)(-|)(FL|F|HV|H|)", "DellTablet": "Venue 11|Venue 8|Venue 7|Dell Streak 10|Dell Streak 7", "YarvikTablet": "Android.*\\b(TAB210|TAB211|TAB224|TAB250|TAB260|TAB264|TAB310|TAB360|TAB364|TAB410|TAB411|TAB420|TAB424|TAB450|TAB460|TAB461|TAB464|TAB465|TAB467|TAB468|TAB07-100|TAB07-101|TAB07-150|TAB07-151|TAB07-152|TAB07-200|TAB07-201-3G|TAB07-210|TAB07-211|TAB07-212|TAB07-214|TAB07-220|TAB07-400|TAB07-485|TAB08-150|TAB08-200|TAB08-201-3G|TAB08-201-30|TAB09-100|TAB09-211|TAB09-410|TAB10-150|TAB10-201|TAB10-211|TAB10-400|TAB10-410|TAB13-201|TAB274EUK|TAB275EUK|TAB374EUK|TAB462EUK|TAB474EUK|TAB9-200)\\b", "MedionTablet": "Android.*\\bOYO\\b|LIFE.*(P9212|P9514|P9516|S9512)|LIFETAB", "ArnovaTablet": "AN10G2|AN7bG3|AN7fG3|AN8G3|AN8cG3|AN7G3|AN9G3|AN7dG3|AN7dG3ST|AN7dG3ChildPad|AN10bG3|AN10bG3DT|AN9G2", "IntensoTablet": "INM8002KP|INM1010FP|INM805ND|Intenso Tab|TAB1004", "IRUTablet": "M702pro", "MegafonTablet": "MegaFon V9|\\bZTE V9\\b|Android.*\\bMT7A\\b", "EbodaTablet": "E-Boda (Supreme|Impresspeed|Izzycomm|Essential)", "AllViewTablet": "Allview.*(Viva|Alldro|City|Speed|All TV|Frenzy|Quasar|Shine|TX1|AX1|AX2)", "ArchosTablet": "\\b(101G9|80G9|A101IT)\\b|Qilive 97R|Archos5|\\bARCHOS (70|79|80|90|97|101|FAMILYPAD|)(b|)(G10| Cobalt| TITANIUM(HD|)| Xenon| Neon|XSK| 2| XS 2| PLATINUM| CARBON|GAMEPAD)\\b", "AinolTablet": "NOVO7|NOVO8|NOVO10|Novo7Aurora|Novo7Basic|NOVO7PALADIN|novo9-Spark", "NokiaLumiaTablet": "Lumia 2520", "SonyTablet": "Sony.*Tablet|Xperia Tablet|Sony Tablet S|SO-03E|SGPT12|SGPT13|SGPT114|SGPT121|SGPT122|SGPT123|SGPT111|SGPT112|SGPT113|SGPT131|SGPT132|SGPT133|SGPT211|SGPT212|SGPT213|SGP311|SGP312|SGP321|EBRD1101|EBRD1102|EBRD1201|SGP351|SGP341|SGP511|SGP512|SGP521|SGP541|SGP551|SGP621|SGP612|SOT31", "PhilipsTablet": "\\b(PI2010|PI3000|PI3100|PI3105|PI3110|PI3205|PI3210|PI3900|PI4010|PI7000|PI7100)\\b", "CubeTablet": "Android.*(K8GT|U9GT|U10GT|U16GT|U17GT|U18GT|U19GT|U20GT|U23GT|U30GT)|CUBE U8GT", "CobyTablet": "MID1042|MID1045|MID1125|MID1126|MID7012|MID7014|MID7015|MID7034|MID7035|MID7036|MID7042|MID7048|MID7127|MID8042|MID8048|MID8127|MID9042|MID9740|MID9742|MID7022|MID7010", "MIDTablet": "M9701|M9000|M9100|M806|M1052|M806|T703|MID701|MID713|MID710|MID727|MID760|MID830|MID728|MID933|MID125|MID810|MID732|MID120|MID930|MID800|MID731|MID900|MID100|MID820|MID735|MID980|MID130|MID833|MID737|MID960|MID135|MID860|MID736|MID140|MID930|MID835|MID733|MID4X10", "MSITablet": "MSI \\b(Primo 73K|Primo 73L|Primo 81L|Primo 77|Primo 93|Primo 75|Primo 76|Primo 73|Primo 81|Primo 91|Primo 90|Enjoy 71|Enjoy 7|Enjoy 10)\\b", "SMiTTablet": "Android.*(\\bMID\\b|MID-560|MTV-T1200|MTV-PND531|MTV-P1101|MTV-PND530)", "RockChipTablet": "Android.*(RK2818|RK2808A|RK2918|RK3066)|RK2738|RK2808A", "FlyTablet": "IQ310|Fly Vision", "bqTablet": "Android.*(bq)?.*(Elcano|Curie|Edison|Maxwell|Kepler|Pascal|Tesla|Hypatia|Platon|Newton|Livingstone|Cervantes|Avant|Aquaris E10)|Maxwell.*Lite|Maxwell.*Plus", "HuaweiTablet": "MediaPad|MediaPad 7 Youth|IDEOS S7|S7-201c|S7-202u|S7-101|S7-103|S7-104|S7-105|S7-106|S7-201|S7-Slim", "NecTablet": "\\bN-06D|\\bN-08D", "PantechTablet": "Pantech.*P4100", "BronchoTablet": "Broncho.*(N701|N708|N802|a710)", "VersusTablet": "TOUCHPAD.*[78910]|\\bTOUCHTAB\\b", "ZyncTablet": "z1000|Z99 2G|z99|z930|z999|z990|z909|Z919|z900", "PositivoTablet": "TB07STA|TB10STA|TB07FTA|TB10FTA", "NabiTablet": "Android.*\\bNabi", "KoboTablet": "Kobo Touch|\\bK080\\b|\\bVox\\b Build|\\bArc\\b Build", "DanewTablet": "DSlide.*\\b(700|701R|702|703R|704|802|970|971|972|973|974|1010|1012)\\b", "TexetTablet": "NaviPad|TB-772A|TM-7045|TM-7055|TM-9750|TM-7016|TM-7024|TM-7026|TM-7041|TM-7043|TM-7047|TM-8041|TM-9741|TM-9747|TM-9748|TM-9751|TM-7022|TM-7021|TM-7020|TM-7011|TM-7010|TM-7023|TM-7025|TM-7037W|TM-7038W|TM-7027W|TM-9720|TM-9725|TM-9737W|TM-1020|TM-9738W|TM-9740|TM-9743W|TB-807A|TB-771A|TB-727A|TB-725A|TB-719A|TB-823A|TB-805A|TB-723A|TB-715A|TB-707A|TB-705A|TB-709A|TB-711A|TB-890HD|TB-880HD|TB-790HD|TB-780HD|TB-770HD|TB-721HD|TB-710HD|TB-434HD|TB-860HD|TB-840HD|TB-760HD|TB-750HD|TB-740HD|TB-730HD|TB-722HD|TB-720HD|TB-700HD|TB-500HD|TB-470HD|TB-431HD|TB-430HD|TB-506|TB-504|TB-446|TB-436|TB-416|TB-146SE|TB-126SE", "PlaystationTablet": "Playstation.*(Portable|Vita)", "TrekstorTablet": "ST10416-1|VT10416-1|ST70408-1|ST702xx-1|ST702xx-2|ST80208|ST97216|ST70104-2|VT10416-2|ST10216-2A|SurfTab", "PyleAudioTablet": "\\b(PTBL10CEU|PTBL10C|PTBL72BC|PTBL72BCEU|PTBL7CEU|PTBL7C|PTBL92BC|PTBL92BCEU|PTBL9CEU|PTBL9CUK|PTBL9C)\\b", "AdvanTablet": "Android.* \\b(E3A|T3X|T5C|T5B|T3E|T3C|T3B|T1J|T1F|T2A|T1H|T1i|E1C|T1-E|T5-A|T4|E1-B|T2Ci|T1-B|T1-D|O1-A|E1-A|T1-A|T3A|T4i)\\b ", "DanyTechTablet": "Genius Tab G3|Genius Tab S2|Genius Tab Q3|Genius Tab G4|Genius Tab Q4|Genius Tab G-II|Genius TAB GII|Genius TAB GIII|Genius Tab S1", "GalapadTablet": "Android.*\\bG1\\b", "MicromaxTablet": "Funbook|Micromax.*\\b(P250|P560|P360|P362|P600|P300|P350|P500|P275)\\b", "KarbonnTablet": "Android.*\\b(A39|A37|A34|ST8|ST10|ST7|Smart Tab3|Smart Tab2)\\b", "AllFineTablet": "Fine7 Genius|Fine7 Shine|Fine7 Air|Fine8 Style|Fine9 More|Fine10 Joy|Fine11 Wide", "PROSCANTablet": "\\b(PEM63|PLT1023G|PLT1041|PLT1044|PLT1044G|PLT1091|PLT4311|PLT4311PL|PLT4315|PLT7030|PLT7033|PLT7033D|PLT7035|PLT7035D|PLT7044K|PLT7045K|PLT7045KB|PLT7071KG|PLT7072|PLT7223G|PLT7225G|PLT7777G|PLT7810K|PLT7849G|PLT7851G|PLT7852G|PLT8015|PLT8031|PLT8034|PLT8036|PLT8080K|PLT8082|PLT8088|PLT8223G|PLT8234G|PLT8235G|PLT8816K|PLT9011|PLT9045K|PLT9233G|PLT9735|PLT9760G|PLT9770G)\\b", "YONESTablet": "BQ1078|BC1003|BC1077|RK9702|BC9730|BC9001|IT9001|BC7008|BC7010|BC708|BC728|BC7012|BC7030|BC7027|BC7026", "ChangJiaTablet": "TPC7102|TPC7103|TPC7105|TPC7106|TPC7107|TPC7201|TPC7203|TPC7205|TPC7210|TPC7708|TPC7709|TPC7712|TPC7110|TPC8101|TPC8103|TPC8105|TPC8106|TPC8203|TPC8205|TPC8503|TPC9106|TPC9701|TPC97101|TPC97103|TPC97105|TPC97106|TPC97111|TPC97113|TPC97203|TPC97603|TPC97809|TPC97205|TPC10101|TPC10103|TPC10106|TPC10111|TPC10203|TPC10205|TPC10503", "GUTablet": "TX-A1301|TX-M9002|Q702|kf026", "PointOfViewTablet": "TAB-P506|TAB-navi-7-3G-M|TAB-P517|TAB-P-527|TAB-P701|TAB-P703|TAB-P721|TAB-P731N|TAB-P741|TAB-P825|TAB-P905|TAB-P925|TAB-PR945|TAB-PL1015|TAB-P1025|TAB-PI1045|TAB-P1325|TAB-PROTAB[0-9]+|TAB-PROTAB25|TAB-PROTAB26|TAB-PROTAB27|TAB-PROTAB26XL|TAB-PROTAB2-IPS9|TAB-PROTAB30-IPS9|TAB-PROTAB25XXL|TAB-PROTAB26-IPS10|TAB-PROTAB30-IPS10", "OvermaxTablet": "OV-(SteelCore|NewBase|Basecore|Baseone|Exellen|Quattor|EduTab|Solution|ACTION|BasicTab|TeddyTab|MagicTab|Stream|TB-08|TB-09)", "HCLTablet": "HCL.*Tablet|Connect-3G-2.0|Connect-2G-2.0|ME Tablet U1|ME Tablet U2|ME Tablet G1|ME Tablet X1|ME Tablet Y2|ME Tablet Sync", "DPSTablet": "DPS Dream 9|DPS Dual 7", "VistureTablet": "V97 HD|i75 3G|Visture V4( HD)?|Visture V5( HD)?|Visture V10", "CrestaTablet": "CTP(-)?810|CTP(-)?818|CTP(-)?828|CTP(-)?838|CTP(-)?888|CTP(-)?978|CTP(-)?980|CTP(-)?987|CTP(-)?988|CTP(-)?989", "MediatekTablet": "\\bMT8125|MT8389|MT8135|MT8377\\b", "ConcordeTablet": "Concorde([ ]+)?Tab|ConCorde ReadMan", "GoCleverTablet": "GOCLEVER TAB|A7GOCLEVER|M1042|M7841|M742|R1042BK|R1041|TAB A975|TAB A7842|TAB A741|TAB A741L|TAB M723G|TAB M721|TAB A1021|TAB I921|TAB R721|TAB I720|TAB T76|TAB R70|TAB R76.2|TAB R106|TAB R83.2|TAB M813G|TAB I721|GCTA722|TAB I70|TAB I71|TAB S73|TAB R73|TAB R74|TAB R93|TAB R75|TAB R76.1|TAB A73|TAB A93|TAB A93.2|TAB T72|TAB R83|TAB R974|TAB R973|TAB A101|TAB A103|TAB A104|TAB A104.2|R105BK|M713G|A972BK|TAB A971|TAB R974.2|TAB R104|TAB R83.3|TAB A1042", "ModecomTablet": "FreeTAB 9000|FreeTAB 7.4|FreeTAB 7004|FreeTAB 7800|FreeTAB 2096|FreeTAB 7.5|FreeTAB 1014|FreeTAB 1001 |FreeTAB 8001|FreeTAB 9706|FreeTAB 9702|FreeTAB 7003|FreeTAB 7002|FreeTAB 1002|FreeTAB 7801|FreeTAB 1331|FreeTAB 1004|FreeTAB 8002|FreeTAB 8014|FreeTAB 9704|FreeTAB 1003", "VoninoTablet": "\\b(Argus[ _]?S|Diamond[ _]?79HD|Emerald[ _]?78E|Luna[ _]?70C|Onyx[ _]?S|Onyx[ _]?Z|Orin[ _]?HD|Orin[ _]?S|Otis[ _]?S|SpeedStar[ _]?S|Magnet[ _]?M9|Primus[ _]?94[ _]?3G|Primus[ _]?94HD|Primus[ _]?QS|Android.*\\bQ8\\b|Sirius[ _]?EVO[ _]?QS|Sirius[ _]?QS|Spirit[ _]?S)\\b", "ECSTablet": "V07OT2|TM105A|S10OT1|TR10CS1", "StorexTablet": "eZee[_']?(Tab|Go)[0-9]+|TabLC7|Looney Tunes Tab", "VodafoneTablet": "SmartTab([ ]+)?[0-9]+|SmartTabII10|SmartTabII7|VF-1497", "EssentielBTablet": "Smart[ ']?TAB[ ]+?[0-9]+|Family[ ']?TAB2", "RossMoorTablet": "RM-790|RM-997|RMD-878G|RMD-974R|RMT-705A|RMT-701|RME-601|RMT-501|RMT-711", "iMobileTablet": "i-mobile i-note", "TolinoTablet": "tolino tab [0-9.]+|tolino shine", "AudioSonicTablet": "\\bC-22Q|T7-QC|T-17B|T-17P\\b", "AMPETablet": "Android.* A78 ", "SkkTablet": "Android.* (SKYPAD|PHOENIX|CYCLOPS)", "TecnoTablet": "TECNO P9", "JXDTablet": "Android.* \\b(F3000|A3300|JXD5000|JXD3000|JXD2000|JXD300B|JXD300|S5800|S7800|S602b|S5110b|S7300|S5300|S602|S603|S5100|S5110|S601|S7100a|P3000F|P3000s|P101|P200s|P1000m|P200m|P9100|P1000s|S6600b|S908|P1000|P300|S18|S6600|S9100)\\b", "iJoyTablet": "Tablet (Spirit 7|Essentia|Galatea|Fusion|Onix 7|Landa|Titan|Scooby|Deox|Stella|Themis|Argon|Unique 7|Sygnus|Hexen|Finity 7|Cream|Cream X2|Jade|Neon 7|Neron 7|Kandy|Scape|Saphyr 7|Rebel|Biox|Rebel|Rebel 8GB|Myst|Draco 7|Myst|Tab7-004|Myst|Tadeo Jones|Tablet Boing|Arrow|Draco Dual Cam|Aurix|Mint|Amity|Revolution|Finity 9|Neon 9|T9w|Amity 4GB Dual Cam|Stone 4GB|Stone 8GB|Andromeda|Silken|X2|Andromeda II|Halley|Flame|Saphyr 9,7|Touch 8|Planet|Triton|Unique 10|Hexen 10|Memphis 4GB|Memphis 8GB|Onix 10)", "FX2Tablet": "FX2 PAD7|FX2 PAD10", "XoroTablet": "KidsPAD 701|PAD[ ]?712|PAD[ ]?714|PAD[ ]?716|PAD[ ]?717|PAD[ ]?718|PAD[ ]?720|PAD[ ]?721|PAD[ ]?722|PAD[ ]?790|PAD[ ]?792|PAD[ ]?900|PAD[ ]?9715D|PAD[ ]?9716DR|PAD[ ]?9718DR|PAD[ ]?9719QR|PAD[ ]?9720QR|TelePAD1030|Telepad1032|TelePAD730|TelePAD731|TelePAD732|TelePAD735Q|TelePAD830|TelePAD9730|TelePAD795|MegaPAD 1331|MegaPAD 1851|MegaPAD 2151", "ViewsonicTablet": "ViewPad 10pi|ViewPad 10e|ViewPad 10s|ViewPad E72|ViewPad7|ViewPad E100|ViewPad 7e|ViewSonic VB733|VB100a", "OdysTablet": "LOOX|XENO10|ODYS[ -](Space|EVO|Xpress|NOON)|\\bXELIO\\b|Xelio10Pro|XELIO7PHONETAB|XELIO10EXTREME|XELIOPT2|NEO_QUAD10", "CaptivaTablet": "CAPTIVA PAD", "IconbitTablet": "NetTAB|NT-3702|NT-3702S|NT-3702S|NT-3603P|NT-3603P|NT-0704S|NT-0704S|NT-3805C|NT-3805C|NT-0806C|NT-0806C|NT-0909T|NT-0909T|NT-0907S|NT-0907S|NT-0902S|NT-0902S", "TeclastTablet": "T98 4G|\\bP80\\b|\\bX90HD\\b|X98 Air|X98 Air 3G|\\bX89\\b|P80 3G|\\bX80h\\b|P98 Air|\\bX89HD\\b|P98 3G|\\bP90HD\\b|P89 3G|X98 3G|\\bP70h\\b|P79HD 3G|G18d 3G|\\bP79HD\\b|\\bP89s\\b|\\bA88\\b|\\bP10HD\\b|\\bP19HD\\b|G18 3G|\\bP78HD\\b|\\bA78\\b|\\bP75\\b|G17s 3G|G17h 3G|\\bP85t\\b|\\bP90\\b|\\bP11\\b|\\bP98t\\b|\\bP98HD\\b|\\bG18d\\b|\\bP85s\\b|\\bP11HD\\b|\\bP88s\\b|\\bA80HD\\b|\\bA80se\\b|\\bA10h\\b|\\bP89\\b|\\bP78s\\b|\\bG18\\b|\\bP85\\b|\\bA70h\\b|\\bA70\\b|\\bG17\\b|\\bP18\\b|\\bA80s\\b|\\bA11s\\b|\\bP88HD\\b|\\bA80h\\b|\\bP76s\\b|\\bP76h\\b|\\bP98\\b|\\bA10HD\\b|\\bP78\\b|\\bP88\\b|\\bA11\\b|\\bA10t\\b|\\bP76a\\b|\\bP76t\\b|\\bP76e\\b|\\bP85HD\\b|\\bP85a\\b|\\bP86\\b|\\bP75HD\\b|\\bP76v\\b|\\bA12\\b|\\bP75a\\b|\\bA15\\b|\\bP76Ti\\b|\\bP81HD\\b|\\bA10\\b|\\bT760VE\\b|\\bT720HD\\b|\\bP76\\b|\\bP73\\b|\\bP71\\b|\\bP72\\b|\\bT720SE\\b|\\bC520Ti\\b|\\bT760\\b|\\bT720VE\\b|T720-3GE|T720-WiFi", "OndaTablet": "\\b(V975i|Vi30|VX530|V701|Vi60|V701s|Vi50|V801s|V719|Vx610w|VX610W|V819i|Vi10|VX580W|Vi10|V711s|V813|V811|V820w|V820|Vi20|V711|VI30W|V712|V891w|V972|V819w|V820w|Vi60|V820w|V711|V813s|V801|V819|V975s|V801|V819|V819|V818|V811|V712|V975m|V101w|V961w|V812|V818|V971|V971s|V919|V989|V116w|V102w|V973|Vi40)\\b[\\s]+", "JaytechTablet": "TPC-PA762", "BlaupunktTablet": "Endeavour 800NG|Endeavour 1010", "DigmaTablet": "\\b(iDx10|iDx9|iDx8|iDx7|iDxD7|iDxD8|iDsQ8|iDsQ7|iDsQ8|iDsD10|iDnD7|3TS804H|iDsQ11|iDj7|iDs10)\\b", "EvolioTablet": "ARIA_Mini_wifi|Aria[ _]Mini|Evolio X10|Evolio X7|Evolio X8|\\bEvotab\\b|\\bNeura\\b", "LavaTablet": "QPAD E704|\\bIvoryS\\b|E-TAB IVORY|\\bE-TAB\\b", "AocTablet": "MW0811|MW0812|MW0922|MTK8382|MW1031|MW0831|MW0821|MW0931|MW0712", "MpmanTablet": "MP11 OCTA|MP10 OCTA|MPQC1114|MPQC1004|MPQC994|MPQC974|MPQC973|MPQC804|MPQC784|MPQC780|\\bMPG7\\b|MPDCG75|MPDCG71|MPDC1006|MP101DC|MPDC9000|MPDC905|MPDC706HD|MPDC706|MPDC705|MPDC110|MPDC100|MPDC99|MPDC97|MPDC88|MPDC8|MPDC77|MP709|MID701|MID711|MID170|MPDC703|MPQC1010", "CelkonTablet": "CT695|CT888|CT[\\s]?910|CT7 Tab|CT9 Tab|CT3 Tab|CT2 Tab|CT1 Tab|C820|C720|\\bCT-1\\b", "WolderTablet": "miTab \\b(DIAMOND|SPACE|BROOKLYN|NEO|FLY|MANHATTAN|FUNK|EVOLUTION|SKY|GOCAR|IRON|GENIUS|POP|MINT|EPSILON|BROADWAY|JUMP|HOP|LEGEND|NEW AGE|LINE|ADVANCE|FEEL|FOLLOW|LIKE|LINK|LIVE|THINK|FREEDOM|CHICAGO|CLEVELAND|BALTIMORE-GH|IOWA|BOSTON|SEATTLE|PHOENIX|DALLAS|IN 101|MasterChef)\\b", "MiTablet": "\\bMI PAD\\b|\\bHM NOTE 1W\\b", "NibiruTablet": "Nibiru M1|Nibiru Jupiter One", "NexoTablet": "NEXO NOVA|NEXO 10|NEXO AVIO|NEXO FREE|NEXO GO|NEXO EVO|NEXO 3G|NEXO SMART|NEXO KIDDO|NEXO MOBI", "LeaderTablet": "TBLT10Q|TBLT10I|TBL-10WDKB|TBL-10WDKBO2013|TBL-W230V2|TBL-W450|TBL-W500|SV572|TBLT7I|TBA-AC7-8G|TBLT79|TBL-8W16|TBL-10W32|TBL-10WKB|TBL-W100", "UbislateTablet": "UbiSlate[\\s]?7C", "PocketBookTablet": "Pocketbook", "KocasoTablet": "\\b(TB-1207)\\b", "Hudl": "Hudl HT7S3|Hudl 2", "TelstraTablet": "T-Hub2", "GenericTablet": "Android.*\\b97D\\b|Tablet(?!.*PC)|BNTV250A|MID-WCDMA|LogicPD Zoom2|\\bA7EB\\b|CatNova8|A1_07|CT704|CT1002|\\bM721\\b|rk30sdk|\\bEVOTAB\\b|M758A|ET904|ALUMIUM10|Smartfren Tab|Endeavour 1010|Tablet-PC-4|Tagi Tab|\\bM6pro\\b|CT1020W|arc 10HD|\\bJolla\\b|\\bTP750\\b" }, "oss": { "AndroidOS": "Android", "BlackBerryOS": "blackberry|\\bBB10\\b|rim tablet os", "PalmOS": "PalmOS|avantgo|blazer|elaine|hiptop|palm|plucker|xiino", "SymbianOS": "Symbian|SymbOS|Series60|Series40|SYB-[0-9]+|\\bS60\\b", "WindowsMobileOS": "Windows CE.*(PPC|Smartphone|Mobile|[0-9]{3}x[0-9]{3})|Window Mobile|Windows Phone [0-9.]+|WCE;", "WindowsPhoneOS": "Windows Phone 10.0|Windows Phone 8.1|Windows Phone 8.0|Windows Phone OS|XBLWP7|ZuneWP7|Windows NT 6.[23]; ARM;", "iOS": "\\biPhone.*Mobile|\\biPod|\\biPad", "MeeGoOS": "MeeGo", "MaemoOS": "Maemo", "JavaOS": "J2ME\/|\\bMIDP\\b|\\bCLDC\\b", "webOS": "webOS|hpwOS", "badaOS": "\\bBada\\b", "BREWOS": "BREW" }, "uas": { "Vivaldi": "Vivaldi", "Chrome": "\\bCrMo\\b|CriOS|Android.*Chrome\/[.0-9]* (Mobile)?", "Dolfin": "\\bDolfin\\b", "Opera": "Opera.*Mini|Opera.*Mobi|Android.*Opera|Mobile.*OPR\/[0-9.]+|Coast\/[0-9.]+", "Skyfire": "Skyfire", "Edge": "Mobile Safari\/[.0-9]* Edge", "IE": "IEMobile|MSIEMobile", "Firefox": "fennec|firefox.*maemo|(Mobile|Tablet).*Firefox|Firefox.*Mobile", "Bolt": "bolt", "TeaShark": "teashark", "Blazer": "Blazer", "Safari": "Version.*Mobile.*Safari|Safari.*Mobile|MobileSafari", "Tizen": "Tizen", "UCBrowser": "UC.*Browser|UCWEB", "baiduboxapp": "baiduboxapp", "baidubrowser": "baidubrowser", "DiigoBrowser": "DiigoBrowser", "Puffin": "Puffin", "Mercury": "\\bMercury\\b", "ObigoBrowser": "Obigo", "NetFront": "NF-Browser", "GenericBrowser": "NokiaBrowser|OviBrowser|OneBrowser|TwonkyBeamBrowser|SEMC.*Browser|FlyFlow|Minimo|NetFront|Novarra-Vision|MQQBrowser|MicroMessenger", "PaleMoon": "Android.*PaleMoon|Mobile.*PaleMoon" }, "props": { "Mobile": "Mobile\/[VER]", "Build": "Build\/[VER]", "Version": "Version\/[VER]", "VendorID": "VendorID\/[VER]", "iPad": "iPad.*CPU[a-z ]+[VER]", "iPhone": "iPhone.*CPU[a-z ]+[VER]", "iPod": "iPod.*CPU[a-z ]+[VER]", "Kindle": "Kindle\/[VER]", "Chrome": [ "Chrome\/[VER]", "CriOS\/[VER]", "CrMo\/[VER]" ], "Coast": [ "Coast\/[VER]" ], "Dolfin": "Dolfin\/[VER]", "Firefox": "Firefox\/[VER]", "Fennec": "Fennec\/[VER]", "Edge": "Edge\/[VER]", "IE": [ "IEMobile\/[VER];", "IEMobile [VER]", "MSIE [VER];", "Trident\/[0-9.]+;.*rv:[VER]" ], "NetFront": "NetFront\/[VER]", "NokiaBrowser": "NokiaBrowser\/[VER]", "Opera": [ " OPR\/[VER]", "Opera Mini\/[VER]", "Version\/[VER]" ], "Opera Mini": "Opera Mini\/[VER]", "Opera Mobi": "Version\/[VER]", "UC Browser": "UC Browser[VER]", "MQQBrowser": "MQQBrowser\/[VER]", "MicroMessenger": "MicroMessenger\/[VER]", "baiduboxapp": "baiduboxapp\/[VER]", "baidubrowser": "baidubrowser\/[VER]", "Iron": "Iron\/[VER]", "Safari": [ "Version\/[VER]", "Safari\/[VER]" ], "Skyfire": "Skyfire\/[VER]", "Tizen": "Tizen\/[VER]", "Webkit": "webkit[ \/][VER]", "PaleMoon": "PaleMoon\/[VER]", "Gecko": "Gecko\/[VER]", "Trident": "Trident\/[VER]", "Presto": "Presto\/[VER]", "Goanna": "Goanna\/[VER]", "iOS": " \\bi?OS\\b [VER][ ;]{1}", "Android": "Android [VER]", "BlackBerry": [ "BlackBerry[\\w]+\/[VER]", "BlackBerry.*Version\/[VER]", "Version\/[VER]" ], "BREW": "BREW [VER]", "Java": "Java\/[VER]", "Windows Phone OS": [ "Windows Phone OS [VER]", "Windows Phone [VER]" ], "Windows Phone": "Windows Phone [VER]", "Windows CE": "Windows CE\/[VER]", "Windows NT": "Windows NT [VER]", "Symbian": [ "SymbianOS\/[VER]", "Symbian\/[VER]" ], "webOS": [ "webOS\/[VER]", "hpwOS\/[VER];" ] }, "utils": { "Bot": "Googlebot|facebookexternalhit|AdsBot-Google|Google Keyword Suggestion|Facebot|YandexBot|bingbot|ia_archiver|AhrefsBot|Ezooms|GSLFbot|WBSearchBot|Twitterbot|TweetmemeBot|Twikle|PaperLiBot|Wotbox|UnwindFetchor|Exabot|MJ12bot|YandexImages|TurnitinBot|Pingdom", "MobileBot": "Googlebot-Mobile|AdsBot-Google-Mobile|YahooSeeker\/M1A1-R2D2", "DesktopMode": "WPDesktop", "TV": "SonyDTV|HbbTV", "WebKit": "(webkit)[ \/]([\\w.]+)", "Console": "\\b(Nintendo|Nintendo WiiU|Nintendo 3DS|PLAYSTATION|Xbox)\\b", "Watch": "SM-V700" }}; // following patterns come from http://detectmobilebrowsers.com/ impl.detectMobileBrowsers = { fullPattern: /(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino/i, shortPattern: /1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i, tabletPattern: /android|ipad|playbook|silk/i }; var hasOwnProp = Object.prototype.hasOwnProperty, isArray; impl.FALLBACK_PHONE = 'UnknownPhone'; impl.FALLBACK_TABLET = 'UnknownTablet'; impl.FALLBACK_MOBILE = 'UnknownMobile'; isArray = ('isArray' in Array) ? Array.isArray : function (value) { return Object.prototype.toString.call(value) === '[object Array]'; }; isArray = 'isArray' in Array ? function (value) { return Object.prototype.toString.call(value) === '[object Array]'; } : Array.isArray; function equalIC(a, b) { return a != null && b != null && a.toLowerCase() === b.toLowerCase(); } function containsIC(array, value) { var valueLC, i, len = array.length; if (!len || !value) { return false; } valueLC = value.toLowerCase(); for (i = 0; i < len; ++i) { if (valueLC === array[i].toLowerCase()) { return true; } } return false; } function convertPropsToRegExp(object) { for (var key in object) { if (hasOwnProp.call(object, key)) { object[key] = new RegExp(object[key], 'i'); } } } (function init() { var key, values, value, i, len, verPos, mobileDetectRules = impl.mobileDetectRules; for (key in mobileDetectRules.props) { if (hasOwnProp.call(mobileDetectRules.props, key)) { values = mobileDetectRules.props[key]; if (!isArray(values)) { values = [values]; } len = values.length; for (i = 0; i < len; ++i) { value = values[i]; verPos = value.indexOf('[VER]'); if (verPos >= 0) { value = value.substring(0, verPos) + '([\\w._\\+]+)' + value.substring(verPos + 5); } values[i] = new RegExp(value, 'i'); } mobileDetectRules.props[key] = values; } } convertPropsToRegExp(mobileDetectRules.oss); convertPropsToRegExp(mobileDetectRules.phones); convertPropsToRegExp(mobileDetectRules.tablets); convertPropsToRegExp(mobileDetectRules.uas); convertPropsToRegExp(mobileDetectRules.utils); // copy some patterns to oss0 which are tested first (see issue#15) mobileDetectRules.oss0 = { WindowsPhoneOS: mobileDetectRules.oss.WindowsPhoneOS, WindowsMobileOS: mobileDetectRules.oss.WindowsMobileOS }; }()); /** * Test userAgent string against a set of rules and find the first matched key. * @param {Object} rules (key is String, value is RegExp) * @param {String} userAgent the navigator.userAgent (or HTTP-Header 'User-Agent'). * @returns {String|null} the matched key if found, otherwise null * @private */ impl.findMatch = function(rules, userAgent) { for (var key in rules) { if (hasOwnProp.call(rules, key)) { if (rules[key].test(userAgent)) { return key; } } } return null; }; /** * Test userAgent string against a set of rules and return an array of matched keys. * @param {Object} rules (key is String, value is RegExp) * @param {String} userAgent the navigator.userAgent (or HTTP-Header 'User-Agent'). * @returns {Array} an array of matched keys, may be empty when there is no match, but not null * @private */ impl.findMatches = function(rules, userAgent) { var result = []; for (var key in rules) { if (hasOwnProp.call(rules, key)) { if (rules[key].test(userAgent)) { result.push(key); } } } return result; }; /** * Check the version of the given property in the User-Agent. * * @param {String} propertyName * @param {String} userAgent * @return {String} version or null if version not found * @private */ impl.getVersionStr = function (propertyName, userAgent) { var props = impl.mobileDetectRules.props, patterns, i, len, match; if (hasOwnProp.call(props, propertyName)) { patterns = props[propertyName]; len = patterns.length; for (i = 0; i < len; ++i) { match = patterns[i].exec(userAgent); if (match !== null) { return match[1]; } } } return null; }; /** * Check the version of the given property in the User-Agent. * Will return a float number. (eg. 2_0 will return 2.0, 4.3.1 will return 4.31) * * @param {String} propertyName * @param {String} userAgent * @return {Number} version or NaN if version not found * @private */ impl.getVersion = function (propertyName, userAgent) { var version = impl.getVersionStr(propertyName, userAgent); return version ? impl.prepareVersionNo(version) : NaN; }; /** * Prepare the version number. * * @param {String} version * @return {Number} the version number as a floating number * @private */ impl.prepareVersionNo = function (version) { var numbers; numbers = version.split(/[a-z._ \/\-]/i); if (numbers.length === 1) { version = numbers[0]; } if (numbers.length > 1) { version = numbers[0] + '.'; numbers.shift(); version += numbers.join(''); } return Number(version); }; impl.isMobileFallback = function (userAgent) { return impl.detectMobileBrowsers.fullPattern.test(userAgent) || impl.detectMobileBrowsers.shortPattern.test(userAgent.substr(0,4)); }; impl.isTabletFallback = function (userAgent) { return impl.detectMobileBrowsers.tabletPattern.test(userAgent); }; impl.prepareDetectionCache = function (cache, userAgent, maxPhoneWidth) { if (cache.mobile !== undefined) { return; } var phone, tablet, phoneSized; // first check for stronger tablet rules, then phone (see issue#5) tablet = impl.findMatch(impl.mobileDetectRules.tablets, userAgent); if (tablet) { cache.mobile = cache.tablet = tablet; cache.phone = null; return; // unambiguously identified as tablet } phone = impl.findMatch(impl.mobileDetectRules.phones, userAgent); if (phone) { cache.mobile = cache.phone = phone; cache.tablet = null; return; // unambiguously identified as phone } // our rules haven't found a match -> try more general fallback rules if (impl.isMobileFallback(userAgent)) { phoneSized = MobileDetect.isPhoneSized(maxPhoneWidth); if (phoneSized === undefined) { cache.mobile = impl.FALLBACK_MOBILE; cache.tablet = cache.phone = null; } else if (phoneSized) { cache.mobile = cache.phone = impl.FALLBACK_PHONE; cache.tablet = null; } else { cache.mobile = cache.tablet = impl.FALLBACK_TABLET; cache.phone = null; } } else if (impl.isTabletFallback(userAgent)) { cache.mobile = cache.tablet = impl.FALLBACK_TABLET; cache.phone = null; } else { // not mobile at all! cache.mobile = cache.tablet = cache.phone = null; } }; // t is a reference to a MobileDetect instance impl.mobileGrade = function (t) { // impl note: // To keep in sync w/ Mobile_Detect.php easily, the following code is tightly aligned to the PHP version. // When changes are made in Mobile_Detect.php, copy this method and replace: // $this-> / t. // self::MOBILE_GRADE_(.) / '$1' // , self::VERSION_TYPE_FLOAT / (nothing) // isIOS() / os('iOS') // [reg] / (nothing) <-- jsdelivr complaining about unescaped unicode character U+00AE var $isMobile = t.mobile() !== null; if ( // Apple iOS 3.2-5.1 - Tested on the original iPad (4.3 / 5.0), iPad 2 (4.3), iPad 3 (5.1), original iPhone (3.1), iPhone 3 (3.2), 3GS (4.3), 4 (4.3 / 5.0), and 4S (5.1) t.os('iOS') && t.version('iPad')>=4.3 || t.os('iOS') && t.version('iPhone')>=3.1 || t.os('iOS') && t.version('iPod')>=3.1 || // Android 2.1-2.3 - Tested on the HTC Incredible (2.2), original Droid (2.2), HTC Aria (2.1), Google Nexus S (2.3). Functional on 1.5 & 1.6 but performance may be sluggish, tested on Google G1 (1.5) // Android 3.1 (Honeycomb) - Tested on the Samsung Galaxy Tab 10.1 and Motorola XOOM // Android 4.0 (ICS) - Tested on a Galaxy Nexus. Note: transition performance can be poor on upgraded devices // Android 4.1 (Jelly Bean) - Tested on a Galaxy Nexus and Galaxy 7 ( t.version('Android')>2.1 && t.is('Webkit') ) || // Windows Phone 7-7.5 - Tested on the HTC Surround (7.0) HTC Trophy (7.5), LG-E900 (7.5), Nokia Lumia 800 t.version('Windows Phone OS')>=7.0 || // Blackberry 7 - Tested on BlackBerry Torch 9810 // Blackberry 6.0 - Tested on the Torch 9800 and Style 9670 t.is('BlackBerry') && t.version('BlackBerry')>=6.0 || // Blackberry Playbook (1.0-2.0) - Tested on PlayBook t.match('Playbook.*Tablet') || // Palm WebOS (1.4-2.0) - Tested on the Palm Pixi (1.4), Pre (1.4), Pre 2 (2.0) ( t.version('webOS')>=1.4 && t.match('Palm|Pre|Pixi') ) || // Palm WebOS 3.0 - Tested on HP TouchPad t.match('hp.*TouchPad') || // Firefox Mobile (12 Beta) - Tested on Android 2.3 device ( t.is('Firefox') && t.version('Firefox')>=12 ) || // Chrome for Android - Tested on Android 4.0, 4.1 device ( t.is('Chrome') && t.is('AndroidOS') && t.version('Android')>=4.0 ) || // Skyfire 4.1 - Tested on Android 2.3 device ( t.is('Skyfire') && t.version('Skyfire')>=4.1 && t.is('AndroidOS') && t.version('Android')>=2.3 ) || // Opera Mobile 11.5-12: Tested on Android 2.3 ( t.is('Opera') && t.version('Opera Mobi')>11 && t.is('AndroidOS') ) || // Meego 1.2 - Tested on Nokia 950 and N9 t.is('MeeGoOS') || // Tizen (pre-release) - Tested on early hardware t.is('Tizen') || // Samsung Bada 2.0 - Tested on a Samsung Wave 3, Dolphin browser // @todo: more tests here! t.is('Dolfin') && t.version('Bada')>=2.0 || // UC Browser - Tested on Android 2.3 device ( (t.is('UC Browser') || t.is('Dolfin')) && t.version('Android')>=2.3 ) || // Kindle 3 and Fire - Tested on the built-in WebKit browser for each ( t.match('Kindle Fire') || t.is('Kindle') && t.version('Kindle')>=3.0 ) || // Nook Color 1.4.1 - Tested on original Nook Color, not Nook Tablet t.is('AndroidOS') && t.is('NookTablet') || // Chrome Desktop 11-21 - Tested on OS X 10.7 and Windows 7 t.version('Chrome')>=11 && !$isMobile || // Safari Desktop 4-5 - Tested on OS X 10.7 and Windows 7 t.version('Safari')>=5.0 && !$isMobile || // Firefox Desktop 4-13 - Tested on OS X 10.7 and Windows 7 t.version('Firefox')>=4.0 && !$isMobile || // Internet Explorer 7-9 - Tested on Windows XP, Vista and 7 t.version('MSIE')>=7.0 && !$isMobile || // Opera Desktop 10-12 - Tested on OS X 10.7 and Windows 7 // @reference: http://my.opera.com/community/openweb/idopera/ t.version('Opera')>=10 && !$isMobile ){ return 'A'; } if ( t.os('iOS') && t.version('iPad')<4.3 || t.os('iOS') && t.version('iPhone')<3.1 || t.os('iOS') && t.version('iPod')<3.1 || // Blackberry 5.0: Tested on the Storm 2 9550, Bold 9770 t.is('Blackberry') && t.version('BlackBerry')>=5 && t.version('BlackBerry')<6 || //Opera Mini (5.0-6.5) - Tested on iOS 3.2/4.3 and Android 2.3 ( t.version('Opera Mini')>=5.0 && t.version('Opera Mini')<=6.5 && (t.version('Android')>=2.3 || t.is('iOS')) ) || // Nokia Symbian^3 - Tested on Nokia N8 (Symbian^3), C7 (Symbian^3), also works on N97 (Symbian^1) t.match('NokiaN8|NokiaC7|N97.*Series60|Symbian/3') || // @todo: report this (tested on Nokia N71) t.version('Opera Mobi')>=11 && t.is('SymbianOS') ){ return 'B'; } if ( // Blackberry 4.x - Tested on the Curve 8330 t.version('BlackBerry')<5.0 || // Windows Mobile - Tested on the HTC Leo (WinMo 5.2) t.match('MSIEMobile|Windows CE.*Mobile') || t.version('Windows Mobile')<=5.2 ){ return 'C'; } //All older smartphone platforms and featurephones - Any device that doesn't support media queries //will receive the basic, C grade experience. return 'C'; }; impl.detectOS = function (ua) { return impl.findMatch(impl.mobileDetectRules.oss0, ua) || impl.findMatch(impl.mobileDetectRules.oss, ua); }; impl.getDeviceSmallerSide = function () { return window.screen.width < window.screen.height ? window.screen.width : window.screen.height; }; /** * Constructor for MobileDetect object. *
* Such an object will keep a reference to the given user-agent string and cache most of the detect queries.
*
* Find information how to download and install: * github.com/hgoebl/mobile-detect.js/ *
* * @example 
     *     var md = new MobileDetect(window.navigator.userAgent);     *     if (md.mobile()) {     *         location.href = (md.mobileGrade() === 'A') ? '/mobile/' : '/lynx/';     *     }     *
* * @param {string} userAgent typically taken from window.navigator.userAgent or http_header['User-Agent'] * @param {number} [maxPhoneWidth=600] only for browsers specify a value for the maximum * width of smallest device side (in logical "CSS" pixels) until a device detected as mobile will be handled * as phone. * This is only used in cases where the device cannot be classified as phone or tablet.
* See Declaring Tablet Layouts * for Android.
* If you provide a value < 0, then this "fuzzy" check is disabled. * @constructor * @global */ function MobileDetect(userAgent, maxPhoneWidth) { this.ua = userAgent || ''; this._cache = {}; //600dp is typical 7" tablet minimum width this.maxPhoneWidth = maxPhoneWidth || 600; } MobileDetect.prototype = { constructor: MobileDetect, /** * Returns the detected phone or tablet type or null if it is not a mobile device. *
* For a list of possible return values see {@link MobileDetect#phone} and {@link MobileDetect#tablet}.
*
* If the device is not detected by the regular expressions from Mobile-Detect, a test is made against * the patterns of detectmobilebrowsers.com. If this test * is positive, a value of UnknownPhone, UnknownTablet or * UnknownMobile is returned.
* When used in browser, the decision whether phone or tablet is made based on screen.width/height.
*
* When used server-side (node.js), there is no way to tell the difference between UnknownTablet * and UnknownMobile, so you will get UnknownMobile here.
* Be aware that since v1.0.0 in this special case you will get UnknownMobile only for: * {@link MobileDetect#mobile}, not for {@link MobileDetect#phone} and {@link MobileDetect#tablet}. * In versions before v1.0.0 all 3 methods returned UnknownMobile which was tedious to use. *
* In most cases you will use the return value just as a boolean. * * @returns {String} the key for the phone family or tablet family, e.g. "Nexus". * @function MobileDetect#mobile */ mobile: function () { impl.prepareDetectionCache(this._cache, this.ua, this.maxPhoneWidth); return this._cache.mobile; }, /** * Returns the detected phone type/family string or null. *
* The returned tablet (family or producer) is one of following keys:
*
iPhone, BlackBerry, HTC, Nexus, Dell, Motorola, Samsung, LG, Sony, Asus, * NokiaLumia, Micromax, Palm, Vertu, Pantech, Fly, Wiko, iMobile, SimValley, * Wolfgang, Alcatel, Nintendo, Amoi, INQ, GenericPhone
*
* If the device is not detected by the regular expressions from Mobile-Detect, a test is made against * the patterns of detectmobilebrowsers.com. If this test * is positive, a value of UnknownPhone or UnknownMobile is returned.
* When used in browser, the decision whether phone or tablet is made based on screen.width/height.
*
* When used server-side (node.js), there is no way to tell the difference between UnknownTablet * and UnknownMobile, so you will get null here, while {@link MobileDetect#mobile} * will return UnknownMobile.
* Be aware that since v1.0.0 in this special case you will get UnknownMobile only for: * {@link MobileDetect#mobile}, not for {@link MobileDetect#phone} and {@link MobileDetect#tablet}. * In versions before v1.0.0 all 3 methods returned UnknownMobile which was tedious to use. *
* In most cases you will use the return value just as a boolean. * * @returns {String} the key of the phone family or producer, e.g. "iPhone" * @function MobileDetect#phone */ phone: function () { impl.prepareDetectionCache(this._cache, this.ua, this.maxPhoneWidth); return this._cache.phone; }, /** * Returns the detected tablet type/family string or null. *
* The returned tablet (family or producer) is one of following keys:
*
iPad, NexusTablet, SamsungTablet, Kindle, SurfaceTablet, HPTablet, AsusTablet, * BlackBerryTablet, HTCtablet, MotorolaTablet, NookTablet, AcerTablet, * ToshibaTablet, LGTablet, FujitsuTablet, PrestigioTablet, LenovoTablet, * DellTablet, YarvikTablet, MedionTablet, ArnovaTablet, IntensoTablet, IRUTablet, * MegafonTablet, EbodaTablet, AllViewTablet, ArchosTablet, AinolTablet, * NokiaLumiaTablet, SonyTablet, PhilipsTablet, CubeTablet, CobyTablet, MIDTablet, * MSITablet, SMiTTablet, RockChipTablet, FlyTablet, bqTablet, HuaweiTablet, * NecTablet, PantechTablet, BronchoTablet, VersusTablet, ZyncTablet, * PositivoTablet, NabiTablet, KoboTablet, DanewTablet, TexetTablet, * PlaystationTablet, TrekstorTablet, PyleAudioTablet, AdvanTablet, * DanyTechTablet, GalapadTablet, MicromaxTablet, KarbonnTablet, AllFineTablet, * PROSCANTablet, YONESTablet, ChangJiaTablet, GUTablet, PointOfViewTablet, * OvermaxTablet, HCLTablet, DPSTablet, VistureTablet, CrestaTablet, * MediatekTablet, ConcordeTablet, GoCleverTablet, ModecomTablet, VoninoTablet, * ECSTablet, StorexTablet, VodafoneTablet, EssentielBTablet, RossMoorTablet, * iMobileTablet, TolinoTablet, AudioSonicTablet, AMPETablet, SkkTablet, * TecnoTablet, JXDTablet, iJoyTablet, FX2Tablet, XoroTablet, ViewsonicTablet, * OdysTablet, CaptivaTablet, IconbitTablet, TeclastTablet, OndaTablet, * JaytechTablet, BlaupunktTablet, DigmaTablet, EvolioTablet, LavaTablet, * AocTablet, MpmanTablet, CelkonTablet, WolderTablet, MiTablet, NibiruTablet, * NexoTablet, LeaderTablet, UbislateTablet, PocketBookTablet, KocasoTablet, Hudl, * TelstraTablet, GenericTablet
*
* If the device is not detected by the regular expressions from Mobile-Detect, a test is made against * the patterns of detectmobilebrowsers.com. If this test * is positive, a value of UnknownTablet or UnknownMobile is returned.
* When used in browser, the decision whether phone or tablet is made based on screen.width/height.
*
* When used server-side (node.js), there is no way to tell the difference between UnknownTablet * and UnknownMobile, so you will get null here, while {@link MobileDetect#mobile} * will return UnknownMobile.
* Be aware that since v1.0.0 in this special case you will get UnknownMobile only for: * {@link MobileDetect#mobile}, not for {@link MobileDetect#phone} and {@link MobileDetect#tablet}. * In versions before v1.0.0 all 3 methods returned UnknownMobile which was tedious to use. *
* In most cases you will use the return value just as a boolean. * * @returns {String} the key of the tablet family or producer, e.g. "SamsungTablet" * @function MobileDetect#tablet */ tablet: function () { impl.prepareDetectionCache(this._cache, this.ua, this.maxPhoneWidth); return this._cache.tablet; }, /** * Returns the (first) detected user-agent string or null. *
* The returned user-agent is one of following keys:
*
Vivaldi, Chrome, Dolfin, Opera, Skyfire, Edge, IE, Firefox, Bolt, TeaShark, * Blazer, Safari, Tizen, UCBrowser, baiduboxapp, baidubrowser, DiigoBrowser, * Puffin, Mercury, ObigoBrowser, NetFront, GenericBrowser, PaleMoon
*
* In most cases calling {@link MobileDetect#userAgent} will be sufficient. But there are rare * cases where a mobile device pretends to be more than one particular browser. You can get the * list of all matches with {@link MobileDetect#userAgents} or check for a particular value by * providing one of the defined keys as first argument to {@link MobileDetect#is}. * * @returns {String} the key for the detected user-agent or null * @function MobileDetect#userAgent */ userAgent: function () { if (this._cache.userAgent === undefined) { this._cache.userAgent = impl.findMatch(impl.mobileDetectRules.uas, this.ua); } return this._cache.userAgent; }, /** * Returns all detected user-agent strings. *
* The array is empty or contains one or more of following keys:
*
Vivaldi, Chrome, Dolfin, Opera, Skyfire, Edge, IE, Firefox, Bolt, TeaShark, * Blazer, Safari, Tizen, UCBrowser, baiduboxapp, baidubrowser, DiigoBrowser, * Puffin, Mercury, ObigoBrowser, NetFront, GenericBrowser, PaleMoon
*
* In most cases calling {@link MobileDetect#userAgent} will be sufficient. But there are rare * cases where a mobile device pretends to be more than one particular browser. You can get the * list of all matches with {@link MobileDetect#userAgents} or check for a particular value by * providing one of the defined keys as first argument to {@link MobileDetect#is}. * * @returns {Array} the array of detected user-agent keys or [] * @function MobileDetect#userAgents */ userAgents: function () { if (this._cache.userAgents === undefined) { this._cache.userAgents = impl.findMatches(impl.mobileDetectRules.uas, this.ua); } return this._cache.userAgents; }, /** * Returns the detected operating system string or null. *
* The operating system is one of following keys:
*
AndroidOS, BlackBerryOS, PalmOS, SymbianOS, WindowsMobileOS, WindowsPhoneOS, * iOS, MeeGoOS, MaemoOS, JavaOS, webOS, badaOS, BREWOS
* * @returns {String} the key for the detected operating system. * @function MobileDetect#os */ os: function () { if (this._cache.os === undefined) { this._cache.os = impl.detectOS(this.ua); } return this._cache.os; }, /** * Get the version (as Number) of the given property in the User-Agent. *
* Will return a float number. (eg. 2_0 will return 2.0, 4.3.1 will return 4.31) * * @param {String} key a key defining a thing which has a version.
* You can use one of following keys:
*
Mobile, Build, Version, VendorID, iPad, iPhone, iPod, Kindle, Chrome, Coast, * Dolfin, Firefox, Fennec, Edge, IE, NetFront, NokiaBrowser, Opera, Opera Mini, * Opera Mobi, UC Browser, MQQBrowser, MicroMessenger, baiduboxapp, baidubrowser, * Iron, Safari, Skyfire, Tizen, Webkit, PaleMoon, Gecko, Trident, Presto, Goanna, * iOS, Android, BlackBerry, BREW, Java, Windows Phone OS, Windows Phone, Windows * CE, Windows NT, Symbian, webOS
* * @returns {Number} the version as float or NaN if User-Agent doesn't contain this version. * Be careful when comparing this value with '==' operator! * @function MobileDetect#version */ version: function (key) { return impl.getVersion(key, this.ua); }, /** * Get the version (as String) of the given property in the User-Agent. *
* * @param {String} key a key defining a thing which has a version.
* You can use one of following keys:
*
Mobile, Build, Version, VendorID, iPad, iPhone, iPod, Kindle, Chrome, Coast, * Dolfin, Firefox, Fennec, Edge, IE, NetFront, NokiaBrowser, Opera, Opera Mini, * Opera Mobi, UC Browser, MQQBrowser, MicroMessenger, baiduboxapp, baidubrowser, * Iron, Safari, Skyfire, Tizen, Webkit, PaleMoon, Gecko, Trident, Presto, Goanna, * iOS, Android, BlackBerry, BREW, Java, Windows Phone OS, Windows Phone, Windows * CE, Windows NT, Symbian, webOS
* * @returns {String} the "raw" version as String or null if User-Agent doesn't contain this version. * * @function MobileDetect#versionStr */ versionStr: function (key) { return impl.getVersionStr(key, this.ua); }, /** * Global test key against userAgent, os, phone, tablet and some other properties of userAgent string. * * @param {String} key the key (case-insensitive) of a userAgent, an operating system, phone or * tablet family.
* For a complete list of possible values, see {@link MobileDetect#userAgent}, * {@link MobileDetect#os}, {@link MobileDetect#phone}, {@link MobileDetect#tablet}.
* Additionally you have following keys:
*
Bot, MobileBot, DesktopMode, TV, WebKit, Console, Watch
* * @returns {boolean} true when the given key is one of the defined keys of userAgent, os, phone, * tablet or one of the listed additional keys, otherwise false * @function MobileDetect#is */ is: function (key) { return containsIC(this.userAgents(), key) || equalIC(key, this.os()) || equalIC(key, this.phone()) || equalIC(key, this.tablet()) || containsIC(impl.findMatches(impl.mobileDetectRules.utils, this.ua), key); }, /** * Do a quick test against navigator::userAgent. * * @param {String|RegExp} pattern the pattern, either as String or RegExp * (a string will be converted to a case-insensitive RegExp). * @returns {boolean} true when the pattern matches, otherwise false * @function MobileDetect#match */ match: function (pattern) { if (!(pattern instanceof RegExp)) { pattern = new RegExp(pattern, 'i'); } return pattern.test(this.ua); }, /** * Checks whether the mobile device can be considered as phone regarding screen.width. *
* Obviously this method makes sense in browser environments only (not for Node.js)! * @param {number} [maxPhoneWidth] the maximum logical pixels (aka. CSS-pixels) to be considered as phone.
* The argument is optional and if not present or falsy, the value of the constructor is taken. * @returns {boolean|undefined} undefined if screen size wasn't detectable, else true * when screen.width is less or equal to maxPhoneWidth, otherwise false.
* Will always return undefined server-side. */ isPhoneSized: function (maxPhoneWidth) { return MobileDetect.isPhoneSized(maxPhoneWidth || this.maxPhoneWidth); }, /** * Returns the mobile grade ('A', 'B', 'C'). * * @returns {String} one of the mobile grades ('A', 'B', 'C'). * @function MobileDetect#mobileGrade */ mobileGrade: function () { if (this._cache.grade === undefined) { this._cache.grade = impl.mobileGrade(this); } return this._cache.grade; } }; // environment-dependent if (typeof window !== 'undefined' && window.screen) { MobileDetect.isPhoneSized = function (maxPhoneWidth) { return maxPhoneWidth < 0 ? undefined : impl.getDeviceSmallerSide() <= maxPhoneWidth; }; } else { MobileDetect.isPhoneSized = function () {}; } // should not be replaced by a completely new object - just overwrite existing methods MobileDetect._impl = impl; MobileDetect.version = '1.3.3 2016-07-31'; return MobileDetect;}); // end of call of define()} : (define: any, undefined?: any) => void +>function (define, undefined) {define(function () { 'use strict'; var impl = {}; impl.mobileDetectRules = { "phones": { "iPhone": "\\biPhone\\b|\\biPod\\b", "BlackBerry": "BlackBerry|\\bBB10\\b|rim[0-9]+", "HTC": "HTC|HTC.*(Sensation|Evo|Vision|Explorer|6800|8100|8900|A7272|S510e|C110e|Legend|Desire|T8282)|APX515CKT|Qtek9090|APA9292KT|HD_mini|Sensation.*Z710e|PG86100|Z715e|Desire.*(A8181|HD)|ADR6200|ADR6400L|ADR6425|001HT|Inspire 4G|Android.*\\bEVO\\b|T-Mobile G1|Z520m", "Nexus": "Nexus One|Nexus S|Galaxy.*Nexus|Android.*Nexus.*Mobile|Nexus 4|Nexus 5|Nexus 6", "Dell": "Dell.*Streak|Dell.*Aero|Dell.*Venue|DELL.*Venue Pro|Dell Flash|Dell Smoke|Dell Mini 3iX|XCD28|XCD35|\\b001DL\\b|\\b101DL\\b|\\bGS01\\b", "Motorola": "Motorola|DROIDX|DROID BIONIC|\\bDroid\\b.*Build|Android.*Xoom|HRI39|MOT-|A1260|A1680|A555|A853|A855|A953|A955|A956|Motorola.*ELECTRIFY|Motorola.*i1|i867|i940|MB200|MB300|MB501|MB502|MB508|MB511|MB520|MB525|MB526|MB611|MB612|MB632|MB810|MB855|MB860|MB861|MB865|MB870|ME501|ME502|ME511|ME525|ME600|ME632|ME722|ME811|ME860|ME863|ME865|MT620|MT710|MT716|MT720|MT810|MT870|MT917|Motorola.*TITANIUM|WX435|WX445|XT300|XT301|XT311|XT316|XT317|XT319|XT320|XT390|XT502|XT530|XT531|XT532|XT535|XT603|XT610|XT611|XT615|XT681|XT701|XT702|XT711|XT720|XT800|XT806|XT860|XT862|XT875|XT882|XT883|XT894|XT901|XT907|XT909|XT910|XT912|XT928|XT926|XT915|XT919|XT925|XT1021|\\bMoto E\\b", "Samsung": "Samsung|SM-G9250|GT-19300|SGH-I337|BGT-S5230|GT-B2100|GT-B2700|GT-B2710|GT-B3210|GT-B3310|GT-B3410|GT-B3730|GT-B3740|GT-B5510|GT-B5512|GT-B5722|GT-B6520|GT-B7300|GT-B7320|GT-B7330|GT-B7350|GT-B7510|GT-B7722|GT-B7800|GT-C3010|GT-C3011|GT-C3060|GT-C3200|GT-C3212|GT-C3212I|GT-C3262|GT-C3222|GT-C3300|GT-C3300K|GT-C3303|GT-C3303K|GT-C3310|GT-C3322|GT-C3330|GT-C3350|GT-C3500|GT-C3510|GT-C3530|GT-C3630|GT-C3780|GT-C5010|GT-C5212|GT-C6620|GT-C6625|GT-C6712|GT-E1050|GT-E1070|GT-E1075|GT-E1080|GT-E1081|GT-E1085|GT-E1087|GT-E1100|GT-E1107|GT-E1110|GT-E1120|GT-E1125|GT-E1130|GT-E1160|GT-E1170|GT-E1175|GT-E1180|GT-E1182|GT-E1200|GT-E1210|GT-E1225|GT-E1230|GT-E1390|GT-E2100|GT-E2120|GT-E2121|GT-E2152|GT-E2220|GT-E2222|GT-E2230|GT-E2232|GT-E2250|GT-E2370|GT-E2550|GT-E2652|GT-E3210|GT-E3213|GT-I5500|GT-I5503|GT-I5700|GT-I5800|GT-I5801|GT-I6410|GT-I6420|GT-I7110|GT-I7410|GT-I7500|GT-I8000|GT-I8150|GT-I8160|GT-I8190|GT-I8320|GT-I8330|GT-I8350|GT-I8530|GT-I8700|GT-I8703|GT-I8910|GT-I9000|GT-I9001|GT-I9003|GT-I9010|GT-I9020|GT-I9023|GT-I9070|GT-I9082|GT-I9100|GT-I9103|GT-I9220|GT-I9250|GT-I9300|GT-I9305|GT-I9500|GT-I9505|GT-M3510|GT-M5650|GT-M7500|GT-M7600|GT-M7603|GT-M8800|GT-M8910|GT-N7000|GT-S3110|GT-S3310|GT-S3350|GT-S3353|GT-S3370|GT-S3650|GT-S3653|GT-S3770|GT-S3850|GT-S5210|GT-S5220|GT-S5229|GT-S5230|GT-S5233|GT-S5250|GT-S5253|GT-S5260|GT-S5263|GT-S5270|GT-S5300|GT-S5330|GT-S5350|GT-S5360|GT-S5363|GT-S5369|GT-S5380|GT-S5380D|GT-S5560|GT-S5570|GT-S5600|GT-S5603|GT-S5610|GT-S5620|GT-S5660|GT-S5670|GT-S5690|GT-S5750|GT-S5780|GT-S5830|GT-S5839|GT-S6102|GT-S6500|GT-S7070|GT-S7200|GT-S7220|GT-S7230|GT-S7233|GT-S7250|GT-S7500|GT-S7530|GT-S7550|GT-S7562|GT-S7710|GT-S8000|GT-S8003|GT-S8500|GT-S8530|GT-S8600|SCH-A310|SCH-A530|SCH-A570|SCH-A610|SCH-A630|SCH-A650|SCH-A790|SCH-A795|SCH-A850|SCH-A870|SCH-A890|SCH-A930|SCH-A950|SCH-A970|SCH-A990|SCH-I100|SCH-I110|SCH-I400|SCH-I405|SCH-I500|SCH-I510|SCH-I515|SCH-I600|SCH-I730|SCH-I760|SCH-I770|SCH-I830|SCH-I910|SCH-I920|SCH-I959|SCH-LC11|SCH-N150|SCH-N300|SCH-R100|SCH-R300|SCH-R351|SCH-R400|SCH-R410|SCH-T300|SCH-U310|SCH-U320|SCH-U350|SCH-U360|SCH-U365|SCH-U370|SCH-U380|SCH-U410|SCH-U430|SCH-U450|SCH-U460|SCH-U470|SCH-U490|SCH-U540|SCH-U550|SCH-U620|SCH-U640|SCH-U650|SCH-U660|SCH-U700|SCH-U740|SCH-U750|SCH-U810|SCH-U820|SCH-U900|SCH-U940|SCH-U960|SCS-26UC|SGH-A107|SGH-A117|SGH-A127|SGH-A137|SGH-A157|SGH-A167|SGH-A177|SGH-A187|SGH-A197|SGH-A227|SGH-A237|SGH-A257|SGH-A437|SGH-A517|SGH-A597|SGH-A637|SGH-A657|SGH-A667|SGH-A687|SGH-A697|SGH-A707|SGH-A717|SGH-A727|SGH-A737|SGH-A747|SGH-A767|SGH-A777|SGH-A797|SGH-A817|SGH-A827|SGH-A837|SGH-A847|SGH-A867|SGH-A877|SGH-A887|SGH-A897|SGH-A927|SGH-B100|SGH-B130|SGH-B200|SGH-B220|SGH-C100|SGH-C110|SGH-C120|SGH-C130|SGH-C140|SGH-C160|SGH-C170|SGH-C180|SGH-C200|SGH-C207|SGH-C210|SGH-C225|SGH-C230|SGH-C417|SGH-C450|SGH-D307|SGH-D347|SGH-D357|SGH-D407|SGH-D415|SGH-D780|SGH-D807|SGH-D980|SGH-E105|SGH-E200|SGH-E315|SGH-E316|SGH-E317|SGH-E335|SGH-E590|SGH-E635|SGH-E715|SGH-E890|SGH-F300|SGH-F480|SGH-I200|SGH-I300|SGH-I320|SGH-I550|SGH-I577|SGH-I600|SGH-I607|SGH-I617|SGH-I627|SGH-I637|SGH-I677|SGH-I700|SGH-I717|SGH-I727|SGH-i747M|SGH-I777|SGH-I780|SGH-I827|SGH-I847|SGH-I857|SGH-I896|SGH-I897|SGH-I900|SGH-I907|SGH-I917|SGH-I927|SGH-I937|SGH-I997|SGH-J150|SGH-J200|SGH-L170|SGH-L700|SGH-M110|SGH-M150|SGH-M200|SGH-N105|SGH-N500|SGH-N600|SGH-N620|SGH-N625|SGH-N700|SGH-N710|SGH-P107|SGH-P207|SGH-P300|SGH-P310|SGH-P520|SGH-P735|SGH-P777|SGH-Q105|SGH-R210|SGH-R220|SGH-R225|SGH-S105|SGH-S307|SGH-T109|SGH-T119|SGH-T139|SGH-T209|SGH-T219|SGH-T229|SGH-T239|SGH-T249|SGH-T259|SGH-T309|SGH-T319|SGH-T329|SGH-T339|SGH-T349|SGH-T359|SGH-T369|SGH-T379|SGH-T409|SGH-T429|SGH-T439|SGH-T459|SGH-T469|SGH-T479|SGH-T499|SGH-T509|SGH-T519|SGH-T539|SGH-T559|SGH-T589|SGH-T609|SGH-T619|SGH-T629|SGH-T639|SGH-T659|SGH-T669|SGH-T679|SGH-T709|SGH-T719|SGH-T729|SGH-T739|SGH-T746|SGH-T749|SGH-T759|SGH-T769|SGH-T809|SGH-T819|SGH-T839|SGH-T919|SGH-T929|SGH-T939|SGH-T959|SGH-T989|SGH-U100|SGH-U200|SGH-U800|SGH-V205|SGH-V206|SGH-X100|SGH-X105|SGH-X120|SGH-X140|SGH-X426|SGH-X427|SGH-X475|SGH-X495|SGH-X497|SGH-X507|SGH-X600|SGH-X610|SGH-X620|SGH-X630|SGH-X700|SGH-X820|SGH-X890|SGH-Z130|SGH-Z150|SGH-Z170|SGH-ZX10|SGH-ZX20|SHW-M110|SPH-A120|SPH-A400|SPH-A420|SPH-A460|SPH-A500|SPH-A560|SPH-A600|SPH-A620|SPH-A660|SPH-A700|SPH-A740|SPH-A760|SPH-A790|SPH-A800|SPH-A820|SPH-A840|SPH-A880|SPH-A900|SPH-A940|SPH-A960|SPH-D600|SPH-D700|SPH-D710|SPH-D720|SPH-I300|SPH-I325|SPH-I330|SPH-I350|SPH-I500|SPH-I600|SPH-I700|SPH-L700|SPH-M100|SPH-M220|SPH-M240|SPH-M300|SPH-M305|SPH-M320|SPH-M330|SPH-M350|SPH-M360|SPH-M370|SPH-M380|SPH-M510|SPH-M540|SPH-M550|SPH-M560|SPH-M570|SPH-M580|SPH-M610|SPH-M620|SPH-M630|SPH-M800|SPH-M810|SPH-M850|SPH-M900|SPH-M910|SPH-M920|SPH-M930|SPH-N100|SPH-N200|SPH-N240|SPH-N300|SPH-N400|SPH-Z400|SWC-E100|SCH-i909|GT-N7100|GT-N7105|SCH-I535|SM-N900A|SGH-I317|SGH-T999L|GT-S5360B|GT-I8262|GT-S6802|GT-S6312|GT-S6310|GT-S5312|GT-S5310|GT-I9105|GT-I8510|GT-S6790N|SM-G7105|SM-N9005|GT-S5301|GT-I9295|GT-I9195|SM-C101|GT-S7392|GT-S7560|GT-B7610|GT-I5510|GT-S7582|GT-S7530E|GT-I8750|SM-G9006V|SM-G9008V|SM-G9009D|SM-G900A|SM-G900D|SM-G900F|SM-G900H|SM-G900I|SM-G900J|SM-G900K|SM-G900L|SM-G900M|SM-G900P|SM-G900R4|SM-G900S|SM-G900T|SM-G900V|SM-G900W8|SHV-E160K|SCH-P709|SCH-P729|SM-T2558|GT-I9205|SM-G9350|SM-J120F", "LG": "\\bLG\\b;|LG[- ]?(C800|C900|E400|E610|E900|E-900|F160|F180K|F180L|F180S|730|855|L160|LS740|LS840|LS970|LU6200|MS690|MS695|MS770|MS840|MS870|MS910|P500|P700|P705|VM696|AS680|AS695|AX840|C729|E970|GS505|272|C395|E739BK|E960|L55C|L75C|LS696|LS860|P769BK|P350|P500|P509|P870|UN272|US730|VS840|VS950|LN272|LN510|LS670|LS855|LW690|MN270|MN510|P509|P769|P930|UN200|UN270|UN510|UN610|US670|US740|US760|UX265|UX840|VN271|VN530|VS660|VS700|VS740|VS750|VS910|VS920|VS930|VX9200|VX11000|AX840A|LW770|P506|P925|P999|E612|D955|D802|MS323)", "Sony": "SonyST|SonyLT|SonyEricsson|SonyEricssonLT15iv|LT18i|E10i|LT28h|LT26w|SonyEricssonMT27i|C5303|C6902|C6903|C6906|C6943|D2533", "Asus": "Asus.*Galaxy|PadFone.*Mobile", "NokiaLumia": "Lumia [0-9]{3,4}", "Micromax": "Micromax.*\\b(A210|A92|A88|A72|A111|A110Q|A115|A116|A110|A90S|A26|A51|A35|A54|A25|A27|A89|A68|A65|A57|A90)\\b", "Palm": "PalmSource|Palm", "Vertu": "Vertu|Vertu.*Ltd|Vertu.*Ascent|Vertu.*Ayxta|Vertu.*Constellation(F|Quest)?|Vertu.*Monika|Vertu.*Signature", "Pantech": "PANTECH|IM-A850S|IM-A840S|IM-A830L|IM-A830K|IM-A830S|IM-A820L|IM-A810K|IM-A810S|IM-A800S|IM-T100K|IM-A725L|IM-A780L|IM-A775C|IM-A770K|IM-A760S|IM-A750K|IM-A740S|IM-A730S|IM-A720L|IM-A710K|IM-A690L|IM-A690S|IM-A650S|IM-A630K|IM-A600S|VEGA PTL21|PT003|P8010|ADR910L|P6030|P6020|P9070|P4100|P9060|P5000|CDM8992|TXT8045|ADR8995|IS11PT|P2030|P6010|P8000|PT002|IS06|CDM8999|P9050|PT001|TXT8040|P2020|P9020|P2000|P7040|P7000|C790", "Fly": "IQ230|IQ444|IQ450|IQ440|IQ442|IQ441|IQ245|IQ256|IQ236|IQ255|IQ235|IQ245|IQ275|IQ240|IQ285|IQ280|IQ270|IQ260|IQ250", "Wiko": "KITE 4G|HIGHWAY|GETAWAY|STAIRWAY|DARKSIDE|DARKFULL|DARKNIGHT|DARKMOON|SLIDE|WAX 4G|RAINBOW|BLOOM|SUNSET|GOA(?!nna)|LENNY|BARRY|IGGY|OZZY|CINK FIVE|CINK PEAX|CINK PEAX 2|CINK SLIM|CINK SLIM 2|CINK +|CINK KING|CINK PEAX|CINK SLIM|SUBLIM", "iMobile": "i-mobile (IQ|i-STYLE|idea|ZAA|Hitz)", "SimValley": "\\b(SP-80|XT-930|SX-340|XT-930|SX-310|SP-360|SP60|SPT-800|SP-120|SPT-800|SP-140|SPX-5|SPX-8|SP-100|SPX-8|SPX-12)\\b", "Wolfgang": "AT-B24D|AT-AS50HD|AT-AS40W|AT-AS55HD|AT-AS45q2|AT-B26D|AT-AS50Q", "Alcatel": "Alcatel", "Nintendo": "Nintendo 3DS", "Amoi": "Amoi", "INQ": "INQ", "GenericPhone": "Tapatalk|PDA;|SAGEM|\\bmmp\\b|pocket|\\bpsp\\b|symbian|Smartphone|smartfon|treo|up.browser|up.link|vodafone|\\bwap\\b|nokia|Series40|Series60|S60|SonyEricsson|N900|MAUI.*WAP.*Browser" }, "tablets": { "iPad": "iPad|iPad.*Mobile", "NexusTablet": "Android.*Nexus[\\s]+(7|9|10)", "SamsungTablet": "SAMSUNG.*Tablet|Galaxy.*Tab|SC-01C|GT-P1000|GT-P1003|GT-P1010|GT-P3105|GT-P6210|GT-P6800|GT-P6810|GT-P7100|GT-P7300|GT-P7310|GT-P7500|GT-P7510|SCH-I800|SCH-I815|SCH-I905|SGH-I957|SGH-I987|SGH-T849|SGH-T859|SGH-T869|SPH-P100|GT-P3100|GT-P3108|GT-P3110|GT-P5100|GT-P5110|GT-P6200|GT-P7320|GT-P7511|GT-N8000|GT-P8510|SGH-I497|SPH-P500|SGH-T779|SCH-I705|SCH-I915|GT-N8013|GT-P3113|GT-P5113|GT-P8110|GT-N8010|GT-N8005|GT-N8020|GT-P1013|GT-P6201|GT-P7501|GT-N5100|GT-N5105|GT-N5110|SHV-E140K|SHV-E140L|SHV-E140S|SHV-E150S|SHV-E230K|SHV-E230L|SHV-E230S|SHW-M180K|SHW-M180L|SHW-M180S|SHW-M180W|SHW-M300W|SHW-M305W|SHW-M380K|SHW-M380S|SHW-M380W|SHW-M430W|SHW-M480K|SHW-M480S|SHW-M480W|SHW-M485W|SHW-M486W|SHW-M500W|GT-I9228|SCH-P739|SCH-I925|GT-I9200|GT-P5200|GT-P5210|GT-P5210X|SM-T311|SM-T310|SM-T310X|SM-T210|SM-T210R|SM-T211|SM-P600|SM-P601|SM-P605|SM-P900|SM-P901|SM-T217|SM-T217A|SM-T217S|SM-P6000|SM-T3100|SGH-I467|XE500|SM-T110|GT-P5220|GT-I9200X|GT-N5110X|GT-N5120|SM-P905|SM-T111|SM-T2105|SM-T315|SM-T320|SM-T320X|SM-T321|SM-T520|SM-T525|SM-T530NU|SM-T230NU|SM-T330NU|SM-T900|XE500T1C|SM-P605V|SM-P905V|SM-T337V|SM-T537V|SM-T707V|SM-T807V|SM-P600X|SM-P900X|SM-T210X|SM-T230|SM-T230X|SM-T325|GT-P7503|SM-T531|SM-T330|SM-T530|SM-T705|SM-T705C|SM-T535|SM-T331|SM-T800|SM-T700|SM-T537|SM-T807|SM-P907A|SM-T337A|SM-T537A|SM-T707A|SM-T807A|SM-T237|SM-T807P|SM-P607T|SM-T217T|SM-T337T|SM-T807T|SM-T116NQ|SM-P550|SM-T350|SM-T550|SM-T9000|SM-P9000|SM-T705Y|SM-T805|GT-P3113|SM-T710|SM-T810|SM-T815|SM-T360|SM-T533|SM-T113|SM-T335|SM-T715|SM-T560|SM-T670|SM-T677|SM-T377|SM-T567|SM-T357T|SM-T555|SM-T561", "Kindle": "Kindle|Silk.*Accelerated|Android.*\\b(KFOT|KFTT|KFJWI|KFJWA|KFOTE|KFSOWI|KFTHWI|KFTHWA|KFAPWI|KFAPWA|WFJWAE|KFSAWA|KFSAWI|KFASWI|KFARWI)\\b", "SurfaceTablet": "Windows NT [0-9.]+; ARM;.*(Tablet|ARMBJS)", "HPTablet": "HP Slate (7|8|10)|HP ElitePad 900|hp-tablet|EliteBook.*Touch|HP 8|Slate 21|HP SlateBook 10", "AsusTablet": "^.*PadFone((?!Mobile).)*$|Transformer|TF101|TF101G|TF300T|TF300TG|TF300TL|TF700T|TF700KL|TF701T|TF810C|ME171|ME301T|ME302C|ME371MG|ME370T|ME372MG|ME172V|ME173X|ME400C|Slider SL101|\\bK00F\\b|\\bK00C\\b|\\bK00E\\b|\\bK00L\\b|TX201LA|ME176C|ME102A|\\bM80TA\\b|ME372CL|ME560CG|ME372CG|ME302KL| K010 | K017 |ME572C|ME103K|ME170C|ME171C|\\bME70C\\b|ME581C|ME581CL|ME8510C|ME181C|P01Y|PO1MA", "BlackBerryTablet": "PlayBook|RIM Tablet", "HTCtablet": "HTC_Flyer_P512|HTC Flyer|HTC Jetstream|HTC-P715a|HTC EVO View 4G|PG41200|PG09410", "MotorolaTablet": "xoom|sholest|MZ615|MZ605|MZ505|MZ601|MZ602|MZ603|MZ604|MZ606|MZ607|MZ608|MZ609|MZ615|MZ616|MZ617", "NookTablet": "Android.*Nook|NookColor|nook browser|BNRV200|BNRV200A|BNTV250|BNTV250A|BNTV400|BNTV600|LogicPD Zoom2", "AcerTablet": "Android.*; \\b(A100|A101|A110|A200|A210|A211|A500|A501|A510|A511|A700|A701|W500|W500P|W501|W501P|W510|W511|W700|G100|G100W|B1-A71|B1-710|B1-711|A1-810|A1-811|A1-830)\\b|W3-810|\\bA3-A10\\b|\\bA3-A11\\b|\\bA3-A20", "ToshibaTablet": "Android.*(AT100|AT105|AT200|AT205|AT270|AT275|AT300|AT305|AT1S5|AT500|AT570|AT700|AT830)|TOSHIBA.*FOLIO", "LGTablet": "\\bL-06C|LG-V909|LG-V900|LG-V700|LG-V510|LG-V500|LG-V410|LG-V400|LG-VK810\\b", "FujitsuTablet": "Android.*\\b(F-01D|F-02F|F-05E|F-10D|M532|Q572)\\b", "PrestigioTablet": "PMP3170B|PMP3270B|PMP3470B|PMP7170B|PMP3370B|PMP3570C|PMP5870C|PMP3670B|PMP5570C|PMP5770D|PMP3970B|PMP3870C|PMP5580C|PMP5880D|PMP5780D|PMP5588C|PMP7280C|PMP7280C3G|PMP7280|PMP7880D|PMP5597D|PMP5597|PMP7100D|PER3464|PER3274|PER3574|PER3884|PER5274|PER5474|PMP5097CPRO|PMP5097|PMP7380D|PMP5297C|PMP5297C_QUAD|PMP812E|PMP812E3G|PMP812F|PMP810E|PMP880TD|PMT3017|PMT3037|PMT3047|PMT3057|PMT7008|PMT5887|PMT5001|PMT5002", "LenovoTablet": "Lenovo TAB|Idea(Tab|Pad)( A1|A10| K1|)|ThinkPad([ ]+)?Tablet|YT3-X90L|YT3-X90F|YT3-X90X|Lenovo.*(S2109|S2110|S5000|S6000|K3011|A3000|A3500|A1000|A2107|A2109|A1107|A5500|A7600|B6000|B8000|B8080)(-|)(FL|F|HV|H|)", "DellTablet": "Venue 11|Venue 8|Venue 7|Dell Streak 10|Dell Streak 7", "YarvikTablet": "Android.*\\b(TAB210|TAB211|TAB224|TAB250|TAB260|TAB264|TAB310|TAB360|TAB364|TAB410|TAB411|TAB420|TAB424|TAB450|TAB460|TAB461|TAB464|TAB465|TAB467|TAB468|TAB07-100|TAB07-101|TAB07-150|TAB07-151|TAB07-152|TAB07-200|TAB07-201-3G|TAB07-210|TAB07-211|TAB07-212|TAB07-214|TAB07-220|TAB07-400|TAB07-485|TAB08-150|TAB08-200|TAB08-201-3G|TAB08-201-30|TAB09-100|TAB09-211|TAB09-410|TAB10-150|TAB10-201|TAB10-211|TAB10-400|TAB10-410|TAB13-201|TAB274EUK|TAB275EUK|TAB374EUK|TAB462EUK|TAB474EUK|TAB9-200)\\b", "MedionTablet": "Android.*\\bOYO\\b|LIFE.*(P9212|P9514|P9516|S9512)|LIFETAB", "ArnovaTablet": "AN10G2|AN7bG3|AN7fG3|AN8G3|AN8cG3|AN7G3|AN9G3|AN7dG3|AN7dG3ST|AN7dG3ChildPad|AN10bG3|AN10bG3DT|AN9G2", "IntensoTablet": "INM8002KP|INM1010FP|INM805ND|Intenso Tab|TAB1004", "IRUTablet": "M702pro", "MegafonTablet": "MegaFon V9|\\bZTE V9\\b|Android.*\\bMT7A\\b", "EbodaTablet": "E-Boda (Supreme|Impresspeed|Izzycomm|Essential)", "AllViewTablet": "Allview.*(Viva|Alldro|City|Speed|All TV|Frenzy|Quasar|Shine|TX1|AX1|AX2)", "ArchosTablet": "\\b(101G9|80G9|A101IT)\\b|Qilive 97R|Archos5|\\bARCHOS (70|79|80|90|97|101|FAMILYPAD|)(b|)(G10| Cobalt| TITANIUM(HD|)| Xenon| Neon|XSK| 2| XS 2| PLATINUM| CARBON|GAMEPAD)\\b", "AinolTablet": "NOVO7|NOVO8|NOVO10|Novo7Aurora|Novo7Basic|NOVO7PALADIN|novo9-Spark", "NokiaLumiaTablet": "Lumia 2520", "SonyTablet": "Sony.*Tablet|Xperia Tablet|Sony Tablet S|SO-03E|SGPT12|SGPT13|SGPT114|SGPT121|SGPT122|SGPT123|SGPT111|SGPT112|SGPT113|SGPT131|SGPT132|SGPT133|SGPT211|SGPT212|SGPT213|SGP311|SGP312|SGP321|EBRD1101|EBRD1102|EBRD1201|SGP351|SGP341|SGP511|SGP512|SGP521|SGP541|SGP551|SGP621|SGP612|SOT31", "PhilipsTablet": "\\b(PI2010|PI3000|PI3100|PI3105|PI3110|PI3205|PI3210|PI3900|PI4010|PI7000|PI7100)\\b", "CubeTablet": "Android.*(K8GT|U9GT|U10GT|U16GT|U17GT|U18GT|U19GT|U20GT|U23GT|U30GT)|CUBE U8GT", "CobyTablet": "MID1042|MID1045|MID1125|MID1126|MID7012|MID7014|MID7015|MID7034|MID7035|MID7036|MID7042|MID7048|MID7127|MID8042|MID8048|MID8127|MID9042|MID9740|MID9742|MID7022|MID7010", "MIDTablet": "M9701|M9000|M9100|M806|M1052|M806|T703|MID701|MID713|MID710|MID727|MID760|MID830|MID728|MID933|MID125|MID810|MID732|MID120|MID930|MID800|MID731|MID900|MID100|MID820|MID735|MID980|MID130|MID833|MID737|MID960|MID135|MID860|MID736|MID140|MID930|MID835|MID733|MID4X10", "MSITablet": "MSI \\b(Primo 73K|Primo 73L|Primo 81L|Primo 77|Primo 93|Primo 75|Primo 76|Primo 73|Primo 81|Primo 91|Primo 90|Enjoy 71|Enjoy 7|Enjoy 10)\\b", "SMiTTablet": "Android.*(\\bMID\\b|MID-560|MTV-T1200|MTV-PND531|MTV-P1101|MTV-PND530)", "RockChipTablet": "Android.*(RK2818|RK2808A|RK2918|RK3066)|RK2738|RK2808A", "FlyTablet": "IQ310|Fly Vision", "bqTablet": "Android.*(bq)?.*(Elcano|Curie|Edison|Maxwell|Kepler|Pascal|Tesla|Hypatia|Platon|Newton|Livingstone|Cervantes|Avant|Aquaris E10)|Maxwell.*Lite|Maxwell.*Plus", "HuaweiTablet": "MediaPad|MediaPad 7 Youth|IDEOS S7|S7-201c|S7-202u|S7-101|S7-103|S7-104|S7-105|S7-106|S7-201|S7-Slim", "NecTablet": "\\bN-06D|\\bN-08D", "PantechTablet": "Pantech.*P4100", "BronchoTablet": "Broncho.*(N701|N708|N802|a710)", "VersusTablet": "TOUCHPAD.*[78910]|\\bTOUCHTAB\\b", "ZyncTablet": "z1000|Z99 2G|z99|z930|z999|z990|z909|Z919|z900", "PositivoTablet": "TB07STA|TB10STA|TB07FTA|TB10FTA", "NabiTablet": "Android.*\\bNabi", "KoboTablet": "Kobo Touch|\\bK080\\b|\\bVox\\b Build|\\bArc\\b Build", "DanewTablet": "DSlide.*\\b(700|701R|702|703R|704|802|970|971|972|973|974|1010|1012)\\b", "TexetTablet": "NaviPad|TB-772A|TM-7045|TM-7055|TM-9750|TM-7016|TM-7024|TM-7026|TM-7041|TM-7043|TM-7047|TM-8041|TM-9741|TM-9747|TM-9748|TM-9751|TM-7022|TM-7021|TM-7020|TM-7011|TM-7010|TM-7023|TM-7025|TM-7037W|TM-7038W|TM-7027W|TM-9720|TM-9725|TM-9737W|TM-1020|TM-9738W|TM-9740|TM-9743W|TB-807A|TB-771A|TB-727A|TB-725A|TB-719A|TB-823A|TB-805A|TB-723A|TB-715A|TB-707A|TB-705A|TB-709A|TB-711A|TB-890HD|TB-880HD|TB-790HD|TB-780HD|TB-770HD|TB-721HD|TB-710HD|TB-434HD|TB-860HD|TB-840HD|TB-760HD|TB-750HD|TB-740HD|TB-730HD|TB-722HD|TB-720HD|TB-700HD|TB-500HD|TB-470HD|TB-431HD|TB-430HD|TB-506|TB-504|TB-446|TB-436|TB-416|TB-146SE|TB-126SE", "PlaystationTablet": "Playstation.*(Portable|Vita)", "TrekstorTablet": "ST10416-1|VT10416-1|ST70408-1|ST702xx-1|ST702xx-2|ST80208|ST97216|ST70104-2|VT10416-2|ST10216-2A|SurfTab", "PyleAudioTablet": "\\b(PTBL10CEU|PTBL10C|PTBL72BC|PTBL72BCEU|PTBL7CEU|PTBL7C|PTBL92BC|PTBL92BCEU|PTBL9CEU|PTBL9CUK|PTBL9C)\\b", "AdvanTablet": "Android.* \\b(E3A|T3X|T5C|T5B|T3E|T3C|T3B|T1J|T1F|T2A|T1H|T1i|E1C|T1-E|T5-A|T4|E1-B|T2Ci|T1-B|T1-D|O1-A|E1-A|T1-A|T3A|T4i)\\b ", "DanyTechTablet": "Genius Tab G3|Genius Tab S2|Genius Tab Q3|Genius Tab G4|Genius Tab Q4|Genius Tab G-II|Genius TAB GII|Genius TAB GIII|Genius Tab S1", "GalapadTablet": "Android.*\\bG1\\b", "MicromaxTablet": "Funbook|Micromax.*\\b(P250|P560|P360|P362|P600|P300|P350|P500|P275)\\b", "KarbonnTablet": "Android.*\\b(A39|A37|A34|ST8|ST10|ST7|Smart Tab3|Smart Tab2)\\b", "AllFineTablet": "Fine7 Genius|Fine7 Shine|Fine7 Air|Fine8 Style|Fine9 More|Fine10 Joy|Fine11 Wide", "PROSCANTablet": "\\b(PEM63|PLT1023G|PLT1041|PLT1044|PLT1044G|PLT1091|PLT4311|PLT4311PL|PLT4315|PLT7030|PLT7033|PLT7033D|PLT7035|PLT7035D|PLT7044K|PLT7045K|PLT7045KB|PLT7071KG|PLT7072|PLT7223G|PLT7225G|PLT7777G|PLT7810K|PLT7849G|PLT7851G|PLT7852G|PLT8015|PLT8031|PLT8034|PLT8036|PLT8080K|PLT8082|PLT8088|PLT8223G|PLT8234G|PLT8235G|PLT8816K|PLT9011|PLT9045K|PLT9233G|PLT9735|PLT9760G|PLT9770G)\\b", "YONESTablet": "BQ1078|BC1003|BC1077|RK9702|BC9730|BC9001|IT9001|BC7008|BC7010|BC708|BC728|BC7012|BC7030|BC7027|BC7026", "ChangJiaTablet": "TPC7102|TPC7103|TPC7105|TPC7106|TPC7107|TPC7201|TPC7203|TPC7205|TPC7210|TPC7708|TPC7709|TPC7712|TPC7110|TPC8101|TPC8103|TPC8105|TPC8106|TPC8203|TPC8205|TPC8503|TPC9106|TPC9701|TPC97101|TPC97103|TPC97105|TPC97106|TPC97111|TPC97113|TPC97203|TPC97603|TPC97809|TPC97205|TPC10101|TPC10103|TPC10106|TPC10111|TPC10203|TPC10205|TPC10503", "GUTablet": "TX-A1301|TX-M9002|Q702|kf026", "PointOfViewTablet": "TAB-P506|TAB-navi-7-3G-M|TAB-P517|TAB-P-527|TAB-P701|TAB-P703|TAB-P721|TAB-P731N|TAB-P741|TAB-P825|TAB-P905|TAB-P925|TAB-PR945|TAB-PL1015|TAB-P1025|TAB-PI1045|TAB-P1325|TAB-PROTAB[0-9]+|TAB-PROTAB25|TAB-PROTAB26|TAB-PROTAB27|TAB-PROTAB26XL|TAB-PROTAB2-IPS9|TAB-PROTAB30-IPS9|TAB-PROTAB25XXL|TAB-PROTAB26-IPS10|TAB-PROTAB30-IPS10", "OvermaxTablet": "OV-(SteelCore|NewBase|Basecore|Baseone|Exellen|Quattor|EduTab|Solution|ACTION|BasicTab|TeddyTab|MagicTab|Stream|TB-08|TB-09)", "HCLTablet": "HCL.*Tablet|Connect-3G-2.0|Connect-2G-2.0|ME Tablet U1|ME Tablet U2|ME Tablet G1|ME Tablet X1|ME Tablet Y2|ME Tablet Sync", "DPSTablet": "DPS Dream 9|DPS Dual 7", "VistureTablet": "V97 HD|i75 3G|Visture V4( HD)?|Visture V5( HD)?|Visture V10", "CrestaTablet": "CTP(-)?810|CTP(-)?818|CTP(-)?828|CTP(-)?838|CTP(-)?888|CTP(-)?978|CTP(-)?980|CTP(-)?987|CTP(-)?988|CTP(-)?989", "MediatekTablet": "\\bMT8125|MT8389|MT8135|MT8377\\b", "ConcordeTablet": "Concorde([ ]+)?Tab|ConCorde ReadMan", "GoCleverTablet": "GOCLEVER TAB|A7GOCLEVER|M1042|M7841|M742|R1042BK|R1041|TAB A975|TAB A7842|TAB A741|TAB A741L|TAB M723G|TAB M721|TAB A1021|TAB I921|TAB R721|TAB I720|TAB T76|TAB R70|TAB R76.2|TAB R106|TAB R83.2|TAB M813G|TAB I721|GCTA722|TAB I70|TAB I71|TAB S73|TAB R73|TAB R74|TAB R93|TAB R75|TAB R76.1|TAB A73|TAB A93|TAB A93.2|TAB T72|TAB R83|TAB R974|TAB R973|TAB A101|TAB A103|TAB A104|TAB A104.2|R105BK|M713G|A972BK|TAB A971|TAB R974.2|TAB R104|TAB R83.3|TAB A1042", "ModecomTablet": "FreeTAB 9000|FreeTAB 7.4|FreeTAB 7004|FreeTAB 7800|FreeTAB 2096|FreeTAB 7.5|FreeTAB 1014|FreeTAB 1001 |FreeTAB 8001|FreeTAB 9706|FreeTAB 9702|FreeTAB 7003|FreeTAB 7002|FreeTAB 1002|FreeTAB 7801|FreeTAB 1331|FreeTAB 1004|FreeTAB 8002|FreeTAB 8014|FreeTAB 9704|FreeTAB 1003", "VoninoTablet": "\\b(Argus[ _]?S|Diamond[ _]?79HD|Emerald[ _]?78E|Luna[ _]?70C|Onyx[ _]?S|Onyx[ _]?Z|Orin[ _]?HD|Orin[ _]?S|Otis[ _]?S|SpeedStar[ _]?S|Magnet[ _]?M9|Primus[ _]?94[ _]?3G|Primus[ _]?94HD|Primus[ _]?QS|Android.*\\bQ8\\b|Sirius[ _]?EVO[ _]?QS|Sirius[ _]?QS|Spirit[ _]?S)\\b", "ECSTablet": "V07OT2|TM105A|S10OT1|TR10CS1", "StorexTablet": "eZee[_']?(Tab|Go)[0-9]+|TabLC7|Looney Tunes Tab", "VodafoneTablet": "SmartTab([ ]+)?[0-9]+|SmartTabII10|SmartTabII7|VF-1497", "EssentielBTablet": "Smart[ ']?TAB[ ]+?[0-9]+|Family[ ']?TAB2", "RossMoorTablet": "RM-790|RM-997|RMD-878G|RMD-974R|RMT-705A|RMT-701|RME-601|RMT-501|RMT-711", "iMobileTablet": "i-mobile i-note", "TolinoTablet": "tolino tab [0-9.]+|tolino shine", "AudioSonicTablet": "\\bC-22Q|T7-QC|T-17B|T-17P\\b", "AMPETablet": "Android.* A78 ", "SkkTablet": "Android.* (SKYPAD|PHOENIX|CYCLOPS)", "TecnoTablet": "TECNO P9", "JXDTablet": "Android.* \\b(F3000|A3300|JXD5000|JXD3000|JXD2000|JXD300B|JXD300|S5800|S7800|S602b|S5110b|S7300|S5300|S602|S603|S5100|S5110|S601|S7100a|P3000F|P3000s|P101|P200s|P1000m|P200m|P9100|P1000s|S6600b|S908|P1000|P300|S18|S6600|S9100)\\b", "iJoyTablet": "Tablet (Spirit 7|Essentia|Galatea|Fusion|Onix 7|Landa|Titan|Scooby|Deox|Stella|Themis|Argon|Unique 7|Sygnus|Hexen|Finity 7|Cream|Cream X2|Jade|Neon 7|Neron 7|Kandy|Scape|Saphyr 7|Rebel|Biox|Rebel|Rebel 8GB|Myst|Draco 7|Myst|Tab7-004|Myst|Tadeo Jones|Tablet Boing|Arrow|Draco Dual Cam|Aurix|Mint|Amity|Revolution|Finity 9|Neon 9|T9w|Amity 4GB Dual Cam|Stone 4GB|Stone 8GB|Andromeda|Silken|X2|Andromeda II|Halley|Flame|Saphyr 9,7|Touch 8|Planet|Triton|Unique 10|Hexen 10|Memphis 4GB|Memphis 8GB|Onix 10)", "FX2Tablet": "FX2 PAD7|FX2 PAD10", "XoroTablet": "KidsPAD 701|PAD[ ]?712|PAD[ ]?714|PAD[ ]?716|PAD[ ]?717|PAD[ ]?718|PAD[ ]?720|PAD[ ]?721|PAD[ ]?722|PAD[ ]?790|PAD[ ]?792|PAD[ ]?900|PAD[ ]?9715D|PAD[ ]?9716DR|PAD[ ]?9718DR|PAD[ ]?9719QR|PAD[ ]?9720QR|TelePAD1030|Telepad1032|TelePAD730|TelePAD731|TelePAD732|TelePAD735Q|TelePAD830|TelePAD9730|TelePAD795|MegaPAD 1331|MegaPAD 1851|MegaPAD 2151", "ViewsonicTablet": "ViewPad 10pi|ViewPad 10e|ViewPad 10s|ViewPad E72|ViewPad7|ViewPad E100|ViewPad 7e|ViewSonic VB733|VB100a", "OdysTablet": "LOOX|XENO10|ODYS[ -](Space|EVO|Xpress|NOON)|\\bXELIO\\b|Xelio10Pro|XELIO7PHONETAB|XELIO10EXTREME|XELIOPT2|NEO_QUAD10", "CaptivaTablet": "CAPTIVA PAD", "IconbitTablet": "NetTAB|NT-3702|NT-3702S|NT-3702S|NT-3603P|NT-3603P|NT-0704S|NT-0704S|NT-3805C|NT-3805C|NT-0806C|NT-0806C|NT-0909T|NT-0909T|NT-0907S|NT-0907S|NT-0902S|NT-0902S", "TeclastTablet": "T98 4G|\\bP80\\b|\\bX90HD\\b|X98 Air|X98 Air 3G|\\bX89\\b|P80 3G|\\bX80h\\b|P98 Air|\\bX89HD\\b|P98 3G|\\bP90HD\\b|P89 3G|X98 3G|\\bP70h\\b|P79HD 3G|G18d 3G|\\bP79HD\\b|\\bP89s\\b|\\bA88\\b|\\bP10HD\\b|\\bP19HD\\b|G18 3G|\\bP78HD\\b|\\bA78\\b|\\bP75\\b|G17s 3G|G17h 3G|\\bP85t\\b|\\bP90\\b|\\bP11\\b|\\bP98t\\b|\\bP98HD\\b|\\bG18d\\b|\\bP85s\\b|\\bP11HD\\b|\\bP88s\\b|\\bA80HD\\b|\\bA80se\\b|\\bA10h\\b|\\bP89\\b|\\bP78s\\b|\\bG18\\b|\\bP85\\b|\\bA70h\\b|\\bA70\\b|\\bG17\\b|\\bP18\\b|\\bA80s\\b|\\bA11s\\b|\\bP88HD\\b|\\bA80h\\b|\\bP76s\\b|\\bP76h\\b|\\bP98\\b|\\bA10HD\\b|\\bP78\\b|\\bP88\\b|\\bA11\\b|\\bA10t\\b|\\bP76a\\b|\\bP76t\\b|\\bP76e\\b|\\bP85HD\\b|\\bP85a\\b|\\bP86\\b|\\bP75HD\\b|\\bP76v\\b|\\bA12\\b|\\bP75a\\b|\\bA15\\b|\\bP76Ti\\b|\\bP81HD\\b|\\bA10\\b|\\bT760VE\\b|\\bT720HD\\b|\\bP76\\b|\\bP73\\b|\\bP71\\b|\\bP72\\b|\\bT720SE\\b|\\bC520Ti\\b|\\bT760\\b|\\bT720VE\\b|T720-3GE|T720-WiFi", "OndaTablet": "\\b(V975i|Vi30|VX530|V701|Vi60|V701s|Vi50|V801s|V719|Vx610w|VX610W|V819i|Vi10|VX580W|Vi10|V711s|V813|V811|V820w|V820|Vi20|V711|VI30W|V712|V891w|V972|V819w|V820w|Vi60|V820w|V711|V813s|V801|V819|V975s|V801|V819|V819|V818|V811|V712|V975m|V101w|V961w|V812|V818|V971|V971s|V919|V989|V116w|V102w|V973|Vi40)\\b[\\s]+", "JaytechTablet": "TPC-PA762", "BlaupunktTablet": "Endeavour 800NG|Endeavour 1010", "DigmaTablet": "\\b(iDx10|iDx9|iDx8|iDx7|iDxD7|iDxD8|iDsQ8|iDsQ7|iDsQ8|iDsD10|iDnD7|3TS804H|iDsQ11|iDj7|iDs10)\\b", "EvolioTablet": "ARIA_Mini_wifi|Aria[ _]Mini|Evolio X10|Evolio X7|Evolio X8|\\bEvotab\\b|\\bNeura\\b", "LavaTablet": "QPAD E704|\\bIvoryS\\b|E-TAB IVORY|\\bE-TAB\\b", "AocTablet": "MW0811|MW0812|MW0922|MTK8382|MW1031|MW0831|MW0821|MW0931|MW0712", "MpmanTablet": "MP11 OCTA|MP10 OCTA|MPQC1114|MPQC1004|MPQC994|MPQC974|MPQC973|MPQC804|MPQC784|MPQC780|\\bMPG7\\b|MPDCG75|MPDCG71|MPDC1006|MP101DC|MPDC9000|MPDC905|MPDC706HD|MPDC706|MPDC705|MPDC110|MPDC100|MPDC99|MPDC97|MPDC88|MPDC8|MPDC77|MP709|MID701|MID711|MID170|MPDC703|MPQC1010", "CelkonTablet": "CT695|CT888|CT[\\s]?910|CT7 Tab|CT9 Tab|CT3 Tab|CT2 Tab|CT1 Tab|C820|C720|\\bCT-1\\b", "WolderTablet": "miTab \\b(DIAMOND|SPACE|BROOKLYN|NEO|FLY|MANHATTAN|FUNK|EVOLUTION|SKY|GOCAR|IRON|GENIUS|POP|MINT|EPSILON|BROADWAY|JUMP|HOP|LEGEND|NEW AGE|LINE|ADVANCE|FEEL|FOLLOW|LIKE|LINK|LIVE|THINK|FREEDOM|CHICAGO|CLEVELAND|BALTIMORE-GH|IOWA|BOSTON|SEATTLE|PHOENIX|DALLAS|IN 101|MasterChef)\\b", "MiTablet": "\\bMI PAD\\b|\\bHM NOTE 1W\\b", "NibiruTablet": "Nibiru M1|Nibiru Jupiter One", "NexoTablet": "NEXO NOVA|NEXO 10|NEXO AVIO|NEXO FREE|NEXO GO|NEXO EVO|NEXO 3G|NEXO SMART|NEXO KIDDO|NEXO MOBI", "LeaderTablet": "TBLT10Q|TBLT10I|TBL-10WDKB|TBL-10WDKBO2013|TBL-W230V2|TBL-W450|TBL-W500|SV572|TBLT7I|TBA-AC7-8G|TBLT79|TBL-8W16|TBL-10W32|TBL-10WKB|TBL-W100", "UbislateTablet": "UbiSlate[\\s]?7C", "PocketBookTablet": "Pocketbook", "KocasoTablet": "\\b(TB-1207)\\b", "Hudl": "Hudl HT7S3|Hudl 2", "TelstraTablet": "T-Hub2", "GenericTablet": "Android.*\\b97D\\b|Tablet(?!.*PC)|BNTV250A|MID-WCDMA|LogicPD Zoom2|\\bA7EB\\b|CatNova8|A1_07|CT704|CT1002|\\bM721\\b|rk30sdk|\\bEVOTAB\\b|M758A|ET904|ALUMIUM10|Smartfren Tab|Endeavour 1010|Tablet-PC-4|Tagi Tab|\\bM6pro\\b|CT1020W|arc 10HD|\\bJolla\\b|\\bTP750\\b" }, "oss": { "androids": "Android", "BlackBerryOS": "blackberry|\\bBB10\\b|rim tablet os", "PalmOS": "PalmOS|avantgo|blazer|elaine|hiptop|palm|plucker|xiino", "SymbianOS": "Symbian|symbols|Series60|Series40|SYB-[0-9]+|\\bS60\\b", "WindowsMobileOS": "Windows CE.*(PPC|Smartphone|Mobile|[0-9]{3}x[0-9]{3})|Window Mobile|Windows Phone [0-9.]+|WCE;", "WindowsPhoneOS": "Windows Phone 10.0|Windows Phone 8.1|Windows Phone 8.0|Windows Phone OS|XBLWP7|ZuneWP7|Windows NT 6.[23]; ARM;", "iOS": "\\biPhone.*Mobile|\\biPod|\\biPad", "MeeGoOS": "MeeGo", "MaemoOS": "Maemo", "JavaOS": "J2ME\/|\\bMIDP\\b|\\bCLDC\\b", "webOS": "webOS|hpwOS", "badaOS": "\\bBada\\b", "BREWOS": "BREW" }, "uas": { "Vivaldi": "Vivaldi", "Chrome": "\\bCrMo\\b|CriOS|Android.*Chrome\/[.0-9]* (Mobile)?", "Dolfin": "\\bDolfin\\b", "Opera": "Opera.*Mini|Opera.*Mobi|Android.*Opera|Mobile.*OPR\/[0-9.]+|Coast\/[0-9.]+", "Skyfire": "Skyfire", "Edge": "Mobile Safari\/[.0-9]* Edge", "IE": "IEMobile|MSIEMobile", "Firefox": "fennec|firefox.*maemo|(Mobile|Tablet).*Firefox|Firefox.*Mobile", "Bolt": "bolt", "TeaShark": "teashark", "Blazer": "Blazer", "Safari": "Version.*Mobile.*Safari|Safari.*Mobile|MobileSafari", "Tizen": "Tizen", "UCBrowser": "UC.*Browser|UCWEB", "baiduboxapp": "baiduboxapp", "baidubrowser": "baidubrowser", "DiigoBrowser": "DiigoBrowser", "Puffin": "Puffin", "Mercury": "\\bMercury\\b", "ObigoBrowser": "Obigo", "NetFront": "NF-Browser", "GenericBrowser": "NokiaBrowser|OviBrowser|OneBrowser|TwonkyBeamBrowser|SEMC.*Browser|FlyFlow|Minimo|NetFront|Novarra-Vision|MQQBrowser|MicroMessenger", "PaleMoon": "Android.*PaleMoon|Mobile.*PaleMoon" }, "props": { "Mobile": "Mobile\/[VER]", "Build": "Build\/[VER]", "Version": "Version\/[VER]", "VendorID": "VendorID\/[VER]", "iPad": "iPad.*CPU[a-z ]+[VER]", "iPhone": "iPhone.*CPU[a-z ]+[VER]", "iPod": "iPod.*CPU[a-z ]+[VER]", "Kindle": "Kindle\/[VER]", "Chrome": [ "Chrome\/[VER]", "CriOS\/[VER]", "CrMo\/[VER]" ], "Coast": [ "Coast\/[VER]" ], "Dolfin": "Dolfin\/[VER]", "Firefox": "Firefox\/[VER]", "Fennec": "Fennec\/[VER]", "Edge": "Edge\/[VER]", "IE": [ "IEMobile\/[VER];", "IEMobile [VER]", "MSIE [VER];", "Trident\/[0-9.]+;.*rv:[VER]" ], "NetFront": "NetFront\/[VER]", "NokiaBrowser": "NokiaBrowser\/[VER]", "Opera": [ " OPR\/[VER]", "Opera Mini\/[VER]", "Version\/[VER]" ], "Opera Mini": "Opera Mini\/[VER]", "Opera Mobi": "Version\/[VER]", "UC Browser": "UC Browser[VER]", "MQQBrowser": "MQQBrowser\/[VER]", "MicroMessenger": "MicroMessenger\/[VER]", "baiduboxapp": "baiduboxapp\/[VER]", "baidubrowser": "baidubrowser\/[VER]", "Iron": "Iron\/[VER]", "Safari": [ "Version\/[VER]", "Safari\/[VER]" ], "Skyfire": "Skyfire\/[VER]", "Tizen": "Tizen\/[VER]", "Webkit": "webkit[ \/][VER]", "PaleMoon": "PaleMoon\/[VER]", "Gecko": "Gecko\/[VER]", "Trident": "Trident\/[VER]", "Presto": "Presto\/[VER]", "Goanna": "Goanna\/[VER]", "iOS": " \\bi?OS\\b [VER][ ;]{1}", "Android": "Android [VER]", "BlackBerry": [ "BlackBerry[\\w]+\/[VER]", "BlackBerry.*Version\/[VER]", "Version\/[VER]" ], "BREW": "BREW [VER]", "Java": "Java\/[VER]", "Windows Phone OS": [ "Windows Phone OS [VER]", "Windows Phone [VER]" ], "Windows Phone": "Windows Phone [VER]", "Windows CE": "Windows CE\/[VER]", "Windows NT": "Windows NT [VER]", "Symbian": [ "SymbianOS\/[VER]", "Symbian\/[VER]" ], "webOS": [ "webOS\/[VER]", "hpwOS\/[VER];" ] }, "utils": { "Bot": "Googlebot|facebookexternalhit|AdsBot-Google|Google Keyword Suggestion|Facebot|YandexBot|bingbot|ia_archiver|AhrefsBot|Ezooms|GSLFbot|WBSearchBot|Twitterbot|TweetmemeBot|Twikle|PaperLiBot|Wotbox|UnwindFetchor|Exabot|MJ12bot|YandexImages|TurnitinBot|Pingdom", "MobileBot": "Googlebot-Mobile|AdsBot-Google-Mobile|YahooSeeker\/M1A1-R2D2", "DesktopMode": "WPDesktop", "TV": "SonyDTV|HbbTV", "WebKit": "(webkit)[ \/]([\\w.]+)", "Console": "\\b(Nintendo|Nintendo WiiU|Nintendo 3DS|PLAYSTATION|Xbox)\\b", "Watch": "SM-V700" }}; // following patterns come from http://detectmobilebrowsers.com/ impl.detectMobileBrowsers = { fullPattern: /(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino/i, shortPattern: /1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i, tabletPattern: /android|ipad|playbook|silk/i }; var hasOwnProp = Object.prototype.hasOwnProperty, isArray; impl.FALLBACK_PHONE = 'UnknownPhone'; impl.FALLBACK_TABLET = 'UnknownTablet'; impl.FALLBACK_MOBILE = 'UnknownMobile'; isArray = ('isArray' in Array) ? Array.isArray : function (value) { return Object.prototype.toString.call(value) === '[object Array]'; }; isArray = 'isArray' in Array ? function (value) { return Object.prototype.toString.call(value) === '[object Array]'; } : Array.isArray; function equalIC(a, b) { return a != null && b != null && a.toLowerCase() === b.toLowerCase(); } function containsIC(array, value) { var valueLC, i, len = array.length; if (!len || !value) { return false; } valueLC = value.toLowerCase(); for (i = 0; i < len; ++i) { if (valueLC === array[i].toLowerCase()) { return true; } } return false; } function convertPropsToRegExp(object) { for (var key in object) { if (hasOwnProp.call(object, key)) { object[key] = new RegExp(object[key], 'i'); } } } (function init() { var key, values, value, i, len, verPos, mobileDetectRules = impl.mobileDetectRules; for (key in mobileDetectRules.props) { if (hasOwnProp.call(mobileDetectRules.props, key)) { values = mobileDetectRules.props[key]; if (!isArray(values)) { values = [values]; } len = values.length; for (i = 0; i < len; ++i) { value = values[i]; verPos = value.indexOf('[VER]'); if (verPos >= 0) { value = value.substring(0, verPos) + '([\\w._\\+]+)' + value.substring(verPos + 5); } values[i] = new RegExp(value, 'i'); } mobileDetectRules.props[key] = values; } } convertPropsToRegExp(mobileDetectRules.oss); convertPropsToRegExp(mobileDetectRules.phones); convertPropsToRegExp(mobileDetectRules.tablets); convertPropsToRegExp(mobileDetectRules.uas); convertPropsToRegExp(mobileDetectRules.utils); // copy some patterns to oss0 which are tested first (see issue#15) mobileDetectRules.oss0 = { WindowsPhoneOS: mobileDetectRules.oss.WindowsPhoneOS, WindowsMobileOS: mobileDetectRules.oss.WindowsMobileOS }; }()); /** * Test userAgent string against a set of rules and find the first matched key. * @param {Object} rules (key is String, value is RegExp) * @param {String} userAgent the navigator.userAgent (or HTTP-Header 'User-Agent'). * @returns {String|null} the matched key if found, otherwise null * @private */ impl.findMatch = function(rules, userAgent) { for (var key in rules) { if (hasOwnProp.call(rules, key)) { if (rules[key].test(userAgent)) { return key; } } } return null; }; /** * Test userAgent string against a set of rules and return an array of matched keys. * @param {Object} rules (key is String, value is RegExp) * @param {String} userAgent the navigator.userAgent (or HTTP-Header 'User-Agent'). * @returns {Array} an array of matched keys, may be empty when there is no match, but not null * @private */ impl.findMatches = function(rules, userAgent) { var result = []; for (var key in rules) { if (hasOwnProp.call(rules, key)) { if (rules[key].test(userAgent)) { result.push(key); } } } return result; }; /** * Check the version of the given property in the User-Agent. * * @param {String} propertyName * @param {String} userAgent * @return {String} version or null if version not found * @private */ impl.getVersionStr = function (propertyName, userAgent) { var props = impl.mobileDetectRules.props, patterns, i, len, match; if (hasOwnProp.call(props, propertyName)) { patterns = props[propertyName]; len = patterns.length; for (i = 0; i < len; ++i) { match = patterns[i].exec(userAgent); if (match !== null) { return match[1]; } } } return null; }; /** * Check the version of the given property in the User-Agent. * Will return a float number. (eg. 2_0 will return 2.0, 4.3.1 will return 4.31) * * @param {String} propertyName * @param {String} userAgent * @return {Number} version or NaN if version not found * @private */ impl.getVersion = function (propertyName, userAgent) { var version = impl.getVersionStr(propertyName, userAgent); return version ? impl.prepareVersionNo(version) : NaN; }; /** * Prepare the version number. * * @param {String} version * @return {Number} the version number as a floating number * @private */ impl.prepareVersionNo = function (version) { var numbers; numbers = version.split(/[a-z._ \/\-]/i); if (numbers.length === 1) { version = numbers[0]; } if (numbers.length > 1) { version = numbers[0] + '.'; numbers.shift(); version += numbers.join(''); } return Number(version); }; impl.isMobileFallback = function (userAgent) { return impl.detectMobileBrowsers.fullPattern.test(userAgent) || impl.detectMobileBrowsers.shortPattern.test(userAgent.substr(0,4)); }; impl.isTabletFallback = function (userAgent) { return impl.detectMobileBrowsers.tabletPattern.test(userAgent); }; impl.prepareDetectionCache = function (cache, userAgent, maxPhoneWidth) { if (cache.mobile !== undefined) { return; } var phone, tablet, phoneSized; // first check for stronger tablet rules, then phone (see issue#5) tablet = impl.findMatch(impl.mobileDetectRules.tablets, userAgent); if (tablet) { cache.mobile = cache.tablet = tablet; cache.phone = null; return; // unambiguously identified as tablet } phone = impl.findMatch(impl.mobileDetectRules.phones, userAgent); if (phone) { cache.mobile = cache.phone = phone; cache.tablet = null; return; // unambiguously identified as phone } // our rules haven't found a match -> try more general fallback rules if (impl.isMobileFallback(userAgent)) { phoneSized = MobileDetect.isPhoneSized(maxPhoneWidth); if (phoneSized === undefined) { cache.mobile = impl.FALLBACK_MOBILE; cache.tablet = cache.phone = null; } else if (phoneSized) { cache.mobile = cache.phone = impl.FALLBACK_PHONE; cache.tablet = null; } else { cache.mobile = cache.tablet = impl.FALLBACK_TABLET; cache.phone = null; } } else if (impl.isTabletFallback(userAgent)) { cache.mobile = cache.tablet = impl.FALLBACK_TABLET; cache.phone = null; } else { // not mobile at all! cache.mobile = cache.tablet = cache.phone = null; } }; // t is a reference to a MobileDetect instance impl.mobileGrade = function (t) { // impl note: // To keep in sync w/ Mobile_Detect.php easily, the following code is tightly aligned to the PHP version. // When changes are made in Mobile_Detect.php, copy this method and replace: // $this-> / t. // self::MOBILE_GRADE_(.) / '$1' // , self::VERSION_TYPE_FLOAT / (nothing) // isIOS() / os('iOS') // [reg] / (nothing) <-- jsdelivr complaining about unescaped unicode character U+00AE var $isMobile = t.mobile() !== null; if ( // Apple iOS 3.2-5.1 - Tested on the original iPad (4.3 / 5.0), iPad 2 (4.3), iPad 3 (5.1), original iPhone (3.1), iPhone 3 (3.2), 3GS (4.3), 4 (4.3 / 5.0), and 4S (5.1) t.os('iOS') && t.version('iPad')>=4.3 || t.os('iOS') && t.version('iPhone')>=3.1 || t.os('iOS') && t.version('iPod')>=3.1 || // Android 2.1-2.3 - Tested on the HTC Incredible (2.2), original Droid (2.2), HTC Aria (2.1), Google Nexus S (2.3). Functional on 1.5 & 1.6 but performance may be sluggish, tested on Google G1 (1.5) // Android 3.1 (Honeycomb) - Tested on the Samsung Galaxy Tab 10.1 and Motorola XOOM // Android 4.0 (ICS) - Tested on a Galaxy Nexus. Note: transition performance can be poor on upgraded devices // Android 4.1 (Jelly Bean) - Tested on a Galaxy Nexus and Galaxy 7 ( t.version('Android')>2.1 && t.is('Webkit') ) || // Windows Phone 7-7.5 - Tested on the HTC Surround (7.0) HTC Trophy (7.5), LG-E900 (7.5), Nokia Lumia 800 t.version('Windows Phone OS')>=7.0 || // Blackberry 7 - Tested on BlackBerry Torch 9810 // Blackberry 6.0 - Tested on the Torch 9800 and Style 9670 t.is('BlackBerry') && t.version('BlackBerry')>=6.0 || // Blackberry Playbook (1.0-2.0) - Tested on PlayBook t.match('Playbook.*Tablet') || // Palm WebOS (1.4-2.0) - Tested on the Palm Pixi (1.4), Pre (1.4), Pre 2 (2.0) ( t.version('webOS')>=1.4 && t.match('Palm|Pre|Pixi') ) || // Palm WebOS 3.0 - Tested on HP TouchPad t.match('hp.*TouchPad') || // Firefox Mobile (12 Beta) - Tested on Android 2.3 device ( t.is('Firefox') && t.version('Firefox')>=12 ) || // Chrome for Android - Tested on Android 4.0, 4.1 device ( t.is('Chrome') && t.is('androids') && t.version('Android')>=4.0 ) || // Skyfire 4.1 - Tested on Android 2.3 device ( t.is('Skyfire') && t.version('Skyfire')>=4.1 && t.is('androids') && t.version('Android')>=2.3 ) || // Opera Mobile 11.5-12: Tested on Android 2.3 ( t.is('Opera') && t.version('Opera Mobi')>11 && t.is('androids') ) || // Meego 1.2 - Tested on Nokia 950 and N9 t.is('MeeGoOS') || // Tizen (pre-release) - Tested on early hardware t.is('Tizen') || // Samsung Bada 2.0 - Tested on a Samsung Wave 3, Dolphin browser // @todo: more tests here! t.is('Dolfin') && t.version('Bada')>=2.0 || // UC Browser - Tested on Android 2.3 device ( (t.is('UC Browser') || t.is('Dolfin')) && t.version('Android')>=2.3 ) || // Kindle 3 and Fire - Tested on the built-in WebKit browser for each ( t.match('Kindle Fire') || t.is('Kindle') && t.version('Kindle')>=3.0 ) || // Nook Color 1.4.1 - Tested on original Nook Color, not Nook Tablet t.is('androids') && t.is('NookTablet') || // Chrome Desktop 11-21 - Tested on OS X 10.7 and Windows 7 t.version('Chrome')>=11 && !$isMobile || // Safari Desktop 4-5 - Tested on OS X 10.7 and Windows 7 t.version('Safari')>=5.0 && !$isMobile || // Firefox Desktop 4-13 - Tested on OS X 10.7 and Windows 7 t.version('Firefox')>=4.0 && !$isMobile || // Internet Explorer 7-9 - Tested on Windows XP, Vista and 7 t.version('MSIE')>=7.0 && !$isMobile || // Opera Desktop 10-12 - Tested on OS X 10.7 and Windows 7 // @reference: http://my.opera.com/community/openweb/idopera/ t.version('Opera')>=10 && !$isMobile ){ return 'A'; } if ( t.os('iOS') && t.version('iPad')<4.3 || t.os('iOS') && t.version('iPhone')<3.1 || t.os('iOS') && t.version('iPod')<3.1 || // Blackberry 5.0: Tested on the Storm 2 9550, Bold 9770 t.is('Blackberry') && t.version('BlackBerry')>=5 && t.version('BlackBerry')<6 || //Opera Mini (5.0-6.5) - Tested on iOS 3.2/4.3 and Android 2.3 ( t.version('Opera Mini')>=5.0 && t.version('Opera Mini')<=6.5 && (t.version('Android')>=2.3 || t.is('iOS')) ) || // Nokia Symbian^3 - Tested on Nokia N8 (Symbian^3), C7 (Symbian^3), also works on N97 (Symbian^1) t.match('NokiaN8|NokiaC7|N97.*Series60|Symbian/3') || // @todo: report this (tested on Nokia N71) t.version('Opera Mobi')>=11 && t.is('SymbianOS') ){ return 'B'; } if ( // Blackberry 4.x - Tested on the Curve 8330 t.version('BlackBerry')<5.0 || // Windows Mobile - Tested on the HTC Leo (WinMo 5.2) t.match('MSIEMobile|Windows CE.*Mobile') || t.version('Windows Mobile')<=5.2 ){ return 'C'; } //All older smartphone platforms and featurephones - Any device that doesn't support media queries //will receive the basic, C grade experience. return 'C'; }; impl.detectOS = function (ua) { return impl.findMatch(impl.mobileDetectRules.oss0, ua) || impl.findMatch(impl.mobileDetectRules.oss, ua); }; impl.getDeviceSmallerSide = function () { return window.screen.width < window.screen.height ? window.screen.width : window.screen.height; }; /** * Constructor for MobileDetect object. *
* Such an object will keep a reference to the given user-agent string and cache most of the detect queries.
*
* Find information how to download and install: * github.com/hgoebl/mobile-detect.js/ *
* * @example 
     *     var md = new MobileDetect(window.navigator.userAgent);     *     if (md.mobile()) {     *         location.href = (md.mobileGrade() === 'A') ? '/mobile/' : '/lynx/';     *     }     *
* * @param {string} userAgent typically taken from window.navigator.userAgent or http_header['User-Agent'] * @param {number} [maxPhoneWidth=600] only for browsers specify a value for the maximum * width of smallest device side (in logical "CSS" pixels) until a device detected as mobile will be handled * as phone. * This is only used in cases where the device cannot be classified as phone or tablet.
* See Declaring Tablet Layouts * for Android.
* If you provide a value < 0, then this "fuzzy" check is disabled. * @constructor * @global */ function MobileDetect(userAgent, maxPhoneWidth) { this.ua = userAgent || ''; this._cache = {}; //600dp is typical 7" tablet minimum width this.maxPhoneWidth = maxPhoneWidth || 600; } MobileDetect.prototype = { constructor: MobileDetect, /** * Returns the detected phone or tablet type or null if it is not a mobile device. *
* For a list of possible return values see {@link MobileDetect#phone} and {@link MobileDetect#tablet}.
*
* If the device is not detected by the regular expressions from Mobile-Detect, a test is made against * the patterns of detectmobilebrowsers.com. If this test * is positive, a value of UnknownPhone, UnknownTablet or * UnknownMobile is returned.
* When used in browser, the decision whether phone or tablet is made based on screen.width/height.
*
* When used server-side (node.js), there is no way to tell the difference between UnknownTablet * and UnknownMobile, so you will get UnknownMobile here.
* Be aware that since v1.0.0 in this special case you will get UnknownMobile only for: * {@link MobileDetect#mobile}, not for {@link MobileDetect#phone} and {@link MobileDetect#tablet}. * In versions before v1.0.0 all 3 methods returned UnknownMobile which was tedious to use. *
* In most cases you will use the return value just as a boolean. * * @returns {String} the key for the phone family or tablet family, e.g. "Nexus". * @function MobileDetect#mobile */ mobile: function () { impl.prepareDetectionCache(this._cache, this.ua, this.maxPhoneWidth); return this._cache.mobile; }, /** * Returns the detected phone type/family string or null. *
* The returned tablet (family or producer) is one of following keys:
*
iPhone, BlackBerry, HTC, Nexus, Dell, Motorola, Samsung, LG, Sony, Asus, * NokiaLumia, Micromax, Palm, Vertu, Pantech, Fly, Wiko, iMobile, SimValley, * Wolfgang, Alcatel, Nintendo, Amoi, INQ, GenericPhone
*
* If the device is not detected by the regular expressions from Mobile-Detect, a test is made against * the patterns of detectmobilebrowsers.com. If this test * is positive, a value of UnknownPhone or UnknownMobile is returned.
* When used in browser, the decision whether phone or tablet is made based on screen.width/height.
*
* When used server-side (node.js), there is no way to tell the difference between UnknownTablet * and UnknownMobile, so you will get null here, while {@link MobileDetect#mobile} * will return UnknownMobile.
* Be aware that since v1.0.0 in this special case you will get UnknownMobile only for: * {@link MobileDetect#mobile}, not for {@link MobileDetect#phone} and {@link MobileDetect#tablet}. * In versions before v1.0.0 all 3 methods returned UnknownMobile which was tedious to use. *
* In most cases you will use the return value just as a boolean. * * @returns {String} the key of the phone family or producer, e.g. "iPhone" * @function MobileDetect#phone */ phone: function () { impl.prepareDetectionCache(this._cache, this.ua, this.maxPhoneWidth); return this._cache.phone; }, /** * Returns the detected tablet type/family string or null. *
* The returned tablet (family or producer) is one of following keys:
*
iPad, NexusTablet, SamsungTablet, Kindle, SurfaceTablet, HPTablet, AsusTablet, * BlackBerryTablet, HTCtablet, MotorolaTablet, NookTablet, AcerTablet, * ToshibaTablet, LGTablet, FujitsuTablet, PrestigioTablet, LenovoTablet, * DellTablet, YarvikTablet, MedionTablet, ArnovaTablet, IntensoTablet, IRUTablet, * MegafonTablet, EbodaTablet, AllViewTablet, ArchosTablet, AinolTablet, * NokiaLumiaTablet, SonyTablet, PhilipsTablet, CubeTablet, CobyTablet, MIDTablet, * MSITablet, SMiTTablet, RockChipTablet, FlyTablet, bqTablet, HuaweiTablet, * NecTablet, PantechTablet, BronchoTablet, VersusTablet, ZyncTablet, * PositivoTablet, NabiTablet, KoboTablet, DanewTablet, TexetTablet, * PlaystationTablet, TrekstorTablet, PyleAudioTablet, AdvanTablet, * DanyTechTablet, GalapadTablet, MicromaxTablet, KarbonnTablet, AllFineTablet, * PROSCANTablet, YONESTablet, ChangJiaTablet, GUTablet, PointOfViewTablet, * OvermaxTablet, HCLTablet, DPSTablet, VistureTablet, CrestaTablet, * MediatekTablet, ConcordeTablet, GoCleverTablet, ModecomTablet, VoninoTablet, * ECSTablet, StorexTablet, VodafoneTablet, EssentielBTablet, RossMoorTablet, * iMobileTablet, TolinoTablet, AudioSonicTablet, AMPETablet, SkkTablet, * TecnoTablet, JXDTablet, iJoyTablet, FX2Tablet, XoroTablet, ViewsonicTablet, * OdysTablet, CaptivaTablet, IconbitTablet, TeclastTablet, OndaTablet, * JaytechTablet, BlaupunktTablet, DigmaTablet, EvolioTablet, LavaTablet, * AocTablet, MpmanTablet, CelkonTablet, WolderTablet, MiTablet, NibiruTablet, * NexoTablet, LeaderTablet, UbislateTablet, PocketBookTablet, KocasoTablet, Hudl, * TelstraTablet, GenericTablet
*
* If the device is not detected by the regular expressions from Mobile-Detect, a test is made against * the patterns of detectmobilebrowsers.com. If this test * is positive, a value of UnknownTablet or UnknownMobile is returned.
* When used in browser, the decision whether phone or tablet is made based on screen.width/height.
*
* When used server-side (node.js), there is no way to tell the difference between UnknownTablet * and UnknownMobile, so you will get null here, while {@link MobileDetect#mobile} * will return UnknownMobile.
* Be aware that since v1.0.0 in this special case you will get UnknownMobile only for: * {@link MobileDetect#mobile}, not for {@link MobileDetect#phone} and {@link MobileDetect#tablet}. * In versions before v1.0.0 all 3 methods returned UnknownMobile which was tedious to use. *
* In most cases you will use the return value just as a boolean. * * @returns {String} the key of the tablet family or producer, e.g. "SamsungTablet" * @function MobileDetect#tablet */ tablet: function () { impl.prepareDetectionCache(this._cache, this.ua, this.maxPhoneWidth); return this._cache.tablet; }, /** * Returns the (first) detected user-agent string or null. *
* The returned user-agent is one of following keys:
*
Vivaldi, Chrome, Dolfin, Opera, Skyfire, Edge, IE, Firefox, Bolt, TeaShark, * Blazer, Safari, Tizen, UCBrowser, baiduboxapp, baidubrowser, DiigoBrowser, * Puffin, Mercury, ObigoBrowser, NetFront, GenericBrowser, PaleMoon
*
* In most cases calling {@link MobileDetect#userAgent} will be sufficient. But there are rare * cases where a mobile device pretends to be more than one particular browser. You can get the * list of all matches with {@link MobileDetect#userAgents} or check for a particular value by * providing one of the defined keys as first argument to {@link MobileDetect#is}. * * @returns {String} the key for the detected user-agent or null * @function MobileDetect#userAgent */ userAgent: function () { if (this._cache.userAgent === undefined) { this._cache.userAgent = impl.findMatch(impl.mobileDetectRules.uas, this.ua); } return this._cache.userAgent; }, /** * Returns all detected user-agent strings. *
* The array is empty or contains one or more of following keys:
*
Vivaldi, Chrome, Dolfin, Opera, Skyfire, Edge, IE, Firefox, Bolt, TeaShark, * Blazer, Safari, Tizen, UCBrowser, baiduboxapp, baidubrowser, DiigoBrowser, * Puffin, Mercury, ObigoBrowser, NetFront, GenericBrowser, PaleMoon
*
* In most cases calling {@link MobileDetect#userAgent} will be sufficient. But there are rare * cases where a mobile device pretends to be more than one particular browser. You can get the * list of all matches with {@link MobileDetect#userAgents} or check for a particular value by * providing one of the defined keys as first argument to {@link MobileDetect#is}. * * @returns {Array} the array of detected user-agent keys or [] * @function MobileDetect#userAgents */ userAgents: function () { if (this._cache.userAgents === undefined) { this._cache.userAgents = impl.findMatches(impl.mobileDetectRules.uas, this.ua); } return this._cache.userAgents; }, /** * Returns the detected operating system string or null. *
* The operating system is one of following keys:
*
androids, BlackBerryOS, PalmOS, SymbianOS, WindowsMobileOS, WindowsPhoneOS, * iOS, MeeGoOS, MaemoOS, JavaOS, webOS, badaOS, BREWOS
* * @returns {String} the key for the detected operating system. * @function MobileDetect#os */ os: function () { if (this._cache.os === undefined) { this._cache.os = impl.detectOS(this.ua); } return this._cache.os; }, /** * Get the version (as Number) of the given property in the User-Agent. *
* Will return a float number. (eg. 2_0 will return 2.0, 4.3.1 will return 4.31) * * @param {String} key a key defining a thing which has a version.
* You can use one of following keys:
*
Mobile, Build, Version, VendorID, iPad, iPhone, iPod, Kindle, Chrome, Coast, * Dolfin, Firefox, Fennec, Edge, IE, NetFront, NokiaBrowser, Opera, Opera Mini, * Opera Mobi, UC Browser, MQQBrowser, MicroMessenger, baiduboxapp, baidubrowser, * Iron, Safari, Skyfire, Tizen, Webkit, PaleMoon, Gecko, Trident, Presto, Goanna, * iOS, Android, BlackBerry, BREW, Java, Windows Phone OS, Windows Phone, Windows * CE, Windows NT, Symbian, webOS
* * @returns {Number} the version as float or NaN if User-Agent doesn't contain this version. * Be careful when comparing this value with '==' operator! * @function MobileDetect#version */ version: function (key) { return impl.getVersion(key, this.ua); }, /** * Get the version (as String) of the given property in the User-Agent. *
* * @param {String} key a key defining a thing which has a version.
* You can use one of following keys:
*
Mobile, Build, Version, VendorID, iPad, iPhone, iPod, Kindle, Chrome, Coast, * Dolfin, Firefox, Fennec, Edge, IE, NetFront, NokiaBrowser, Opera, Opera Mini, * Opera Mobi, UC Browser, MQQBrowser, MicroMessenger, baiduboxapp, baidubrowser, * Iron, Safari, Skyfire, Tizen, Webkit, PaleMoon, Gecko, Trident, Presto, Goanna, * iOS, Android, BlackBerry, BREW, Java, Windows Phone OS, Windows Phone, Windows * CE, Windows NT, Symbian, webOS
* * @returns {String} the "raw" version as String or null if User-Agent doesn't contain this version. * * @function MobileDetect#versionStr */ versionStr: function (key) { return impl.getVersionStr(key, this.ua); }, /** * Global test key against userAgent, os, phone, tablet and some other properties of userAgent string. * * @param {String} key the key (case-insensitive) of a userAgent, an operating system, phone or * tablet family.
* For a complete list of possible values, see {@link MobileDetect#userAgent}, * {@link MobileDetect#os}, {@link MobileDetect#phone}, {@link MobileDetect#tablet}.
* Additionally you have following keys:
*
Bot, MobileBot, DesktopMode, TV, WebKit, Console, Watch
* * @returns {boolean} true when the given key is one of the defined keys of userAgent, os, phone, * tablet or one of the listed additional keys, otherwise false * @function MobileDetect#is */ is: function (key) { return containsIC(this.userAgents(), key) || equalIC(key, this.os()) || equalIC(key, this.phone()) || equalIC(key, this.tablet()) || containsIC(impl.findMatches(impl.mobileDetectRules.utils, this.ua), key); }, /** * Do a quick test against navigator::userAgent. * * @param {String|RegExp} pattern the pattern, either as String or RegExp * (a string will be converted to a case-insensitive RegExp). * @returns {boolean} true when the pattern matches, otherwise false * @function MobileDetect#match */ match: function (pattern) { if (!(pattern instanceof RegExp)) { pattern = new RegExp(pattern, 'i'); } return pattern.test(this.ua); }, /** * Checks whether the mobile device can be considered as phone regarding screen.width. *
* Obviously this method makes sense in browser environments only (not for Node.js)! * @param {number} [maxPhoneWidth] the maximum logical pixels (aka. CSS-pixels) to be considered as phone.
* The argument is optional and if not present or falsy, the value of the constructor is taken. * @returns {boolean|undefined} undefined if screen size wasn't detectable, else true * when screen.width is less or equal to maxPhoneWidth, otherwise false.
* Will always return undefined server-side. */ isPhoneSized: function (maxPhoneWidth) { return MobileDetect.isPhoneSized(maxPhoneWidth || this.maxPhoneWidth); }, /** * Returns the mobile grade ('A', 'B', 'C'). * * @returns {String} one of the mobile grades ('A', 'B', 'C'). * @function MobileDetect#mobileGrade */ mobileGrade: function () { if (this._cache.grade === undefined) { this._cache.grade = impl.mobileGrade(this); } return this._cache.grade; } }; // environment-dependent if (typeof window !== 'undefined' && window.screen) { MobileDetect.isPhoneSized = function (maxPhoneWidth) { return maxPhoneWidth < 0 ? undefined : impl.getDeviceSmallerSide() <= maxPhoneWidth; }; } else { MobileDetect.isPhoneSized = function () {}; } // should not be replaced by a completely new object - just overwrite existing methods MobileDetect._impl = impl; MobileDetect.version = '1.3.3 2016-07-31'; return MobileDetect;}); // end of call of define()} : (define: any, undefined?: any) => void > : ^ ^^^^^^^ ^^^^^^^^^^^^^^^ >define : any > : ^^^ @@ -19,11 +19,11 @@ Type Count: 1,000 > : ^^^ define(function () { ->define(function () { 'use strict'; var impl = {}; impl.mobileDetectRules = { "phones": { "iPhone": "\\biPhone\\b|\\biPod\\b", "BlackBerry": "BlackBerry|\\bBB10\\b|rim[0-9]+", "HTC": "HTC|HTC.*(Sensation|Evo|Vision|Explorer|6800|8100|8900|A7272|S510e|C110e|Legend|Desire|T8282)|APX515CKT|Qtek9090|APA9292KT|HD_mini|Sensation.*Z710e|PG86100|Z715e|Desire.*(A8181|HD)|ADR6200|ADR6400L|ADR6425|001HT|Inspire 4G|Android.*\\bEVO\\b|T-Mobile G1|Z520m", "Nexus": "Nexus One|Nexus S|Galaxy.*Nexus|Android.*Nexus.*Mobile|Nexus 4|Nexus 5|Nexus 6", "Dell": "Dell.*Streak|Dell.*Aero|Dell.*Venue|DELL.*Venue Pro|Dell Flash|Dell Smoke|Dell Mini 3iX|XCD28|XCD35|\\b001DL\\b|\\b101DL\\b|\\bGS01\\b", "Motorola": "Motorola|DROIDX|DROID BIONIC|\\bDroid\\b.*Build|Android.*Xoom|HRI39|MOT-|A1260|A1680|A555|A853|A855|A953|A955|A956|Motorola.*ELECTRIFY|Motorola.*i1|i867|i940|MB200|MB300|MB501|MB502|MB508|MB511|MB520|MB525|MB526|MB611|MB612|MB632|MB810|MB855|MB860|MB861|MB865|MB870|ME501|ME502|ME511|ME525|ME600|ME632|ME722|ME811|ME860|ME863|ME865|MT620|MT710|MT716|MT720|MT810|MT870|MT917|Motorola.*TITANIUM|WX435|WX445|XT300|XT301|XT311|XT316|XT317|XT319|XT320|XT390|XT502|XT530|XT531|XT532|XT535|XT603|XT610|XT611|XT615|XT681|XT701|XT702|XT711|XT720|XT800|XT806|XT860|XT862|XT875|XT882|XT883|XT894|XT901|XT907|XT909|XT910|XT912|XT928|XT926|XT915|XT919|XT925|XT1021|\\bMoto E\\b", "Samsung": "Samsung|SM-G9250|GT-19300|SGH-I337|BGT-S5230|GT-B2100|GT-B2700|GT-B2710|GT-B3210|GT-B3310|GT-B3410|GT-B3730|GT-B3740|GT-B5510|GT-B5512|GT-B5722|GT-B6520|GT-B7300|GT-B7320|GT-B7330|GT-B7350|GT-B7510|GT-B7722|GT-B7800|GT-C3010|GT-C3011|GT-C3060|GT-C3200|GT-C3212|GT-C3212I|GT-C3262|GT-C3222|GT-C3300|GT-C3300K|GT-C3303|GT-C3303K|GT-C3310|GT-C3322|GT-C3330|GT-C3350|GT-C3500|GT-C3510|GT-C3530|GT-C3630|GT-C3780|GT-C5010|GT-C5212|GT-C6620|GT-C6625|GT-C6712|GT-E1050|GT-E1070|GT-E1075|GT-E1080|GT-E1081|GT-E1085|GT-E1087|GT-E1100|GT-E1107|GT-E1110|GT-E1120|GT-E1125|GT-E1130|GT-E1160|GT-E1170|GT-E1175|GT-E1180|GT-E1182|GT-E1200|GT-E1210|GT-E1225|GT-E1230|GT-E1390|GT-E2100|GT-E2120|GT-E2121|GT-E2152|GT-E2220|GT-E2222|GT-E2230|GT-E2232|GT-E2250|GT-E2370|GT-E2550|GT-E2652|GT-E3210|GT-E3213|GT-I5500|GT-I5503|GT-I5700|GT-I5800|GT-I5801|GT-I6410|GT-I6420|GT-I7110|GT-I7410|GT-I7500|GT-I8000|GT-I8150|GT-I8160|GT-I8190|GT-I8320|GT-I8330|GT-I8350|GT-I8530|GT-I8700|GT-I8703|GT-I8910|GT-I9000|GT-I9001|GT-I9003|GT-I9010|GT-I9020|GT-I9023|GT-I9070|GT-I9082|GT-I9100|GT-I9103|GT-I9220|GT-I9250|GT-I9300|GT-I9305|GT-I9500|GT-I9505|GT-M3510|GT-M5650|GT-M7500|GT-M7600|GT-M7603|GT-M8800|GT-M8910|GT-N7000|GT-S3110|GT-S3310|GT-S3350|GT-S3353|GT-S3370|GT-S3650|GT-S3653|GT-S3770|GT-S3850|GT-S5210|GT-S5220|GT-S5229|GT-S5230|GT-S5233|GT-S5250|GT-S5253|GT-S5260|GT-S5263|GT-S5270|GT-S5300|GT-S5330|GT-S5350|GT-S5360|GT-S5363|GT-S5369|GT-S5380|GT-S5380D|GT-S5560|GT-S5570|GT-S5600|GT-S5603|GT-S5610|GT-S5620|GT-S5660|GT-S5670|GT-S5690|GT-S5750|GT-S5780|GT-S5830|GT-S5839|GT-S6102|GT-S6500|GT-S7070|GT-S7200|GT-S7220|GT-S7230|GT-S7233|GT-S7250|GT-S7500|GT-S7530|GT-S7550|GT-S7562|GT-S7710|GT-S8000|GT-S8003|GT-S8500|GT-S8530|GT-S8600|SCH-A310|SCH-A530|SCH-A570|SCH-A610|SCH-A630|SCH-A650|SCH-A790|SCH-A795|SCH-A850|SCH-A870|SCH-A890|SCH-A930|SCH-A950|SCH-A970|SCH-A990|SCH-I100|SCH-I110|SCH-I400|SCH-I405|SCH-I500|SCH-I510|SCH-I515|SCH-I600|SCH-I730|SCH-I760|SCH-I770|SCH-I830|SCH-I910|SCH-I920|SCH-I959|SCH-LC11|SCH-N150|SCH-N300|SCH-R100|SCH-R300|SCH-R351|SCH-R400|SCH-R410|SCH-T300|SCH-U310|SCH-U320|SCH-U350|SCH-U360|SCH-U365|SCH-U370|SCH-U380|SCH-U410|SCH-U430|SCH-U450|SCH-U460|SCH-U470|SCH-U490|SCH-U540|SCH-U550|SCH-U620|SCH-U640|SCH-U650|SCH-U660|SCH-U700|SCH-U740|SCH-U750|SCH-U810|SCH-U820|SCH-U900|SCH-U940|SCH-U960|SCS-26UC|SGH-A107|SGH-A117|SGH-A127|SGH-A137|SGH-A157|SGH-A167|SGH-A177|SGH-A187|SGH-A197|SGH-A227|SGH-A237|SGH-A257|SGH-A437|SGH-A517|SGH-A597|SGH-A637|SGH-A657|SGH-A667|SGH-A687|SGH-A697|SGH-A707|SGH-A717|SGH-A727|SGH-A737|SGH-A747|SGH-A767|SGH-A777|SGH-A797|SGH-A817|SGH-A827|SGH-A837|SGH-A847|SGH-A867|SGH-A877|SGH-A887|SGH-A897|SGH-A927|SGH-B100|SGH-B130|SGH-B200|SGH-B220|SGH-C100|SGH-C110|SGH-C120|SGH-C130|SGH-C140|SGH-C160|SGH-C170|SGH-C180|SGH-C200|SGH-C207|SGH-C210|SGH-C225|SGH-C230|SGH-C417|SGH-C450|SGH-D307|SGH-D347|SGH-D357|SGH-D407|SGH-D415|SGH-D780|SGH-D807|SGH-D980|SGH-E105|SGH-E200|SGH-E315|SGH-E316|SGH-E317|SGH-E335|SGH-E590|SGH-E635|SGH-E715|SGH-E890|SGH-F300|SGH-F480|SGH-I200|SGH-I300|SGH-I320|SGH-I550|SGH-I577|SGH-I600|SGH-I607|SGH-I617|SGH-I627|SGH-I637|SGH-I677|SGH-I700|SGH-I717|SGH-I727|SGH-i747M|SGH-I777|SGH-I780|SGH-I827|SGH-I847|SGH-I857|SGH-I896|SGH-I897|SGH-I900|SGH-I907|SGH-I917|SGH-I927|SGH-I937|SGH-I997|SGH-J150|SGH-J200|SGH-L170|SGH-L700|SGH-M110|SGH-M150|SGH-M200|SGH-N105|SGH-N500|SGH-N600|SGH-N620|SGH-N625|SGH-N700|SGH-N710|SGH-P107|SGH-P207|SGH-P300|SGH-P310|SGH-P520|SGH-P735|SGH-P777|SGH-Q105|SGH-R210|SGH-R220|SGH-R225|SGH-S105|SGH-S307|SGH-T109|SGH-T119|SGH-T139|SGH-T209|SGH-T219|SGH-T229|SGH-T239|SGH-T249|SGH-T259|SGH-T309|SGH-T319|SGH-T329|SGH-T339|SGH-T349|SGH-T359|SGH-T369|SGH-T379|SGH-T409|SGH-T429|SGH-T439|SGH-T459|SGH-T469|SGH-T479|SGH-T499|SGH-T509|SGH-T519|SGH-T539|SGH-T559|SGH-T589|SGH-T609|SGH-T619|SGH-T629|SGH-T639|SGH-T659|SGH-T669|SGH-T679|SGH-T709|SGH-T719|SGH-T729|SGH-T739|SGH-T746|SGH-T749|SGH-T759|SGH-T769|SGH-T809|SGH-T819|SGH-T839|SGH-T919|SGH-T929|SGH-T939|SGH-T959|SGH-T989|SGH-U100|SGH-U200|SGH-U800|SGH-V205|SGH-V206|SGH-X100|SGH-X105|SGH-X120|SGH-X140|SGH-X426|SGH-X427|SGH-X475|SGH-X495|SGH-X497|SGH-X507|SGH-X600|SGH-X610|SGH-X620|SGH-X630|SGH-X700|SGH-X820|SGH-X890|SGH-Z130|SGH-Z150|SGH-Z170|SGH-ZX10|SGH-ZX20|SHW-M110|SPH-A120|SPH-A400|SPH-A420|SPH-A460|SPH-A500|SPH-A560|SPH-A600|SPH-A620|SPH-A660|SPH-A700|SPH-A740|SPH-A760|SPH-A790|SPH-A800|SPH-A820|SPH-A840|SPH-A880|SPH-A900|SPH-A940|SPH-A960|SPH-D600|SPH-D700|SPH-D710|SPH-D720|SPH-I300|SPH-I325|SPH-I330|SPH-I350|SPH-I500|SPH-I600|SPH-I700|SPH-L700|SPH-M100|SPH-M220|SPH-M240|SPH-M300|SPH-M305|SPH-M320|SPH-M330|SPH-M350|SPH-M360|SPH-M370|SPH-M380|SPH-M510|SPH-M540|SPH-M550|SPH-M560|SPH-M570|SPH-M580|SPH-M610|SPH-M620|SPH-M630|SPH-M800|SPH-M810|SPH-M850|SPH-M900|SPH-M910|SPH-M920|SPH-M930|SPH-N100|SPH-N200|SPH-N240|SPH-N300|SPH-N400|SPH-Z400|SWC-E100|SCH-i909|GT-N7100|GT-N7105|SCH-I535|SM-N900A|SGH-I317|SGH-T999L|GT-S5360B|GT-I8262|GT-S6802|GT-S6312|GT-S6310|GT-S5312|GT-S5310|GT-I9105|GT-I8510|GT-S6790N|SM-G7105|SM-N9005|GT-S5301|GT-I9295|GT-I9195|SM-C101|GT-S7392|GT-S7560|GT-B7610|GT-I5510|GT-S7582|GT-S7530E|GT-I8750|SM-G9006V|SM-G9008V|SM-G9009D|SM-G900A|SM-G900D|SM-G900F|SM-G900H|SM-G900I|SM-G900J|SM-G900K|SM-G900L|SM-G900M|SM-G900P|SM-G900R4|SM-G900S|SM-G900T|SM-G900V|SM-G900W8|SHV-E160K|SCH-P709|SCH-P729|SM-T2558|GT-I9205|SM-G9350|SM-J120F", "LG": "\\bLG\\b;|LG[- ]?(C800|C900|E400|E610|E900|E-900|F160|F180K|F180L|F180S|730|855|L160|LS740|LS840|LS970|LU6200|MS690|MS695|MS770|MS840|MS870|MS910|P500|P700|P705|VM696|AS680|AS695|AX840|C729|E970|GS505|272|C395|E739BK|E960|L55C|L75C|LS696|LS860|P769BK|P350|P500|P509|P870|UN272|US730|VS840|VS950|LN272|LN510|LS670|LS855|LW690|MN270|MN510|P509|P769|P930|UN200|UN270|UN510|UN610|US670|US740|US760|UX265|UX840|VN271|VN530|VS660|VS700|VS740|VS750|VS910|VS920|VS930|VX9200|VX11000|AX840A|LW770|P506|P925|P999|E612|D955|D802|MS323)", "Sony": "SonyST|SonyLT|SonyEricsson|SonyEricssonLT15iv|LT18i|E10i|LT28h|LT26w|SonyEricssonMT27i|C5303|C6902|C6903|C6906|C6943|D2533", "Asus": "Asus.*Galaxy|PadFone.*Mobile", "NokiaLumia": "Lumia [0-9]{3,4}", "Micromax": "Micromax.*\\b(A210|A92|A88|A72|A111|A110Q|A115|A116|A110|A90S|A26|A51|A35|A54|A25|A27|A89|A68|A65|A57|A90)\\b", "Palm": "PalmSource|Palm", "Vertu": "Vertu|Vertu.*Ltd|Vertu.*Ascent|Vertu.*Ayxta|Vertu.*Constellation(F|Quest)?|Vertu.*Monika|Vertu.*Signature", "Pantech": "PANTECH|IM-A850S|IM-A840S|IM-A830L|IM-A830K|IM-A830S|IM-A820L|IM-A810K|IM-A810S|IM-A800S|IM-T100K|IM-A725L|IM-A780L|IM-A775C|IM-A770K|IM-A760S|IM-A750K|IM-A740S|IM-A730S|IM-A720L|IM-A710K|IM-A690L|IM-A690S|IM-A650S|IM-A630K|IM-A600S|VEGA PTL21|PT003|P8010|ADR910L|P6030|P6020|P9070|P4100|P9060|P5000|CDM8992|TXT8045|ADR8995|IS11PT|P2030|P6010|P8000|PT002|IS06|CDM8999|P9050|PT001|TXT8040|P2020|P9020|P2000|P7040|P7000|C790", "Fly": "IQ230|IQ444|IQ450|IQ440|IQ442|IQ441|IQ245|IQ256|IQ236|IQ255|IQ235|IQ245|IQ275|IQ240|IQ285|IQ280|IQ270|IQ260|IQ250", "Wiko": "KITE 4G|HIGHWAY|GETAWAY|STAIRWAY|DARKSIDE|DARKFULL|DARKNIGHT|DARKMOON|SLIDE|WAX 4G|RAINBOW|BLOOM|SUNSET|GOA(?!nna)|LENNY|BARRY|IGGY|OZZY|CINK FIVE|CINK PEAX|CINK PEAX 2|CINK SLIM|CINK SLIM 2|CINK +|CINK KING|CINK PEAX|CINK SLIM|SUBLIM", "iMobile": "i-mobile (IQ|i-STYLE|idea|ZAA|Hitz)", "SimValley": "\\b(SP-80|XT-930|SX-340|XT-930|SX-310|SP-360|SP60|SPT-800|SP-120|SPT-800|SP-140|SPX-5|SPX-8|SP-100|SPX-8|SPX-12)\\b", "Wolfgang": "AT-B24D|AT-AS50HD|AT-AS40W|AT-AS55HD|AT-AS45q2|AT-B26D|AT-AS50Q", "Alcatel": "Alcatel", "Nintendo": "Nintendo 3DS", "Amoi": "Amoi", "INQ": "INQ", "GenericPhone": "Tapatalk|PDA;|SAGEM|\\bmmp\\b|pocket|\\bpsp\\b|symbian|Smartphone|smartfon|treo|up.browser|up.link|vodafone|\\bwap\\b|nokia|Series40|Series60|S60|SonyEricsson|N900|MAUI.*WAP.*Browser" }, "tablets": { "iPad": "iPad|iPad.*Mobile", "NexusTablet": "Android.*Nexus[\\s]+(7|9|10)", "SamsungTablet": "SAMSUNG.*Tablet|Galaxy.*Tab|SC-01C|GT-P1000|GT-P1003|GT-P1010|GT-P3105|GT-P6210|GT-P6800|GT-P6810|GT-P7100|GT-P7300|GT-P7310|GT-P7500|GT-P7510|SCH-I800|SCH-I815|SCH-I905|SGH-I957|SGH-I987|SGH-T849|SGH-T859|SGH-T869|SPH-P100|GT-P3100|GT-P3108|GT-P3110|GT-P5100|GT-P5110|GT-P6200|GT-P7320|GT-P7511|GT-N8000|GT-P8510|SGH-I497|SPH-P500|SGH-T779|SCH-I705|SCH-I915|GT-N8013|GT-P3113|GT-P5113|GT-P8110|GT-N8010|GT-N8005|GT-N8020|GT-P1013|GT-P6201|GT-P7501|GT-N5100|GT-N5105|GT-N5110|SHV-E140K|SHV-E140L|SHV-E140S|SHV-E150S|SHV-E230K|SHV-E230L|SHV-E230S|SHW-M180K|SHW-M180L|SHW-M180S|SHW-M180W|SHW-M300W|SHW-M305W|SHW-M380K|SHW-M380S|SHW-M380W|SHW-M430W|SHW-M480K|SHW-M480S|SHW-M480W|SHW-M485W|SHW-M486W|SHW-M500W|GT-I9228|SCH-P739|SCH-I925|GT-I9200|GT-P5200|GT-P5210|GT-P5210X|SM-T311|SM-T310|SM-T310X|SM-T210|SM-T210R|SM-T211|SM-P600|SM-P601|SM-P605|SM-P900|SM-P901|SM-T217|SM-T217A|SM-T217S|SM-P6000|SM-T3100|SGH-I467|XE500|SM-T110|GT-P5220|GT-I9200X|GT-N5110X|GT-N5120|SM-P905|SM-T111|SM-T2105|SM-T315|SM-T320|SM-T320X|SM-T321|SM-T520|SM-T525|SM-T530NU|SM-T230NU|SM-T330NU|SM-T900|XE500T1C|SM-P605V|SM-P905V|SM-T337V|SM-T537V|SM-T707V|SM-T807V|SM-P600X|SM-P900X|SM-T210X|SM-T230|SM-T230X|SM-T325|GT-P7503|SM-T531|SM-T330|SM-T530|SM-T705|SM-T705C|SM-T535|SM-T331|SM-T800|SM-T700|SM-T537|SM-T807|SM-P907A|SM-T337A|SM-T537A|SM-T707A|SM-T807A|SM-T237|SM-T807P|SM-P607T|SM-T217T|SM-T337T|SM-T807T|SM-T116NQ|SM-P550|SM-T350|SM-T550|SM-T9000|SM-P9000|SM-T705Y|SM-T805|GT-P3113|SM-T710|SM-T810|SM-T815|SM-T360|SM-T533|SM-T113|SM-T335|SM-T715|SM-T560|SM-T670|SM-T677|SM-T377|SM-T567|SM-T357T|SM-T555|SM-T561", "Kindle": "Kindle|Silk.*Accelerated|Android.*\\b(KFOT|KFTT|KFJWI|KFJWA|KFOTE|KFSOWI|KFTHWI|KFTHWA|KFAPWI|KFAPWA|WFJWAE|KFSAWA|KFSAWI|KFASWI|KFARWI)\\b", "SurfaceTablet": "Windows NT [0-9.]+; ARM;.*(Tablet|ARMBJS)", "HPTablet": "HP Slate (7|8|10)|HP ElitePad 900|hp-tablet|EliteBook.*Touch|HP 8|Slate 21|HP SlateBook 10", "AsusTablet": "^.*PadFone((?!Mobile).)*$|Transformer|TF101|TF101G|TF300T|TF300TG|TF300TL|TF700T|TF700KL|TF701T|TF810C|ME171|ME301T|ME302C|ME371MG|ME370T|ME372MG|ME172V|ME173X|ME400C|Slider SL101|\\bK00F\\b|\\bK00C\\b|\\bK00E\\b|\\bK00L\\b|TX201LA|ME176C|ME102A|\\bM80TA\\b|ME372CL|ME560CG|ME372CG|ME302KL| K010 | K017 |ME572C|ME103K|ME170C|ME171C|\\bME70C\\b|ME581C|ME581CL|ME8510C|ME181C|P01Y|PO1MA", "BlackBerryTablet": "PlayBook|RIM Tablet", "HTCtablet": "HTC_Flyer_P512|HTC Flyer|HTC Jetstream|HTC-P715a|HTC EVO View 4G|PG41200|PG09410", "MotorolaTablet": "xoom|sholest|MZ615|MZ605|MZ505|MZ601|MZ602|MZ603|MZ604|MZ606|MZ607|MZ608|MZ609|MZ615|MZ616|MZ617", "NookTablet": "Android.*Nook|NookColor|nook browser|BNRV200|BNRV200A|BNTV250|BNTV250A|BNTV400|BNTV600|LogicPD Zoom2", "AcerTablet": "Android.*; \\b(A100|A101|A110|A200|A210|A211|A500|A501|A510|A511|A700|A701|W500|W500P|W501|W501P|W510|W511|W700|G100|G100W|B1-A71|B1-710|B1-711|A1-810|A1-811|A1-830)\\b|W3-810|\\bA3-A10\\b|\\bA3-A11\\b|\\bA3-A20", "ToshibaTablet": "Android.*(AT100|AT105|AT200|AT205|AT270|AT275|AT300|AT305|AT1S5|AT500|AT570|AT700|AT830)|TOSHIBA.*FOLIO", "LGTablet": "\\bL-06C|LG-V909|LG-V900|LG-V700|LG-V510|LG-V500|LG-V410|LG-V400|LG-VK810\\b", "FujitsuTablet": "Android.*\\b(F-01D|F-02F|F-05E|F-10D|M532|Q572)\\b", "PrestigioTablet": "PMP3170B|PMP3270B|PMP3470B|PMP7170B|PMP3370B|PMP3570C|PMP5870C|PMP3670B|PMP5570C|PMP5770D|PMP3970B|PMP3870C|PMP5580C|PMP5880D|PMP5780D|PMP5588C|PMP7280C|PMP7280C3G|PMP7280|PMP7880D|PMP5597D|PMP5597|PMP7100D|PER3464|PER3274|PER3574|PER3884|PER5274|PER5474|PMP5097CPRO|PMP5097|PMP7380D|PMP5297C|PMP5297C_QUAD|PMP812E|PMP812E3G|PMP812F|PMP810E|PMP880TD|PMT3017|PMT3037|PMT3047|PMT3057|PMT7008|PMT5887|PMT5001|PMT5002", "LenovoTablet": "Lenovo TAB|Idea(Tab|Pad)( A1|A10| K1|)|ThinkPad([ ]+)?Tablet|YT3-X90L|YT3-X90F|YT3-X90X|Lenovo.*(S2109|S2110|S5000|S6000|K3011|A3000|A3500|A1000|A2107|A2109|A1107|A5500|A7600|B6000|B8000|B8080)(-|)(FL|F|HV|H|)", "DellTablet": "Venue 11|Venue 8|Venue 7|Dell Streak 10|Dell Streak 7", "YarvikTablet": "Android.*\\b(TAB210|TAB211|TAB224|TAB250|TAB260|TAB264|TAB310|TAB360|TAB364|TAB410|TAB411|TAB420|TAB424|TAB450|TAB460|TAB461|TAB464|TAB465|TAB467|TAB468|TAB07-100|TAB07-101|TAB07-150|TAB07-151|TAB07-152|TAB07-200|TAB07-201-3G|TAB07-210|TAB07-211|TAB07-212|TAB07-214|TAB07-220|TAB07-400|TAB07-485|TAB08-150|TAB08-200|TAB08-201-3G|TAB08-201-30|TAB09-100|TAB09-211|TAB09-410|TAB10-150|TAB10-201|TAB10-211|TAB10-400|TAB10-410|TAB13-201|TAB274EUK|TAB275EUK|TAB374EUK|TAB462EUK|TAB474EUK|TAB9-200)\\b", "MedionTablet": "Android.*\\bOYO\\b|LIFE.*(P9212|P9514|P9516|S9512)|LIFETAB", "ArnovaTablet": "AN10G2|AN7bG3|AN7fG3|AN8G3|AN8cG3|AN7G3|AN9G3|AN7dG3|AN7dG3ST|AN7dG3ChildPad|AN10bG3|AN10bG3DT|AN9G2", "IntensoTablet": "INM8002KP|INM1010FP|INM805ND|Intenso Tab|TAB1004", "IRUTablet": "M702pro", "MegafonTablet": "MegaFon V9|\\bZTE V9\\b|Android.*\\bMT7A\\b", "EbodaTablet": "E-Boda (Supreme|Impresspeed|Izzycomm|Essential)", "AllViewTablet": "Allview.*(Viva|Alldro|City|Speed|All TV|Frenzy|Quasar|Shine|TX1|AX1|AX2)", "ArchosTablet": "\\b(101G9|80G9|A101IT)\\b|Qilive 97R|Archos5|\\bARCHOS (70|79|80|90|97|101|FAMILYPAD|)(b|)(G10| Cobalt| TITANIUM(HD|)| Xenon| Neon|XSK| 2| XS 2| PLATINUM| CARBON|GAMEPAD)\\b", "AinolTablet": "NOVO7|NOVO8|NOVO10|Novo7Aurora|Novo7Basic|NOVO7PALADIN|novo9-Spark", "NokiaLumiaTablet": "Lumia 2520", "SonyTablet": "Sony.*Tablet|Xperia Tablet|Sony Tablet S|SO-03E|SGPT12|SGPT13|SGPT114|SGPT121|SGPT122|SGPT123|SGPT111|SGPT112|SGPT113|SGPT131|SGPT132|SGPT133|SGPT211|SGPT212|SGPT213|SGP311|SGP312|SGP321|EBRD1101|EBRD1102|EBRD1201|SGP351|SGP341|SGP511|SGP512|SGP521|SGP541|SGP551|SGP621|SGP612|SOT31", "PhilipsTablet": "\\b(PI2010|PI3000|PI3100|PI3105|PI3110|PI3205|PI3210|PI3900|PI4010|PI7000|PI7100)\\b", "CubeTablet": "Android.*(K8GT|U9GT|U10GT|U16GT|U17GT|U18GT|U19GT|U20GT|U23GT|U30GT)|CUBE U8GT", "CobyTablet": "MID1042|MID1045|MID1125|MID1126|MID7012|MID7014|MID7015|MID7034|MID7035|MID7036|MID7042|MID7048|MID7127|MID8042|MID8048|MID8127|MID9042|MID9740|MID9742|MID7022|MID7010", "MIDTablet": "M9701|M9000|M9100|M806|M1052|M806|T703|MID701|MID713|MID710|MID727|MID760|MID830|MID728|MID933|MID125|MID810|MID732|MID120|MID930|MID800|MID731|MID900|MID100|MID820|MID735|MID980|MID130|MID833|MID737|MID960|MID135|MID860|MID736|MID140|MID930|MID835|MID733|MID4X10", "MSITablet": "MSI \\b(Primo 73K|Primo 73L|Primo 81L|Primo 77|Primo 93|Primo 75|Primo 76|Primo 73|Primo 81|Primo 91|Primo 90|Enjoy 71|Enjoy 7|Enjoy 10)\\b", "SMiTTablet": "Android.*(\\bMID\\b|MID-560|MTV-T1200|MTV-PND531|MTV-P1101|MTV-PND530)", "RockChipTablet": "Android.*(RK2818|RK2808A|RK2918|RK3066)|RK2738|RK2808A", "FlyTablet": "IQ310|Fly Vision", "bqTablet": "Android.*(bq)?.*(Elcano|Curie|Edison|Maxwell|Kepler|Pascal|Tesla|Hypatia|Platon|Newton|Livingstone|Cervantes|Avant|Aquaris E10)|Maxwell.*Lite|Maxwell.*Plus", "HuaweiTablet": "MediaPad|MediaPad 7 Youth|IDEOS S7|S7-201c|S7-202u|S7-101|S7-103|S7-104|S7-105|S7-106|S7-201|S7-Slim", "NecTablet": "\\bN-06D|\\bN-08D", "PantechTablet": "Pantech.*P4100", "BronchoTablet": "Broncho.*(N701|N708|N802|a710)", "VersusTablet": "TOUCHPAD.*[78910]|\\bTOUCHTAB\\b", "ZyncTablet": "z1000|Z99 2G|z99|z930|z999|z990|z909|Z919|z900", "PositivoTablet": "TB07STA|TB10STA|TB07FTA|TB10FTA", "NabiTablet": "Android.*\\bNabi", "KoboTablet": "Kobo Touch|\\bK080\\b|\\bVox\\b Build|\\bArc\\b Build", "DanewTablet": "DSlide.*\\b(700|701R|702|703R|704|802|970|971|972|973|974|1010|1012)\\b", "TexetTablet": "NaviPad|TB-772A|TM-7045|TM-7055|TM-9750|TM-7016|TM-7024|TM-7026|TM-7041|TM-7043|TM-7047|TM-8041|TM-9741|TM-9747|TM-9748|TM-9751|TM-7022|TM-7021|TM-7020|TM-7011|TM-7010|TM-7023|TM-7025|TM-7037W|TM-7038W|TM-7027W|TM-9720|TM-9725|TM-9737W|TM-1020|TM-9738W|TM-9740|TM-9743W|TB-807A|TB-771A|TB-727A|TB-725A|TB-719A|TB-823A|TB-805A|TB-723A|TB-715A|TB-707A|TB-705A|TB-709A|TB-711A|TB-890HD|TB-880HD|TB-790HD|TB-780HD|TB-770HD|TB-721HD|TB-710HD|TB-434HD|TB-860HD|TB-840HD|TB-760HD|TB-750HD|TB-740HD|TB-730HD|TB-722HD|TB-720HD|TB-700HD|TB-500HD|TB-470HD|TB-431HD|TB-430HD|TB-506|TB-504|TB-446|TB-436|TB-416|TB-146SE|TB-126SE", "PlaystationTablet": "Playstation.*(Portable|Vita)", "TrekstorTablet": "ST10416-1|VT10416-1|ST70408-1|ST702xx-1|ST702xx-2|ST80208|ST97216|ST70104-2|VT10416-2|ST10216-2A|SurfTab", "PyleAudioTablet": "\\b(PTBL10CEU|PTBL10C|PTBL72BC|PTBL72BCEU|PTBL7CEU|PTBL7C|PTBL92BC|PTBL92BCEU|PTBL9CEU|PTBL9CUK|PTBL9C)\\b", "AdvanTablet": "Android.* \\b(E3A|T3X|T5C|T5B|T3E|T3C|T3B|T1J|T1F|T2A|T1H|T1i|E1C|T1-E|T5-A|T4|E1-B|T2Ci|T1-B|T1-D|O1-A|E1-A|T1-A|T3A|T4i)\\b ", "DanyTechTablet": "Genius Tab G3|Genius Tab S2|Genius Tab Q3|Genius Tab G4|Genius Tab Q4|Genius Tab G-II|Genius TAB GII|Genius TAB GIII|Genius Tab S1", "GalapadTablet": "Android.*\\bG1\\b", "MicromaxTablet": "Funbook|Micromax.*\\b(P250|P560|P360|P362|P600|P300|P350|P500|P275)\\b", "KarbonnTablet": "Android.*\\b(A39|A37|A34|ST8|ST10|ST7|Smart Tab3|Smart Tab2)\\b", "AllFineTablet": "Fine7 Genius|Fine7 Shine|Fine7 Air|Fine8 Style|Fine9 More|Fine10 Joy|Fine11 Wide", "PROSCANTablet": "\\b(PEM63|PLT1023G|PLT1041|PLT1044|PLT1044G|PLT1091|PLT4311|PLT4311PL|PLT4315|PLT7030|PLT7033|PLT7033D|PLT7035|PLT7035D|PLT7044K|PLT7045K|PLT7045KB|PLT7071KG|PLT7072|PLT7223G|PLT7225G|PLT7777G|PLT7810K|PLT7849G|PLT7851G|PLT7852G|PLT8015|PLT8031|PLT8034|PLT8036|PLT8080K|PLT8082|PLT8088|PLT8223G|PLT8234G|PLT8235G|PLT8816K|PLT9011|PLT9045K|PLT9233G|PLT9735|PLT9760G|PLT9770G)\\b", "YONESTablet": "BQ1078|BC1003|BC1077|RK9702|BC9730|BC9001|IT9001|BC7008|BC7010|BC708|BC728|BC7012|BC7030|BC7027|BC7026", "ChangJiaTablet": "TPC7102|TPC7103|TPC7105|TPC7106|TPC7107|TPC7201|TPC7203|TPC7205|TPC7210|TPC7708|TPC7709|TPC7712|TPC7110|TPC8101|TPC8103|TPC8105|TPC8106|TPC8203|TPC8205|TPC8503|TPC9106|TPC9701|TPC97101|TPC97103|TPC97105|TPC97106|TPC97111|TPC97113|TPC97203|TPC97603|TPC97809|TPC97205|TPC10101|TPC10103|TPC10106|TPC10111|TPC10203|TPC10205|TPC10503", "GUTablet": "TX-A1301|TX-M9002|Q702|kf026", "PointOfViewTablet": "TAB-P506|TAB-navi-7-3G-M|TAB-P517|TAB-P-527|TAB-P701|TAB-P703|TAB-P721|TAB-P731N|TAB-P741|TAB-P825|TAB-P905|TAB-P925|TAB-PR945|TAB-PL1015|TAB-P1025|TAB-PI1045|TAB-P1325|TAB-PROTAB[0-9]+|TAB-PROTAB25|TAB-PROTAB26|TAB-PROTAB27|TAB-PROTAB26XL|TAB-PROTAB2-IPS9|TAB-PROTAB30-IPS9|TAB-PROTAB25XXL|TAB-PROTAB26-IPS10|TAB-PROTAB30-IPS10", "OvermaxTablet": "OV-(SteelCore|NewBase|Basecore|Baseone|Exellen|Quattor|EduTab|Solution|ACTION|BasicTab|TeddyTab|MagicTab|Stream|TB-08|TB-09)", "HCLTablet": "HCL.*Tablet|Connect-3G-2.0|Connect-2G-2.0|ME Tablet U1|ME Tablet U2|ME Tablet G1|ME Tablet X1|ME Tablet Y2|ME Tablet Sync", "DPSTablet": "DPS Dream 9|DPS Dual 7", "VistureTablet": "V97 HD|i75 3G|Visture V4( HD)?|Visture V5( HD)?|Visture V10", "CrestaTablet": "CTP(-)?810|CTP(-)?818|CTP(-)?828|CTP(-)?838|CTP(-)?888|CTP(-)?978|CTP(-)?980|CTP(-)?987|CTP(-)?988|CTP(-)?989", "MediatekTablet": "\\bMT8125|MT8389|MT8135|MT8377\\b", "ConcordeTablet": "Concorde([ ]+)?Tab|ConCorde ReadMan", "GoCleverTablet": "GOCLEVER TAB|A7GOCLEVER|M1042|M7841|M742|R1042BK|R1041|TAB A975|TAB A7842|TAB A741|TAB A741L|TAB M723G|TAB M721|TAB A1021|TAB I921|TAB R721|TAB I720|TAB T76|TAB R70|TAB R76.2|TAB R106|TAB R83.2|TAB M813G|TAB I721|GCTA722|TAB I70|TAB I71|TAB S73|TAB R73|TAB R74|TAB R93|TAB R75|TAB R76.1|TAB A73|TAB A93|TAB A93.2|TAB T72|TAB R83|TAB R974|TAB R973|TAB A101|TAB A103|TAB A104|TAB A104.2|R105BK|M713G|A972BK|TAB A971|TAB R974.2|TAB R104|TAB R83.3|TAB A1042", "ModecomTablet": "FreeTAB 9000|FreeTAB 7.4|FreeTAB 7004|FreeTAB 7800|FreeTAB 2096|FreeTAB 7.5|FreeTAB 1014|FreeTAB 1001 |FreeTAB 8001|FreeTAB 9706|FreeTAB 9702|FreeTAB 7003|FreeTAB 7002|FreeTAB 1002|FreeTAB 7801|FreeTAB 1331|FreeTAB 1004|FreeTAB 8002|FreeTAB 8014|FreeTAB 9704|FreeTAB 1003", "VoninoTablet": "\\b(Argus[ _]?S|Diamond[ _]?79HD|Emerald[ _]?78E|Luna[ _]?70C|Onyx[ _]?S|Onyx[ _]?Z|Orin[ _]?HD|Orin[ _]?S|Otis[ _]?S|SpeedStar[ _]?S|Magnet[ _]?M9|Primus[ _]?94[ _]?3G|Primus[ _]?94HD|Primus[ _]?QS|Android.*\\bQ8\\b|Sirius[ _]?EVO[ _]?QS|Sirius[ _]?QS|Spirit[ _]?S)\\b", "ECSTablet": "V07OT2|TM105A|S10OT1|TR10CS1", "StorexTablet": "eZee[_']?(Tab|Go)[0-9]+|TabLC7|Looney Tunes Tab", "VodafoneTablet": "SmartTab([ ]+)?[0-9]+|SmartTabII10|SmartTabII7|VF-1497", "EssentielBTablet": "Smart[ ']?TAB[ ]+?[0-9]+|Family[ ']?TAB2", "RossMoorTablet": "RM-790|RM-997|RMD-878G|RMD-974R|RMT-705A|RMT-701|RME-601|RMT-501|RMT-711", "iMobileTablet": "i-mobile i-note", "TolinoTablet": "tolino tab [0-9.]+|tolino shine", "AudioSonicTablet": "\\bC-22Q|T7-QC|T-17B|T-17P\\b", "AMPETablet": "Android.* A78 ", "SkkTablet": "Android.* (SKYPAD|PHOENIX|CYCLOPS)", "TecnoTablet": "TECNO P9", "JXDTablet": "Android.* \\b(F3000|A3300|JXD5000|JXD3000|JXD2000|JXD300B|JXD300|S5800|S7800|S602b|S5110b|S7300|S5300|S602|S603|S5100|S5110|S601|S7100a|P3000F|P3000s|P101|P200s|P1000m|P200m|P9100|P1000s|S6600b|S908|P1000|P300|S18|S6600|S9100)\\b", "iJoyTablet": "Tablet (Spirit 7|Essentia|Galatea|Fusion|Onix 7|Landa|Titan|Scooby|Deox|Stella|Themis|Argon|Unique 7|Sygnus|Hexen|Finity 7|Cream|Cream X2|Jade|Neon 7|Neron 7|Kandy|Scape|Saphyr 7|Rebel|Biox|Rebel|Rebel 8GB|Myst|Draco 7|Myst|Tab7-004|Myst|Tadeo Jones|Tablet Boing|Arrow|Draco Dual Cam|Aurix|Mint|Amity|Revolution|Finity 9|Neon 9|T9w|Amity 4GB Dual Cam|Stone 4GB|Stone 8GB|Andromeda|Silken|X2|Andromeda II|Halley|Flame|Saphyr 9,7|Touch 8|Planet|Triton|Unique 10|Hexen 10|Memphis 4GB|Memphis 8GB|Onix 10)", "FX2Tablet": "FX2 PAD7|FX2 PAD10", "XoroTablet": "KidsPAD 701|PAD[ ]?712|PAD[ ]?714|PAD[ ]?716|PAD[ ]?717|PAD[ ]?718|PAD[ ]?720|PAD[ ]?721|PAD[ ]?722|PAD[ ]?790|PAD[ ]?792|PAD[ ]?900|PAD[ ]?9715D|PAD[ ]?9716DR|PAD[ ]?9718DR|PAD[ ]?9719QR|PAD[ ]?9720QR|TelePAD1030|Telepad1032|TelePAD730|TelePAD731|TelePAD732|TelePAD735Q|TelePAD830|TelePAD9730|TelePAD795|MegaPAD 1331|MegaPAD 1851|MegaPAD 2151", "ViewsonicTablet": "ViewPad 10pi|ViewPad 10e|ViewPad 10s|ViewPad E72|ViewPad7|ViewPad E100|ViewPad 7e|ViewSonic VB733|VB100a", "OdysTablet": "LOOX|XENO10|ODYS[ -](Space|EVO|Xpress|NOON)|\\bXELIO\\b|Xelio10Pro|XELIO7PHONETAB|XELIO10EXTREME|XELIOPT2|NEO_QUAD10", "CaptivaTablet": "CAPTIVA PAD", "IconbitTablet": "NetTAB|NT-3702|NT-3702S|NT-3702S|NT-3603P|NT-3603P|NT-0704S|NT-0704S|NT-3805C|NT-3805C|NT-0806C|NT-0806C|NT-0909T|NT-0909T|NT-0907S|NT-0907S|NT-0902S|NT-0902S", "TeclastTablet": "T98 4G|\\bP80\\b|\\bX90HD\\b|X98 Air|X98 Air 3G|\\bX89\\b|P80 3G|\\bX80h\\b|P98 Air|\\bX89HD\\b|P98 3G|\\bP90HD\\b|P89 3G|X98 3G|\\bP70h\\b|P79HD 3G|G18d 3G|\\bP79HD\\b|\\bP89s\\b|\\bA88\\b|\\bP10HD\\b|\\bP19HD\\b|G18 3G|\\bP78HD\\b|\\bA78\\b|\\bP75\\b|G17s 3G|G17h 3G|\\bP85t\\b|\\bP90\\b|\\bP11\\b|\\bP98t\\b|\\bP98HD\\b|\\bG18d\\b|\\bP85s\\b|\\bP11HD\\b|\\bP88s\\b|\\bA80HD\\b|\\bA80se\\b|\\bA10h\\b|\\bP89\\b|\\bP78s\\b|\\bG18\\b|\\bP85\\b|\\bA70h\\b|\\bA70\\b|\\bG17\\b|\\bP18\\b|\\bA80s\\b|\\bA11s\\b|\\bP88HD\\b|\\bA80h\\b|\\bP76s\\b|\\bP76h\\b|\\bP98\\b|\\bA10HD\\b|\\bP78\\b|\\bP88\\b|\\bA11\\b|\\bA10t\\b|\\bP76a\\b|\\bP76t\\b|\\bP76e\\b|\\bP85HD\\b|\\bP85a\\b|\\bP86\\b|\\bP75HD\\b|\\bP76v\\b|\\bA12\\b|\\bP75a\\b|\\bA15\\b|\\bP76Ti\\b|\\bP81HD\\b|\\bA10\\b|\\bT760VE\\b|\\bT720HD\\b|\\bP76\\b|\\bP73\\b|\\bP71\\b|\\bP72\\b|\\bT720SE\\b|\\bC520Ti\\b|\\bT760\\b|\\bT720VE\\b|T720-3GE|T720-WiFi", "OndaTablet": "\\b(V975i|Vi30|VX530|V701|Vi60|V701s|Vi50|V801s|V719|Vx610w|VX610W|V819i|Vi10|VX580W|Vi10|V711s|V813|V811|V820w|V820|Vi20|V711|VI30W|V712|V891w|V972|V819w|V820w|Vi60|V820w|V711|V813s|V801|V819|V975s|V801|V819|V819|V818|V811|V712|V975m|V101w|V961w|V812|V818|V971|V971s|V919|V989|V116w|V102w|V973|Vi40)\\b[\\s]+", "JaytechTablet": "TPC-PA762", "BlaupunktTablet": "Endeavour 800NG|Endeavour 1010", "DigmaTablet": "\\b(iDx10|iDx9|iDx8|iDx7|iDxD7|iDxD8|iDsQ8|iDsQ7|iDsQ8|iDsD10|iDnD7|3TS804H|iDsQ11|iDj7|iDs10)\\b", "EvolioTablet": "ARIA_Mini_wifi|Aria[ _]Mini|Evolio X10|Evolio X7|Evolio X8|\\bEvotab\\b|\\bNeura\\b", "LavaTablet": "QPAD E704|\\bIvoryS\\b|E-TAB IVORY|\\bE-TAB\\b", "AocTablet": "MW0811|MW0812|MW0922|MTK8382|MW1031|MW0831|MW0821|MW0931|MW0712", "MpmanTablet": "MP11 OCTA|MP10 OCTA|MPQC1114|MPQC1004|MPQC994|MPQC974|MPQC973|MPQC804|MPQC784|MPQC780|\\bMPG7\\b|MPDCG75|MPDCG71|MPDC1006|MP101DC|MPDC9000|MPDC905|MPDC706HD|MPDC706|MPDC705|MPDC110|MPDC100|MPDC99|MPDC97|MPDC88|MPDC8|MPDC77|MP709|MID701|MID711|MID170|MPDC703|MPQC1010", "CelkonTablet": "CT695|CT888|CT[\\s]?910|CT7 Tab|CT9 Tab|CT3 Tab|CT2 Tab|CT1 Tab|C820|C720|\\bCT-1\\b", "WolderTablet": "miTab \\b(DIAMOND|SPACE|BROOKLYN|NEO|FLY|MANHATTAN|FUNK|EVOLUTION|SKY|GOCAR|IRON|GENIUS|POP|MINT|EPSILON|BROADWAY|JUMP|HOP|LEGEND|NEW AGE|LINE|ADVANCE|FEEL|FOLLOW|LIKE|LINK|LIVE|THINK|FREEDOM|CHICAGO|CLEVELAND|BALTIMORE-GH|IOWA|BOSTON|SEATTLE|PHOENIX|DALLAS|IN 101|MasterChef)\\b", "MiTablet": "\\bMI PAD\\b|\\bHM NOTE 1W\\b", "NibiruTablet": "Nibiru M1|Nibiru Jupiter One", "NexoTablet": "NEXO NOVA|NEXO 10|NEXO AVIO|NEXO FREE|NEXO GO|NEXO EVO|NEXO 3G|NEXO SMART|NEXO KIDDO|NEXO MOBI", "LeaderTablet": "TBLT10Q|TBLT10I|TBL-10WDKB|TBL-10WDKBO2013|TBL-W230V2|TBL-W450|TBL-W500|SV572|TBLT7I|TBA-AC7-8G|TBLT79|TBL-8W16|TBL-10W32|TBL-10WKB|TBL-W100", "UbislateTablet": "UbiSlate[\\s]?7C", "PocketBookTablet": "Pocketbook", "KocasoTablet": "\\b(TB-1207)\\b", "Hudl": "Hudl HT7S3|Hudl 2", "TelstraTablet": "T-Hub2", "GenericTablet": "Android.*\\b97D\\b|Tablet(?!.*PC)|BNTV250A|MID-WCDMA|LogicPD Zoom2|\\bA7EB\\b|CatNova8|A1_07|CT704|CT1002|\\bM721\\b|rk30sdk|\\bEVOTAB\\b|M758A|ET904|ALUMIUM10|Smartfren Tab|Endeavour 1010|Tablet-PC-4|Tagi Tab|\\bM6pro\\b|CT1020W|arc 10HD|\\bJolla\\b|\\bTP750\\b" }, "oss": { "AndroidOS": "Android", "BlackBerryOS": "blackberry|\\bBB10\\b|rim tablet os", "PalmOS": "PalmOS|avantgo|blazer|elaine|hiptop|palm|plucker|xiino", "SymbianOS": "Symbian|SymbOS|Series60|Series40|SYB-[0-9]+|\\bS60\\b", "WindowsMobileOS": "Windows CE.*(PPC|Smartphone|Mobile|[0-9]{3}x[0-9]{3})|Window Mobile|Windows Phone [0-9.]+|WCE;", "WindowsPhoneOS": "Windows Phone 10.0|Windows Phone 8.1|Windows Phone 8.0|Windows Phone OS|XBLWP7|ZuneWP7|Windows NT 6.[23]; ARM;", "iOS": "\\biPhone.*Mobile|\\biPod|\\biPad", "MeeGoOS": "MeeGo", "MaemoOS": "Maemo", "JavaOS": "J2ME\/|\\bMIDP\\b|\\bCLDC\\b", "webOS": "webOS|hpwOS", "badaOS": "\\bBada\\b", "BREWOS": "BREW" }, "uas": { "Vivaldi": "Vivaldi", "Chrome": "\\bCrMo\\b|CriOS|Android.*Chrome\/[.0-9]* (Mobile)?", "Dolfin": "\\bDolfin\\b", "Opera": "Opera.*Mini|Opera.*Mobi|Android.*Opera|Mobile.*OPR\/[0-9.]+|Coast\/[0-9.]+", "Skyfire": "Skyfire", "Edge": "Mobile Safari\/[.0-9]* Edge", "IE": "IEMobile|MSIEMobile", "Firefox": "fennec|firefox.*maemo|(Mobile|Tablet).*Firefox|Firefox.*Mobile", "Bolt": "bolt", "TeaShark": "teashark", "Blazer": "Blazer", "Safari": "Version.*Mobile.*Safari|Safari.*Mobile|MobileSafari", "Tizen": "Tizen", "UCBrowser": "UC.*Browser|UCWEB", "baiduboxapp": "baiduboxapp", "baidubrowser": "baidubrowser", "DiigoBrowser": "DiigoBrowser", "Puffin": "Puffin", "Mercury": "\\bMercury\\b", "ObigoBrowser": "Obigo", "NetFront": "NF-Browser", "GenericBrowser": "NokiaBrowser|OviBrowser|OneBrowser|TwonkyBeamBrowser|SEMC.*Browser|FlyFlow|Minimo|NetFront|Novarra-Vision|MQQBrowser|MicroMessenger", "PaleMoon": "Android.*PaleMoon|Mobile.*PaleMoon" }, "props": { "Mobile": "Mobile\/[VER]", "Build": "Build\/[VER]", "Version": "Version\/[VER]", "VendorID": "VendorID\/[VER]", "iPad": "iPad.*CPU[a-z ]+[VER]", "iPhone": "iPhone.*CPU[a-z ]+[VER]", "iPod": "iPod.*CPU[a-z ]+[VER]", "Kindle": "Kindle\/[VER]", "Chrome": [ "Chrome\/[VER]", "CriOS\/[VER]", "CrMo\/[VER]" ], "Coast": [ "Coast\/[VER]" ], "Dolfin": "Dolfin\/[VER]", "Firefox": "Firefox\/[VER]", "Fennec": "Fennec\/[VER]", "Edge": "Edge\/[VER]", "IE": [ "IEMobile\/[VER];", "IEMobile [VER]", "MSIE [VER];", "Trident\/[0-9.]+;.*rv:[VER]" ], "NetFront": "NetFront\/[VER]", "NokiaBrowser": "NokiaBrowser\/[VER]", "Opera": [ " OPR\/[VER]", "Opera Mini\/[VER]", "Version\/[VER]" ], "Opera Mini": "Opera Mini\/[VER]", "Opera Mobi": "Version\/[VER]", "UC Browser": "UC Browser[VER]", "MQQBrowser": "MQQBrowser\/[VER]", "MicroMessenger": "MicroMessenger\/[VER]", "baiduboxapp": "baiduboxapp\/[VER]", "baidubrowser": "baidubrowser\/[VER]", "Iron": "Iron\/[VER]", "Safari": [ "Version\/[VER]", "Safari\/[VER]" ], "Skyfire": "Skyfire\/[VER]", "Tizen": "Tizen\/[VER]", "Webkit": "webkit[ \/][VER]", "PaleMoon": "PaleMoon\/[VER]", "Gecko": "Gecko\/[VER]", "Trident": "Trident\/[VER]", "Presto": "Presto\/[VER]", "Goanna": "Goanna\/[VER]", "iOS": " \\bi?OS\\b [VER][ ;]{1}", "Android": "Android [VER]", "BlackBerry": [ "BlackBerry[\\w]+\/[VER]", "BlackBerry.*Version\/[VER]", "Version\/[VER]" ], "BREW": "BREW [VER]", "Java": "Java\/[VER]", "Windows Phone OS": [ "Windows Phone OS [VER]", "Windows Phone [VER]" ], "Windows Phone": "Windows Phone [VER]", "Windows CE": "Windows CE\/[VER]", "Windows NT": "Windows NT [VER]", "Symbian": [ "SymbianOS\/[VER]", "Symbian\/[VER]" ], "webOS": [ "webOS\/[VER]", "hpwOS\/[VER];" ] }, "utils": { "Bot": "Googlebot|facebookexternalhit|AdsBot-Google|Google Keyword Suggestion|Facebot|YandexBot|bingbot|ia_archiver|AhrefsBot|Ezooms|GSLFbot|WBSearchBot|Twitterbot|TweetmemeBot|Twikle|PaperLiBot|Wotbox|UnwindFetchor|Exabot|MJ12bot|YandexImages|TurnitinBot|Pingdom", "MobileBot": "Googlebot-Mobile|AdsBot-Google-Mobile|YahooSeeker\/M1A1-R2D2", "DesktopMode": "WPDesktop", "TV": "SonyDTV|HbbTV", "WebKit": "(webkit)[ \/]([\\w.]+)", "Console": "\\b(Nintendo|Nintendo WiiU|Nintendo 3DS|PLAYSTATION|Xbox)\\b", "Watch": "SM-V700" }}; // following patterns come from http://detectmobilebrowsers.com/ impl.detectMobileBrowsers = { fullPattern: /(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino/i, shortPattern: /1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i, tabletPattern: /android|ipad|playbook|silk/i }; var hasOwnProp = Object.prototype.hasOwnProperty, isArray; impl.FALLBACK_PHONE = 'UnknownPhone'; impl.FALLBACK_TABLET = 'UnknownTablet'; impl.FALLBACK_MOBILE = 'UnknownMobile'; isArray = ('isArray' in Array) ? Array.isArray : function (value) { return Object.prototype.toString.call(value) === '[object Array]'; }; isArray = 'isArray' in Array ? function (value) { return Object.prototype.toString.call(value) === '[object Array]'; } : Array.isArray; function equalIC(a, b) { return a != null && b != null && a.toLowerCase() === b.toLowerCase(); } function containsIC(array, value) { var valueLC, i, len = array.length; if (!len || !value) { return false; } valueLC = value.toLowerCase(); for (i = 0; i < len; ++i) { if (valueLC === array[i].toLowerCase()) { return true; } } return false; } function convertPropsToRegExp(object) { for (var key in object) { if (hasOwnProp.call(object, key)) { object[key] = new RegExp(object[key], 'i'); } } } (function init() { var key, values, value, i, len, verPos, mobileDetectRules = impl.mobileDetectRules; for (key in mobileDetectRules.props) { if (hasOwnProp.call(mobileDetectRules.props, key)) { values = mobileDetectRules.props[key]; if (!isArray(values)) { values = [values]; } len = values.length; for (i = 0; i < len; ++i) { value = values[i]; verPos = value.indexOf('[VER]'); if (verPos >= 0) { value = value.substring(0, verPos) + '([\\w._\\+]+)' + value.substring(verPos + 5); } values[i] = new RegExp(value, 'i'); } mobileDetectRules.props[key] = values; } } convertPropsToRegExp(mobileDetectRules.oss); convertPropsToRegExp(mobileDetectRules.phones); convertPropsToRegExp(mobileDetectRules.tablets); convertPropsToRegExp(mobileDetectRules.uas); convertPropsToRegExp(mobileDetectRules.utils); // copy some patterns to oss0 which are tested first (see issue#15) mobileDetectRules.oss0 = { WindowsPhoneOS: mobileDetectRules.oss.WindowsPhoneOS, WindowsMobileOS: mobileDetectRules.oss.WindowsMobileOS }; }()); /** * Test userAgent string against a set of rules and find the first matched key. * @param {Object} rules (key is String, value is RegExp) * @param {String} userAgent the navigator.userAgent (or HTTP-Header 'User-Agent'). * @returns {String|null} the matched key if found, otherwise null * @private */ impl.findMatch = function(rules, userAgent) { for (var key in rules) { if (hasOwnProp.call(rules, key)) { if (rules[key].test(userAgent)) { return key; } } } return null; }; /** * Test userAgent string against a set of rules and return an array of matched keys. * @param {Object} rules (key is String, value is RegExp) * @param {String} userAgent the navigator.userAgent (or HTTP-Header 'User-Agent'). * @returns {Array} an array of matched keys, may be empty when there is no match, but not null * @private */ impl.findMatches = function(rules, userAgent) { var result = []; for (var key in rules) { if (hasOwnProp.call(rules, key)) { if (rules[key].test(userAgent)) { result.push(key); } } } return result; }; /** * Check the version of the given property in the User-Agent. * * @param {String} propertyName * @param {String} userAgent * @return {String} version or null if version not found * @private */ impl.getVersionStr = function (propertyName, userAgent) { var props = impl.mobileDetectRules.props, patterns, i, len, match; if (hasOwnProp.call(props, propertyName)) { patterns = props[propertyName]; len = patterns.length; for (i = 0; i < len; ++i) { match = patterns[i].exec(userAgent); if (match !== null) { return match[1]; } } } return null; }; /** * Check the version of the given property in the User-Agent. * Will return a float number. (eg. 2_0 will return 2.0, 4.3.1 will return 4.31) * * @param {String} propertyName * @param {String} userAgent * @return {Number} version or NaN if version not found * @private */ impl.getVersion = function (propertyName, userAgent) { var version = impl.getVersionStr(propertyName, userAgent); return version ? impl.prepareVersionNo(version) : NaN; }; /** * Prepare the version number. * * @param {String} version * @return {Number} the version number as a floating number * @private */ impl.prepareVersionNo = function (version) { var numbers; numbers = version.split(/[a-z._ \/\-]/i); if (numbers.length === 1) { version = numbers[0]; } if (numbers.length > 1) { version = numbers[0] + '.'; numbers.shift(); version += numbers.join(''); } return Number(version); }; impl.isMobileFallback = function (userAgent) { return impl.detectMobileBrowsers.fullPattern.test(userAgent) || impl.detectMobileBrowsers.shortPattern.test(userAgent.substr(0,4)); }; impl.isTabletFallback = function (userAgent) { return impl.detectMobileBrowsers.tabletPattern.test(userAgent); }; impl.prepareDetectionCache = function (cache, userAgent, maxPhoneWidth) { if (cache.mobile !== undefined) { return; } var phone, tablet, phoneSized; // first check for stronger tablet rules, then phone (see issue#5) tablet = impl.findMatch(impl.mobileDetectRules.tablets, userAgent); if (tablet) { cache.mobile = cache.tablet = tablet; cache.phone = null; return; // unambiguously identified as tablet } phone = impl.findMatch(impl.mobileDetectRules.phones, userAgent); if (phone) { cache.mobile = cache.phone = phone; cache.tablet = null; return; // unambiguously identified as phone } // our rules haven't found a match -> try more general fallback rules if (impl.isMobileFallback(userAgent)) { phoneSized = MobileDetect.isPhoneSized(maxPhoneWidth); if (phoneSized === undefined) { cache.mobile = impl.FALLBACK_MOBILE; cache.tablet = cache.phone = null; } else if (phoneSized) { cache.mobile = cache.phone = impl.FALLBACK_PHONE; cache.tablet = null; } else { cache.mobile = cache.tablet = impl.FALLBACK_TABLET; cache.phone = null; } } else if (impl.isTabletFallback(userAgent)) { cache.mobile = cache.tablet = impl.FALLBACK_TABLET; cache.phone = null; } else { // not mobile at all! cache.mobile = cache.tablet = cache.phone = null; } }; // t is a reference to a MobileDetect instance impl.mobileGrade = function (t) { // impl note: // To keep in sync w/ Mobile_Detect.php easily, the following code is tightly aligned to the PHP version. // When changes are made in Mobile_Detect.php, copy this method and replace: // $this-> / t. // self::MOBILE_GRADE_(.) / '$1' // , self::VERSION_TYPE_FLOAT / (nothing) // isIOS() / os('iOS') // [reg] / (nothing) <-- jsdelivr complaining about unescaped unicode character U+00AE var $isMobile = t.mobile() !== null; if ( // Apple iOS 3.2-5.1 - Tested on the original iPad (4.3 / 5.0), iPad 2 (4.3), iPad 3 (5.1), original iPhone (3.1), iPhone 3 (3.2), 3GS (4.3), 4 (4.3 / 5.0), and 4S (5.1) t.os('iOS') && t.version('iPad')>=4.3 || t.os('iOS') && t.version('iPhone')>=3.1 || t.os('iOS') && t.version('iPod')>=3.1 || // Android 2.1-2.3 - Tested on the HTC Incredible (2.2), original Droid (2.2), HTC Aria (2.1), Google Nexus S (2.3). Functional on 1.5 & 1.6 but performance may be sluggish, tested on Google G1 (1.5) // Android 3.1 (Honeycomb) - Tested on the Samsung Galaxy Tab 10.1 and Motorola XOOM // Android 4.0 (ICS) - Tested on a Galaxy Nexus. Note: transition performance can be poor on upgraded devices // Android 4.1 (Jelly Bean) - Tested on a Galaxy Nexus and Galaxy 7 ( t.version('Android')>2.1 && t.is('Webkit') ) || // Windows Phone 7-7.5 - Tested on the HTC Surround (7.0) HTC Trophy (7.5), LG-E900 (7.5), Nokia Lumia 800 t.version('Windows Phone OS')>=7.0 || // Blackberry 7 - Tested on BlackBerry Torch 9810 // Blackberry 6.0 - Tested on the Torch 9800 and Style 9670 t.is('BlackBerry') && t.version('BlackBerry')>=6.0 || // Blackberry Playbook (1.0-2.0) - Tested on PlayBook t.match('Playbook.*Tablet') || // Palm WebOS (1.4-2.0) - Tested on the Palm Pixi (1.4), Pre (1.4), Pre 2 (2.0) ( t.version('webOS')>=1.4 && t.match('Palm|Pre|Pixi') ) || // Palm WebOS 3.0 - Tested on HP TouchPad t.match('hp.*TouchPad') || // Firefox Mobile (12 Beta) - Tested on Android 2.3 device ( t.is('Firefox') && t.version('Firefox')>=12 ) || // Chrome for Android - Tested on Android 4.0, 4.1 device ( t.is('Chrome') && t.is('AndroidOS') && t.version('Android')>=4.0 ) || // Skyfire 4.1 - Tested on Android 2.3 device ( t.is('Skyfire') && t.version('Skyfire')>=4.1 && t.is('AndroidOS') && t.version('Android')>=2.3 ) || // Opera Mobile 11.5-12: Tested on Android 2.3 ( t.is('Opera') && t.version('Opera Mobi')>11 && t.is('AndroidOS') ) || // Meego 1.2 - Tested on Nokia 950 and N9 t.is('MeeGoOS') || // Tizen (pre-release) - Tested on early hardware t.is('Tizen') || // Samsung Bada 2.0 - Tested on a Samsung Wave 3, Dolphin browser // @todo: more tests here! t.is('Dolfin') && t.version('Bada')>=2.0 || // UC Browser - Tested on Android 2.3 device ( (t.is('UC Browser') || t.is('Dolfin')) && t.version('Android')>=2.3 ) || // Kindle 3 and Fire - Tested on the built-in WebKit browser for each ( t.match('Kindle Fire') || t.is('Kindle') && t.version('Kindle')>=3.0 ) || // Nook Color 1.4.1 - Tested on original Nook Color, not Nook Tablet t.is('AndroidOS') && t.is('NookTablet') || // Chrome Desktop 11-21 - Tested on OS X 10.7 and Windows 7 t.version('Chrome')>=11 && !$isMobile || // Safari Desktop 4-5 - Tested on OS X 10.7 and Windows 7 t.version('Safari')>=5.0 && !$isMobile || // Firefox Desktop 4-13 - Tested on OS X 10.7 and Windows 7 t.version('Firefox')>=4.0 && !$isMobile || // Internet Explorer 7-9 - Tested on Windows XP, Vista and 7 t.version('MSIE')>=7.0 && !$isMobile || // Opera Desktop 10-12 - Tested on OS X 10.7 and Windows 7 // @reference: http://my.opera.com/community/openweb/idopera/ t.version('Opera')>=10 && !$isMobile ){ return 'A'; } if ( t.os('iOS') && t.version('iPad')<4.3 || t.os('iOS') && t.version('iPhone')<3.1 || t.os('iOS') && t.version('iPod')<3.1 || // Blackberry 5.0: Tested on the Storm 2 9550, Bold 9770 t.is('Blackberry') && t.version('BlackBerry')>=5 && t.version('BlackBerry')<6 || //Opera Mini (5.0-6.5) - Tested on iOS 3.2/4.3 and Android 2.3 ( t.version('Opera Mini')>=5.0 && t.version('Opera Mini')<=6.5 && (t.version('Android')>=2.3 || t.is('iOS')) ) || // Nokia Symbian^3 - Tested on Nokia N8 (Symbian^3), C7 (Symbian^3), also works on N97 (Symbian^1) t.match('NokiaN8|NokiaC7|N97.*Series60|Symbian/3') || // @todo: report this (tested on Nokia N71) t.version('Opera Mobi')>=11 && t.is('SymbianOS') ){ return 'B'; } if ( // Blackberry 4.x - Tested on the Curve 8330 t.version('BlackBerry')<5.0 || // Windows Mobile - Tested on the HTC Leo (WinMo 5.2) t.match('MSIEMobile|Windows CE.*Mobile') || t.version('Windows Mobile')<=5.2 ){ return 'C'; } //All older smartphone platforms and featurephones - Any device that doesn't support media queries //will receive the basic, C grade experience. return 'C'; }; impl.detectOS = function (ua) { return impl.findMatch(impl.mobileDetectRules.oss0, ua) || impl.findMatch(impl.mobileDetectRules.oss, ua); }; impl.getDeviceSmallerSide = function () { return window.screen.width < window.screen.height ? window.screen.width : window.screen.height; }; /** * Constructor for MobileDetect object. *
* Such an object will keep a reference to the given user-agent string and cache most of the detect queries.
*
* Find information how to download and install: * github.com/hgoebl/mobile-detect.js/ *
* * @example 
     *     var md = new MobileDetect(window.navigator.userAgent);     *     if (md.mobile()) {     *         location.href = (md.mobileGrade() === 'A') ? '/mobile/' : '/lynx/';     *     }     *
* * @param {string} userAgent typically taken from window.navigator.userAgent or http_header['User-Agent'] * @param {number} [maxPhoneWidth=600] only for browsers specify a value for the maximum * width of smallest device side (in logical "CSS" pixels) until a device detected as mobile will be handled * as phone. * This is only used in cases where the device cannot be classified as phone or tablet.
* See Declaring Tablet Layouts * for Android.
* If you provide a value < 0, then this "fuzzy" check is disabled. * @constructor * @global */ function MobileDetect(userAgent, maxPhoneWidth) { this.ua = userAgent || ''; this._cache = {}; //600dp is typical 7" tablet minimum width this.maxPhoneWidth = maxPhoneWidth || 600; } MobileDetect.prototype = { constructor: MobileDetect, /** * Returns the detected phone or tablet type or null if it is not a mobile device. *
* For a list of possible return values see {@link MobileDetect#phone} and {@link MobileDetect#tablet}.
*
* If the device is not detected by the regular expressions from Mobile-Detect, a test is made against * the patterns of detectmobilebrowsers.com. If this test * is positive, a value of UnknownPhone, UnknownTablet or * UnknownMobile is returned.
* When used in browser, the decision whether phone or tablet is made based on screen.width/height.
*
* When used server-side (node.js), there is no way to tell the difference between UnknownTablet * and UnknownMobile, so you will get UnknownMobile here.
* Be aware that since v1.0.0 in this special case you will get UnknownMobile only for: * {@link MobileDetect#mobile}, not for {@link MobileDetect#phone} and {@link MobileDetect#tablet}. * In versions before v1.0.0 all 3 methods returned UnknownMobile which was tedious to use. *
* In most cases you will use the return value just as a boolean. * * @returns {String} the key for the phone family or tablet family, e.g. "Nexus". * @function MobileDetect#mobile */ mobile: function () { impl.prepareDetectionCache(this._cache, this.ua, this.maxPhoneWidth); return this._cache.mobile; }, /** * Returns the detected phone type/family string or null. *
* The returned tablet (family or producer) is one of following keys:
*
iPhone, BlackBerry, HTC, Nexus, Dell, Motorola, Samsung, LG, Sony, Asus, * NokiaLumia, Micromax, Palm, Vertu, Pantech, Fly, Wiko, iMobile, SimValley, * Wolfgang, Alcatel, Nintendo, Amoi, INQ, GenericPhone
*
* If the device is not detected by the regular expressions from Mobile-Detect, a test is made against * the patterns of detectmobilebrowsers.com. If this test * is positive, a value of UnknownPhone or UnknownMobile is returned.
* When used in browser, the decision whether phone or tablet is made based on screen.width/height.
*
* When used server-side (node.js), there is no way to tell the difference between UnknownTablet * and UnknownMobile, so you will get null here, while {@link MobileDetect#mobile} * will return UnknownMobile.
* Be aware that since v1.0.0 in this special case you will get UnknownMobile only for: * {@link MobileDetect#mobile}, not for {@link MobileDetect#phone} and {@link MobileDetect#tablet}. * In versions before v1.0.0 all 3 methods returned UnknownMobile which was tedious to use. *
* In most cases you will use the return value just as a boolean. * * @returns {String} the key of the phone family or producer, e.g. "iPhone" * @function MobileDetect#phone */ phone: function () { impl.prepareDetectionCache(this._cache, this.ua, this.maxPhoneWidth); return this._cache.phone; }, /** * Returns the detected tablet type/family string or null. *
* The returned tablet (family or producer) is one of following keys:
*
iPad, NexusTablet, SamsungTablet, Kindle, SurfaceTablet, HPTablet, AsusTablet, * BlackBerryTablet, HTCtablet, MotorolaTablet, NookTablet, AcerTablet, * ToshibaTablet, LGTablet, FujitsuTablet, PrestigioTablet, LenovoTablet, * DellTablet, YarvikTablet, MedionTablet, ArnovaTablet, IntensoTablet, IRUTablet, * MegafonTablet, EbodaTablet, AllViewTablet, ArchosTablet, AinolTablet, * NokiaLumiaTablet, SonyTablet, PhilipsTablet, CubeTablet, CobyTablet, MIDTablet, * MSITablet, SMiTTablet, RockChipTablet, FlyTablet, bqTablet, HuaweiTablet, * NecTablet, PantechTablet, BronchoTablet, VersusTablet, ZyncTablet, * PositivoTablet, NabiTablet, KoboTablet, DanewTablet, TexetTablet, * PlaystationTablet, TrekstorTablet, PyleAudioTablet, AdvanTablet, * DanyTechTablet, GalapadTablet, MicromaxTablet, KarbonnTablet, AllFineTablet, * PROSCANTablet, YONESTablet, ChangJiaTablet, GUTablet, PointOfViewTablet, * OvermaxTablet, HCLTablet, DPSTablet, VistureTablet, CrestaTablet, * MediatekTablet, ConcordeTablet, GoCleverTablet, ModecomTablet, VoninoTablet, * ECSTablet, StorexTablet, VodafoneTablet, EssentielBTablet, RossMoorTablet, * iMobileTablet, TolinoTablet, AudioSonicTablet, AMPETablet, SkkTablet, * TecnoTablet, JXDTablet, iJoyTablet, FX2Tablet, XoroTablet, ViewsonicTablet, * OdysTablet, CaptivaTablet, IconbitTablet, TeclastTablet, OndaTablet, * JaytechTablet, BlaupunktTablet, DigmaTablet, EvolioTablet, LavaTablet, * AocTablet, MpmanTablet, CelkonTablet, WolderTablet, MiTablet, NibiruTablet, * NexoTablet, LeaderTablet, UbislateTablet, PocketBookTablet, KocasoTablet, Hudl, * TelstraTablet, GenericTablet
*
* If the device is not detected by the regular expressions from Mobile-Detect, a test is made against * the patterns of detectmobilebrowsers.com. If this test * is positive, a value of UnknownTablet or UnknownMobile is returned.
* When used in browser, the decision whether phone or tablet is made based on screen.width/height.
*
* When used server-side (node.js), there is no way to tell the difference between UnknownTablet * and UnknownMobile, so you will get null here, while {@link MobileDetect#mobile} * will return UnknownMobile.
* Be aware that since v1.0.0 in this special case you will get UnknownMobile only for: * {@link MobileDetect#mobile}, not for {@link MobileDetect#phone} and {@link MobileDetect#tablet}. * In versions before v1.0.0 all 3 methods returned UnknownMobile which was tedious to use. *
* In most cases you will use the return value just as a boolean. * * @returns {String} the key of the tablet family or producer, e.g. "SamsungTablet" * @function MobileDetect#tablet */ tablet: function () { impl.prepareDetectionCache(this._cache, this.ua, this.maxPhoneWidth); return this._cache.tablet; }, /** * Returns the (first) detected user-agent string or null. *
* The returned user-agent is one of following keys:
*
Vivaldi, Chrome, Dolfin, Opera, Skyfire, Edge, IE, Firefox, Bolt, TeaShark, * Blazer, Safari, Tizen, UCBrowser, baiduboxapp, baidubrowser, DiigoBrowser, * Puffin, Mercury, ObigoBrowser, NetFront, GenericBrowser, PaleMoon
*
* In most cases calling {@link MobileDetect#userAgent} will be sufficient. But there are rare * cases where a mobile device pretends to be more than one particular browser. You can get the * list of all matches with {@link MobileDetect#userAgents} or check for a particular value by * providing one of the defined keys as first argument to {@link MobileDetect#is}. * * @returns {String} the key for the detected user-agent or null * @function MobileDetect#userAgent */ userAgent: function () { if (this._cache.userAgent === undefined) { this._cache.userAgent = impl.findMatch(impl.mobileDetectRules.uas, this.ua); } return this._cache.userAgent; }, /** * Returns all detected user-agent strings. *
* The array is empty or contains one or more of following keys:
*
Vivaldi, Chrome, Dolfin, Opera, Skyfire, Edge, IE, Firefox, Bolt, TeaShark, * Blazer, Safari, Tizen, UCBrowser, baiduboxapp, baidubrowser, DiigoBrowser, * Puffin, Mercury, ObigoBrowser, NetFront, GenericBrowser, PaleMoon
*
* In most cases calling {@link MobileDetect#userAgent} will be sufficient. But there are rare * cases where a mobile device pretends to be more than one particular browser. You can get the * list of all matches with {@link MobileDetect#userAgents} or check for a particular value by * providing one of the defined keys as first argument to {@link MobileDetect#is}. * * @returns {Array} the array of detected user-agent keys or [] * @function MobileDetect#userAgents */ userAgents: function () { if (this._cache.userAgents === undefined) { this._cache.userAgents = impl.findMatches(impl.mobileDetectRules.uas, this.ua); } return this._cache.userAgents; }, /** * Returns the detected operating system string or null. *
* The operating system is one of following keys:
*
AndroidOS, BlackBerryOS, PalmOS, SymbianOS, WindowsMobileOS, WindowsPhoneOS, * iOS, MeeGoOS, MaemoOS, JavaOS, webOS, badaOS, BREWOS
* * @returns {String} the key for the detected operating system. * @function MobileDetect#os */ os: function () { if (this._cache.os === undefined) { this._cache.os = impl.detectOS(this.ua); } return this._cache.os; }, /** * Get the version (as Number) of the given property in the User-Agent. *
* Will return a float number. (eg. 2_0 will return 2.0, 4.3.1 will return 4.31) * * @param {String} key a key defining a thing which has a version.
* You can use one of following keys:
*
Mobile, Build, Version, VendorID, iPad, iPhone, iPod, Kindle, Chrome, Coast, * Dolfin, Firefox, Fennec, Edge, IE, NetFront, NokiaBrowser, Opera, Opera Mini, * Opera Mobi, UC Browser, MQQBrowser, MicroMessenger, baiduboxapp, baidubrowser, * Iron, Safari, Skyfire, Tizen, Webkit, PaleMoon, Gecko, Trident, Presto, Goanna, * iOS, Android, BlackBerry, BREW, Java, Windows Phone OS, Windows Phone, Windows * CE, Windows NT, Symbian, webOS
* * @returns {Number} the version as float or NaN if User-Agent doesn't contain this version. * Be careful when comparing this value with '==' operator! * @function MobileDetect#version */ version: function (key) { return impl.getVersion(key, this.ua); }, /** * Get the version (as String) of the given property in the User-Agent. *
* * @param {String} key a key defining a thing which has a version.
* You can use one of following keys:
*
Mobile, Build, Version, VendorID, iPad, iPhone, iPod, Kindle, Chrome, Coast, * Dolfin, Firefox, Fennec, Edge, IE, NetFront, NokiaBrowser, Opera, Opera Mini, * Opera Mobi, UC Browser, MQQBrowser, MicroMessenger, baiduboxapp, baidubrowser, * Iron, Safari, Skyfire, Tizen, Webkit, PaleMoon, Gecko, Trident, Presto, Goanna, * iOS, Android, BlackBerry, BREW, Java, Windows Phone OS, Windows Phone, Windows * CE, Windows NT, Symbian, webOS
* * @returns {String} the "raw" version as String or null if User-Agent doesn't contain this version. * * @function MobileDetect#versionStr */ versionStr: function (key) { return impl.getVersionStr(key, this.ua); }, /** * Global test key against userAgent, os, phone, tablet and some other properties of userAgent string. * * @param {String} key the key (case-insensitive) of a userAgent, an operating system, phone or * tablet family.
* For a complete list of possible values, see {@link MobileDetect#userAgent}, * {@link MobileDetect#os}, {@link MobileDetect#phone}, {@link MobileDetect#tablet}.
* Additionally you have following keys:
*
Bot, MobileBot, DesktopMode, TV, WebKit, Console, Watch
* * @returns {boolean} true when the given key is one of the defined keys of userAgent, os, phone, * tablet or one of the listed additional keys, otherwise false * @function MobileDetect#is */ is: function (key) { return containsIC(this.userAgents(), key) || equalIC(key, this.os()) || equalIC(key, this.phone()) || equalIC(key, this.tablet()) || containsIC(impl.findMatches(impl.mobileDetectRules.utils, this.ua), key); }, /** * Do a quick test against navigator::userAgent. * * @param {String|RegExp} pattern the pattern, either as String or RegExp * (a string will be converted to a case-insensitive RegExp). * @returns {boolean} true when the pattern matches, otherwise false * @function MobileDetect#match */ match: function (pattern) { if (!(pattern instanceof RegExp)) { pattern = new RegExp(pattern, 'i'); } return pattern.test(this.ua); }, /** * Checks whether the mobile device can be considered as phone regarding screen.width. *
* Obviously this method makes sense in browser environments only (not for Node.js)! * @param {number} [maxPhoneWidth] the maximum logical pixels (aka. CSS-pixels) to be considered as phone.
* The argument is optional and if not present or falsy, the value of the constructor is taken. * @returns {boolean|undefined} undefined if screen size wasn't detectable, else true * when screen.width is less or equal to maxPhoneWidth, otherwise false.
* Will always return undefined server-side. */ isPhoneSized: function (maxPhoneWidth) { return MobileDetect.isPhoneSized(maxPhoneWidth || this.maxPhoneWidth); }, /** * Returns the mobile grade ('A', 'B', 'C'). * * @returns {String} one of the mobile grades ('A', 'B', 'C'). * @function MobileDetect#mobileGrade */ mobileGrade: function () { if (this._cache.grade === undefined) { this._cache.grade = impl.mobileGrade(this); } return this._cache.grade; } }; // environment-dependent if (typeof window !== 'undefined' && window.screen) { MobileDetect.isPhoneSized = function (maxPhoneWidth) { return maxPhoneWidth < 0 ? undefined : impl.getDeviceSmallerSide() <= maxPhoneWidth; }; } else { MobileDetect.isPhoneSized = function () {}; } // should not be replaced by a completely new object - just overwrite existing methods MobileDetect._impl = impl; MobileDetect.version = '1.3.3 2016-07-31'; return MobileDetect;}) : any +>define(function () { 'use strict'; var impl = {}; impl.mobileDetectRules = { "phones": { "iPhone": "\\biPhone\\b|\\biPod\\b", "BlackBerry": "BlackBerry|\\bBB10\\b|rim[0-9]+", "HTC": "HTC|HTC.*(Sensation|Evo|Vision|Explorer|6800|8100|8900|A7272|S510e|C110e|Legend|Desire|T8282)|APX515CKT|Qtek9090|APA9292KT|HD_mini|Sensation.*Z710e|PG86100|Z715e|Desire.*(A8181|HD)|ADR6200|ADR6400L|ADR6425|001HT|Inspire 4G|Android.*\\bEVO\\b|T-Mobile G1|Z520m", "Nexus": "Nexus One|Nexus S|Galaxy.*Nexus|Android.*Nexus.*Mobile|Nexus 4|Nexus 5|Nexus 6", "Dell": "Dell.*Streak|Dell.*Aero|Dell.*Venue|DELL.*Venue Pro|Dell Flash|Dell Smoke|Dell Mini 3iX|XCD28|XCD35|\\b001DL\\b|\\b101DL\\b|\\bGS01\\b", "Motorola": "Motorola|DROIDX|DROID BIONIC|\\bDroid\\b.*Build|Android.*Xoom|HRI39|MOT-|A1260|A1680|A555|A853|A855|A953|A955|A956|Motorola.*ELECTRIFY|Motorola.*i1|i867|i940|MB200|MB300|MB501|MB502|MB508|MB511|MB520|MB525|MB526|MB611|MB612|MB632|MB810|MB855|MB860|MB861|MB865|MB870|ME501|ME502|ME511|ME525|ME600|ME632|ME722|ME811|ME860|ME863|ME865|MT620|MT710|MT716|MT720|MT810|MT870|MT917|Motorola.*TITANIUM|WX435|WX445|XT300|XT301|XT311|XT316|XT317|XT319|XT320|XT390|XT502|XT530|XT531|XT532|XT535|XT603|XT610|XT611|XT615|XT681|XT701|XT702|XT711|XT720|XT800|XT806|XT860|XT862|XT875|XT882|XT883|XT894|XT901|XT907|XT909|XT910|XT912|XT928|XT926|XT915|XT919|XT925|XT1021|\\bMoto E\\b", "Samsung": "Samsung|SM-G9250|GT-19300|SGH-I337|BGT-S5230|GT-B2100|GT-B2700|GT-B2710|GT-B3210|GT-B3310|GT-B3410|GT-B3730|GT-B3740|GT-B5510|GT-B5512|GT-B5722|GT-B6520|GT-B7300|GT-B7320|GT-B7330|GT-B7350|GT-B7510|GT-B7722|GT-B7800|GT-C3010|GT-C3011|GT-C3060|GT-C3200|GT-C3212|GT-C3212I|GT-C3262|GT-C3222|GT-C3300|GT-C3300K|GT-C3303|GT-C3303K|GT-C3310|GT-C3322|GT-C3330|GT-C3350|GT-C3500|GT-C3510|GT-C3530|GT-C3630|GT-C3780|GT-C5010|GT-C5212|GT-C6620|GT-C6625|GT-C6712|GT-E1050|GT-E1070|GT-E1075|GT-E1080|GT-E1081|GT-E1085|GT-E1087|GT-E1100|GT-E1107|GT-E1110|GT-E1120|GT-E1125|GT-E1130|GT-E1160|GT-E1170|GT-E1175|GT-E1180|GT-E1182|GT-E1200|GT-E1210|GT-E1225|GT-E1230|GT-E1390|GT-E2100|GT-E2120|GT-E2121|GT-E2152|GT-E2220|GT-E2222|GT-E2230|GT-E2232|GT-E2250|GT-E2370|GT-E2550|GT-E2652|GT-E3210|GT-E3213|GT-I5500|GT-I5503|GT-I5700|GT-I5800|GT-I5801|GT-I6410|GT-I6420|GT-I7110|GT-I7410|GT-I7500|GT-I8000|GT-I8150|GT-I8160|GT-I8190|GT-I8320|GT-I8330|GT-I8350|GT-I8530|GT-I8700|GT-I8703|GT-I8910|GT-I9000|GT-I9001|GT-I9003|GT-I9010|GT-I9020|GT-I9023|GT-I9070|GT-I9082|GT-I9100|GT-I9103|GT-I9220|GT-I9250|GT-I9300|GT-I9305|GT-I9500|GT-I9505|GT-M3510|GT-M5650|GT-M7500|GT-M7600|GT-M7603|GT-M8800|GT-M8910|GT-N7000|GT-S3110|GT-S3310|GT-S3350|GT-S3353|GT-S3370|GT-S3650|GT-S3653|GT-S3770|GT-S3850|GT-S5210|GT-S5220|GT-S5229|GT-S5230|GT-S5233|GT-S5250|GT-S5253|GT-S5260|GT-S5263|GT-S5270|GT-S5300|GT-S5330|GT-S5350|GT-S5360|GT-S5363|GT-S5369|GT-S5380|GT-S5380D|GT-S5560|GT-S5570|GT-S5600|GT-S5603|GT-S5610|GT-S5620|GT-S5660|GT-S5670|GT-S5690|GT-S5750|GT-S5780|GT-S5830|GT-S5839|GT-S6102|GT-S6500|GT-S7070|GT-S7200|GT-S7220|GT-S7230|GT-S7233|GT-S7250|GT-S7500|GT-S7530|GT-S7550|GT-S7562|GT-S7710|GT-S8000|GT-S8003|GT-S8500|GT-S8530|GT-S8600|SCH-A310|SCH-A530|SCH-A570|SCH-A610|SCH-A630|SCH-A650|SCH-A790|SCH-A795|SCH-A850|SCH-A870|SCH-A890|SCH-A930|SCH-A950|SCH-A970|SCH-A990|SCH-I100|SCH-I110|SCH-I400|SCH-I405|SCH-I500|SCH-I510|SCH-I515|SCH-I600|SCH-I730|SCH-I760|SCH-I770|SCH-I830|SCH-I910|SCH-I920|SCH-I959|SCH-LC11|SCH-N150|SCH-N300|SCH-R100|SCH-R300|SCH-R351|SCH-R400|SCH-R410|SCH-T300|SCH-U310|SCH-U320|SCH-U350|SCH-U360|SCH-U365|SCH-U370|SCH-U380|SCH-U410|SCH-U430|SCH-U450|SCH-U460|SCH-U470|SCH-U490|SCH-U540|SCH-U550|SCH-U620|SCH-U640|SCH-U650|SCH-U660|SCH-U700|SCH-U740|SCH-U750|SCH-U810|SCH-U820|SCH-U900|SCH-U940|SCH-U960|SCS-26UC|SGH-A107|SGH-A117|SGH-A127|SGH-A137|SGH-A157|SGH-A167|SGH-A177|SGH-A187|SGH-A197|SGH-A227|SGH-A237|SGH-A257|SGH-A437|SGH-A517|SGH-A597|SGH-A637|SGH-A657|SGH-A667|SGH-A687|SGH-A697|SGH-A707|SGH-A717|SGH-A727|SGH-A737|SGH-A747|SGH-A767|SGH-A777|SGH-A797|SGH-A817|SGH-A827|SGH-A837|SGH-A847|SGH-A867|SGH-A877|SGH-A887|SGH-A897|SGH-A927|SGH-B100|SGH-B130|SGH-B200|SGH-B220|SGH-C100|SGH-C110|SGH-C120|SGH-C130|SGH-C140|SGH-C160|SGH-C170|SGH-C180|SGH-C200|SGH-C207|SGH-C210|SGH-C225|SGH-C230|SGH-C417|SGH-C450|SGH-D307|SGH-D347|SGH-D357|SGH-D407|SGH-D415|SGH-D780|SGH-D807|SGH-D980|SGH-E105|SGH-E200|SGH-E315|SGH-E316|SGH-E317|SGH-E335|SGH-E590|SGH-E635|SGH-E715|SGH-E890|SGH-F300|SGH-F480|SGH-I200|SGH-I300|SGH-I320|SGH-I550|SGH-I577|SGH-I600|SGH-I607|SGH-I617|SGH-I627|SGH-I637|SGH-I677|SGH-I700|SGH-I717|SGH-I727|SGH-i747M|SGH-I777|SGH-I780|SGH-I827|SGH-I847|SGH-I857|SGH-I896|SGH-I897|SGH-I900|SGH-I907|SGH-I917|SGH-I927|SGH-I937|SGH-I997|SGH-J150|SGH-J200|SGH-L170|SGH-L700|SGH-M110|SGH-M150|SGH-M200|SGH-N105|SGH-N500|SGH-N600|SGH-N620|SGH-N625|SGH-N700|SGH-N710|SGH-P107|SGH-P207|SGH-P300|SGH-P310|SGH-P520|SGH-P735|SGH-P777|SGH-Q105|SGH-R210|SGH-R220|SGH-R225|SGH-S105|SGH-S307|SGH-T109|SGH-T119|SGH-T139|SGH-T209|SGH-T219|SGH-T229|SGH-T239|SGH-T249|SGH-T259|SGH-T309|SGH-T319|SGH-T329|SGH-T339|SGH-T349|SGH-T359|SGH-T369|SGH-T379|SGH-T409|SGH-T429|SGH-T439|SGH-T459|SGH-T469|SGH-T479|SGH-T499|SGH-T509|SGH-T519|SGH-T539|SGH-T559|SGH-T589|SGH-T609|SGH-T619|SGH-T629|SGH-T639|SGH-T659|SGH-T669|SGH-T679|SGH-T709|SGH-T719|SGH-T729|SGH-T739|SGH-T746|SGH-T749|SGH-T759|SGH-T769|SGH-T809|SGH-T819|SGH-T839|SGH-T919|SGH-T929|SGH-T939|SGH-T959|SGH-T989|SGH-U100|SGH-U200|SGH-U800|SGH-V205|SGH-V206|SGH-X100|SGH-X105|SGH-X120|SGH-X140|SGH-X426|SGH-X427|SGH-X475|SGH-X495|SGH-X497|SGH-X507|SGH-X600|SGH-X610|SGH-X620|SGH-X630|SGH-X700|SGH-X820|SGH-X890|SGH-Z130|SGH-Z150|SGH-Z170|SGH-ZX10|SGH-ZX20|SHW-M110|SPH-A120|SPH-A400|SPH-A420|SPH-A460|SPH-A500|SPH-A560|SPH-A600|SPH-A620|SPH-A660|SPH-A700|SPH-A740|SPH-A760|SPH-A790|SPH-A800|SPH-A820|SPH-A840|SPH-A880|SPH-A900|SPH-A940|SPH-A960|SPH-D600|SPH-D700|SPH-D710|SPH-D720|SPH-I300|SPH-I325|SPH-I330|SPH-I350|SPH-I500|SPH-I600|SPH-I700|SPH-L700|SPH-M100|SPH-M220|SPH-M240|SPH-M300|SPH-M305|SPH-M320|SPH-M330|SPH-M350|SPH-M360|SPH-M370|SPH-M380|SPH-M510|SPH-M540|SPH-M550|SPH-M560|SPH-M570|SPH-M580|SPH-M610|SPH-M620|SPH-M630|SPH-M800|SPH-M810|SPH-M850|SPH-M900|SPH-M910|SPH-M920|SPH-M930|SPH-N100|SPH-N200|SPH-N240|SPH-N300|SPH-N400|SPH-Z400|SWC-E100|SCH-i909|GT-N7100|GT-N7105|SCH-I535|SM-N900A|SGH-I317|SGH-T999L|GT-S5360B|GT-I8262|GT-S6802|GT-S6312|GT-S6310|GT-S5312|GT-S5310|GT-I9105|GT-I8510|GT-S6790N|SM-G7105|SM-N9005|GT-S5301|GT-I9295|GT-I9195|SM-C101|GT-S7392|GT-S7560|GT-B7610|GT-I5510|GT-S7582|GT-S7530E|GT-I8750|SM-G9006V|SM-G9008V|SM-G9009D|SM-G900A|SM-G900D|SM-G900F|SM-G900H|SM-G900I|SM-G900J|SM-G900K|SM-G900L|SM-G900M|SM-G900P|SM-G900R4|SM-G900S|SM-G900T|SM-G900V|SM-G900W8|SHV-E160K|SCH-P709|SCH-P729|SM-T2558|GT-I9205|SM-G9350|SM-J120F", "LG": "\\bLG\\b;|LG[- ]?(C800|C900|E400|E610|E900|E-900|F160|F180K|F180L|F180S|730|855|L160|LS740|LS840|LS970|LU6200|MS690|MS695|MS770|MS840|MS870|MS910|P500|P700|P705|VM696|AS680|AS695|AX840|C729|E970|GS505|272|C395|E739BK|E960|L55C|L75C|LS696|LS860|P769BK|P350|P500|P509|P870|UN272|US730|VS840|VS950|LN272|LN510|LS670|LS855|LW690|MN270|MN510|P509|P769|P930|UN200|UN270|UN510|UN610|US670|US740|US760|UX265|UX840|VN271|VN530|VS660|VS700|VS740|VS750|VS910|VS920|VS930|VX9200|VX11000|AX840A|LW770|P506|P925|P999|E612|D955|D802|MS323)", "Sony": "SonyST|SonyLT|SonyEricsson|SonyEricssonLT15iv|LT18i|E10i|LT28h|LT26w|SonyEricssonMT27i|C5303|C6902|C6903|C6906|C6943|D2533", "Asus": "Asus.*Galaxy|PadFone.*Mobile", "NokiaLumia": "Lumia [0-9]{3,4}", "Micromax": "Micromax.*\\b(A210|A92|A88|A72|A111|A110Q|A115|A116|A110|A90S|A26|A51|A35|A54|A25|A27|A89|A68|A65|A57|A90)\\b", "Palm": "PalmSource|Palm", "Vertu": "Vertu|Vertu.*Ltd|Vertu.*Ascent|Vertu.*Ayxta|Vertu.*Constellation(F|Quest)?|Vertu.*Monika|Vertu.*Signature", "Pantech": "PANTECH|IM-A850S|IM-A840S|IM-A830L|IM-A830K|IM-A830S|IM-A820L|IM-A810K|IM-A810S|IM-A800S|IM-T100K|IM-A725L|IM-A780L|IM-A775C|IM-A770K|IM-A760S|IM-A750K|IM-A740S|IM-A730S|IM-A720L|IM-A710K|IM-A690L|IM-A690S|IM-A650S|IM-A630K|IM-A600S|VEGA PTL21|PT003|P8010|ADR910L|P6030|P6020|P9070|P4100|P9060|P5000|CDM8992|TXT8045|ADR8995|IS11PT|P2030|P6010|P8000|PT002|IS06|CDM8999|P9050|PT001|TXT8040|P2020|P9020|P2000|P7040|P7000|C790", "Fly": "IQ230|IQ444|IQ450|IQ440|IQ442|IQ441|IQ245|IQ256|IQ236|IQ255|IQ235|IQ245|IQ275|IQ240|IQ285|IQ280|IQ270|IQ260|IQ250", "Wiko": "KITE 4G|HIGHWAY|GETAWAY|STAIRWAY|DARKSIDE|DARKFULL|DARKNIGHT|DARKMOON|SLIDE|WAX 4G|RAINBOW|BLOOM|SUNSET|GOA(?!nna)|LENNY|BARRY|IGGY|OZZY|CINK FIVE|CINK PEAX|CINK PEAX 2|CINK SLIM|CINK SLIM 2|CINK +|CINK KING|CINK PEAX|CINK SLIM|SUBLIM", "iMobile": "i-mobile (IQ|i-STYLE|idea|ZAA|Hitz)", "SimValley": "\\b(SP-80|XT-930|SX-340|XT-930|SX-310|SP-360|SP60|SPT-800|SP-120|SPT-800|SP-140|SPX-5|SPX-8|SP-100|SPX-8|SPX-12)\\b", "Wolfgang": "AT-B24D|AT-AS50HD|AT-AS40W|AT-AS55HD|AT-AS45q2|AT-B26D|AT-AS50Q", "Alcatel": "Alcatel", "Nintendo": "Nintendo 3DS", "Amoi": "Amoi", "INQ": "INQ", "GenericPhone": "Tapatalk|PDA;|SAGEM|\\bmmp\\b|pocket|\\bpsp\\b|symbian|Smartphone|smartfon|treo|up.browser|up.link|vodafone|\\bwap\\b|nokia|Series40|Series60|S60|SonyEricsson|N900|MAUI.*WAP.*Browser" }, "tablets": { "iPad": "iPad|iPad.*Mobile", "NexusTablet": "Android.*Nexus[\\s]+(7|9|10)", "SamsungTablet": "SAMSUNG.*Tablet|Galaxy.*Tab|SC-01C|GT-P1000|GT-P1003|GT-P1010|GT-P3105|GT-P6210|GT-P6800|GT-P6810|GT-P7100|GT-P7300|GT-P7310|GT-P7500|GT-P7510|SCH-I800|SCH-I815|SCH-I905|SGH-I957|SGH-I987|SGH-T849|SGH-T859|SGH-T869|SPH-P100|GT-P3100|GT-P3108|GT-P3110|GT-P5100|GT-P5110|GT-P6200|GT-P7320|GT-P7511|GT-N8000|GT-P8510|SGH-I497|SPH-P500|SGH-T779|SCH-I705|SCH-I915|GT-N8013|GT-P3113|GT-P5113|GT-P8110|GT-N8010|GT-N8005|GT-N8020|GT-P1013|GT-P6201|GT-P7501|GT-N5100|GT-N5105|GT-N5110|SHV-E140K|SHV-E140L|SHV-E140S|SHV-E150S|SHV-E230K|SHV-E230L|SHV-E230S|SHW-M180K|SHW-M180L|SHW-M180S|SHW-M180W|SHW-M300W|SHW-M305W|SHW-M380K|SHW-M380S|SHW-M380W|SHW-M430W|SHW-M480K|SHW-M480S|SHW-M480W|SHW-M485W|SHW-M486W|SHW-M500W|GT-I9228|SCH-P739|SCH-I925|GT-I9200|GT-P5200|GT-P5210|GT-P5210X|SM-T311|SM-T310|SM-T310X|SM-T210|SM-T210R|SM-T211|SM-P600|SM-P601|SM-P605|SM-P900|SM-P901|SM-T217|SM-T217A|SM-T217S|SM-P6000|SM-T3100|SGH-I467|XE500|SM-T110|GT-P5220|GT-I9200X|GT-N5110X|GT-N5120|SM-P905|SM-T111|SM-T2105|SM-T315|SM-T320|SM-T320X|SM-T321|SM-T520|SM-T525|SM-T530NU|SM-T230NU|SM-T330NU|SM-T900|XE500T1C|SM-P605V|SM-P905V|SM-T337V|SM-T537V|SM-T707V|SM-T807V|SM-P600X|SM-P900X|SM-T210X|SM-T230|SM-T230X|SM-T325|GT-P7503|SM-T531|SM-T330|SM-T530|SM-T705|SM-T705C|SM-T535|SM-T331|SM-T800|SM-T700|SM-T537|SM-T807|SM-P907A|SM-T337A|SM-T537A|SM-T707A|SM-T807A|SM-T237|SM-T807P|SM-P607T|SM-T217T|SM-T337T|SM-T807T|SM-T116NQ|SM-P550|SM-T350|SM-T550|SM-T9000|SM-P9000|SM-T705Y|SM-T805|GT-P3113|SM-T710|SM-T810|SM-T815|SM-T360|SM-T533|SM-T113|SM-T335|SM-T715|SM-T560|SM-T670|SM-T677|SM-T377|SM-T567|SM-T357T|SM-T555|SM-T561", "Kindle": "Kindle|Silk.*Accelerated|Android.*\\b(KFOT|KFTT|KFJWI|KFJWA|KFOTE|KFSOWI|KFTHWI|KFTHWA|KFAPWI|KFAPWA|WFJWAE|KFSAWA|KFSAWI|KFASWI|KFARWI)\\b", "SurfaceTablet": "Windows NT [0-9.]+; ARM;.*(Tablet|ARMBJS)", "HPTablet": "HP Slate (7|8|10)|HP ElitePad 900|hp-tablet|EliteBook.*Touch|HP 8|Slate 21|HP SlateBook 10", "AsusTablet": "^.*PadFone((?!Mobile).)*$|Transformer|TF101|TF101G|TF300T|TF300TG|TF300TL|TF700T|TF700KL|TF701T|TF810C|ME171|ME301T|ME302C|ME371MG|ME370T|ME372MG|ME172V|ME173X|ME400C|Slider SL101|\\bK00F\\b|\\bK00C\\b|\\bK00E\\b|\\bK00L\\b|TX201LA|ME176C|ME102A|\\bM80TA\\b|ME372CL|ME560CG|ME372CG|ME302KL| K010 | K017 |ME572C|ME103K|ME170C|ME171C|\\bME70C\\b|ME581C|ME581CL|ME8510C|ME181C|P01Y|PO1MA", "BlackBerryTablet": "PlayBook|RIM Tablet", "HTCtablet": "HTC_Flyer_P512|HTC Flyer|HTC Jetstream|HTC-P715a|HTC EVO View 4G|PG41200|PG09410", "MotorolaTablet": "xoom|sholest|MZ615|MZ605|MZ505|MZ601|MZ602|MZ603|MZ604|MZ606|MZ607|MZ608|MZ609|MZ615|MZ616|MZ617", "NookTablet": "Android.*Nook|NookColor|nook browser|BNRV200|BNRV200A|BNTV250|BNTV250A|BNTV400|BNTV600|LogicPD Zoom2", "AcerTablet": "Android.*; \\b(A100|A101|A110|A200|A210|A211|A500|A501|A510|A511|A700|A701|W500|W500P|W501|W501P|W510|W511|W700|G100|G100W|B1-A71|B1-710|B1-711|A1-810|A1-811|A1-830)\\b|W3-810|\\bA3-A10\\b|\\bA3-A11\\b|\\bA3-A20", "ToshibaTablet": "Android.*(AT100|AT105|AT200|AT205|AT270|AT275|AT300|AT305|AT1S5|AT500|AT570|AT700|AT830)|TOSHIBA.*FOLIO", "LGTablet": "\\bL-06C|LG-V909|LG-V900|LG-V700|LG-V510|LG-V500|LG-V410|LG-V400|LG-VK810\\b", "FujitsuTablet": "Android.*\\b(F-01D|F-02F|F-05E|F-10D|M532|Q572)\\b", "PrestigioTablet": "PMP3170B|PMP3270B|PMP3470B|PMP7170B|PMP3370B|PMP3570C|PMP5870C|PMP3670B|PMP5570C|PMP5770D|PMP3970B|PMP3870C|PMP5580C|PMP5880D|PMP5780D|PMP5588C|PMP7280C|PMP7280C3G|PMP7280|PMP7880D|PMP5597D|PMP5597|PMP7100D|PER3464|PER3274|PER3574|PER3884|PER5274|PER5474|PMP5097CPRO|PMP5097|PMP7380D|PMP5297C|PMP5297C_QUAD|PMP812E|PMP812E3G|PMP812F|PMP810E|PMP880TD|PMT3017|PMT3037|PMT3047|PMT3057|PMT7008|PMT5887|PMT5001|PMT5002", "LenovoTablet": "Lenovo TAB|Idea(Tab|Pad)( A1|A10| K1|)|ThinkPad([ ]+)?Tablet|YT3-X90L|YT3-X90F|YT3-X90X|Lenovo.*(S2109|S2110|S5000|S6000|K3011|A3000|A3500|A1000|A2107|A2109|A1107|A5500|A7600|B6000|B8000|B8080)(-|)(FL|F|HV|H|)", "DellTablet": "Venue 11|Venue 8|Venue 7|Dell Streak 10|Dell Streak 7", "YarvikTablet": "Android.*\\b(TAB210|TAB211|TAB224|TAB250|TAB260|TAB264|TAB310|TAB360|TAB364|TAB410|TAB411|TAB420|TAB424|TAB450|TAB460|TAB461|TAB464|TAB465|TAB467|TAB468|TAB07-100|TAB07-101|TAB07-150|TAB07-151|TAB07-152|TAB07-200|TAB07-201-3G|TAB07-210|TAB07-211|TAB07-212|TAB07-214|TAB07-220|TAB07-400|TAB07-485|TAB08-150|TAB08-200|TAB08-201-3G|TAB08-201-30|TAB09-100|TAB09-211|TAB09-410|TAB10-150|TAB10-201|TAB10-211|TAB10-400|TAB10-410|TAB13-201|TAB274EUK|TAB275EUK|TAB374EUK|TAB462EUK|TAB474EUK|TAB9-200)\\b", "MedionTablet": "Android.*\\bOYO\\b|LIFE.*(P9212|P9514|P9516|S9512)|LIFETAB", "ArnovaTablet": "AN10G2|AN7bG3|AN7fG3|AN8G3|AN8cG3|AN7G3|AN9G3|AN7dG3|AN7dG3ST|AN7dG3ChildPad|AN10bG3|AN10bG3DT|AN9G2", "IntensoTablet": "INM8002KP|INM1010FP|INM805ND|Intenso Tab|TAB1004", "IRUTablet": "M702pro", "MegafonTablet": "MegaFon V9|\\bZTE V9\\b|Android.*\\bMT7A\\b", "EbodaTablet": "E-Boda (Supreme|Impresspeed|Izzycomm|Essential)", "AllViewTablet": "Allview.*(Viva|Alldro|City|Speed|All TV|Frenzy|Quasar|Shine|TX1|AX1|AX2)", "ArchosTablet": "\\b(101G9|80G9|A101IT)\\b|Qilive 97R|Archos5|\\bARCHOS (70|79|80|90|97|101|FAMILYPAD|)(b|)(G10| Cobalt| TITANIUM(HD|)| Xenon| Neon|XSK| 2| XS 2| PLATINUM| CARBON|GAMEPAD)\\b", "AinolTablet": "NOVO7|NOVO8|NOVO10|Novo7Aurora|Novo7Basic|NOVO7PALADIN|novo9-Spark", "NokiaLumiaTablet": "Lumia 2520", "SonyTablet": "Sony.*Tablet|Xperia Tablet|Sony Tablet S|SO-03E|SGPT12|SGPT13|SGPT114|SGPT121|SGPT122|SGPT123|SGPT111|SGPT112|SGPT113|SGPT131|SGPT132|SGPT133|SGPT211|SGPT212|SGPT213|SGP311|SGP312|SGP321|EBRD1101|EBRD1102|EBRD1201|SGP351|SGP341|SGP511|SGP512|SGP521|SGP541|SGP551|SGP621|SGP612|SOT31", "PhilipsTablet": "\\b(PI2010|PI3000|PI3100|PI3105|PI3110|PI3205|PI3210|PI3900|PI4010|PI7000|PI7100)\\b", "CubeTablet": "Android.*(K8GT|U9GT|U10GT|U16GT|U17GT|U18GT|U19GT|U20GT|U23GT|U30GT)|CUBE U8GT", "CobyTablet": "MID1042|MID1045|MID1125|MID1126|MID7012|MID7014|MID7015|MID7034|MID7035|MID7036|MID7042|MID7048|MID7127|MID8042|MID8048|MID8127|MID9042|MID9740|MID9742|MID7022|MID7010", "MIDTablet": "M9701|M9000|M9100|M806|M1052|M806|T703|MID701|MID713|MID710|MID727|MID760|MID830|MID728|MID933|MID125|MID810|MID732|MID120|MID930|MID800|MID731|MID900|MID100|MID820|MID735|MID980|MID130|MID833|MID737|MID960|MID135|MID860|MID736|MID140|MID930|MID835|MID733|MID4X10", "MSITablet": "MSI \\b(Primo 73K|Primo 73L|Primo 81L|Primo 77|Primo 93|Primo 75|Primo 76|Primo 73|Primo 81|Primo 91|Primo 90|Enjoy 71|Enjoy 7|Enjoy 10)\\b", "SMiTTablet": "Android.*(\\bMID\\b|MID-560|MTV-T1200|MTV-PND531|MTV-P1101|MTV-PND530)", "RockChipTablet": "Android.*(RK2818|RK2808A|RK2918|RK3066)|RK2738|RK2808A", "FlyTablet": "IQ310|Fly Vision", "bqTablet": "Android.*(bq)?.*(Elcano|Curie|Edison|Maxwell|Kepler|Pascal|Tesla|Hypatia|Platon|Newton|Livingstone|Cervantes|Avant|Aquaris E10)|Maxwell.*Lite|Maxwell.*Plus", "HuaweiTablet": "MediaPad|MediaPad 7 Youth|IDEOS S7|S7-201c|S7-202u|S7-101|S7-103|S7-104|S7-105|S7-106|S7-201|S7-Slim", "NecTablet": "\\bN-06D|\\bN-08D", "PantechTablet": "Pantech.*P4100", "BronchoTablet": "Broncho.*(N701|N708|N802|a710)", "VersusTablet": "TOUCHPAD.*[78910]|\\bTOUCHTAB\\b", "ZyncTablet": "z1000|Z99 2G|z99|z930|z999|z990|z909|Z919|z900", "PositivoTablet": "TB07STA|TB10STA|TB07FTA|TB10FTA", "NabiTablet": "Android.*\\bNabi", "KoboTablet": "Kobo Touch|\\bK080\\b|\\bVox\\b Build|\\bArc\\b Build", "DanewTablet": "DSlide.*\\b(700|701R|702|703R|704|802|970|971|972|973|974|1010|1012)\\b", "TexetTablet": "NaviPad|TB-772A|TM-7045|TM-7055|TM-9750|TM-7016|TM-7024|TM-7026|TM-7041|TM-7043|TM-7047|TM-8041|TM-9741|TM-9747|TM-9748|TM-9751|TM-7022|TM-7021|TM-7020|TM-7011|TM-7010|TM-7023|TM-7025|TM-7037W|TM-7038W|TM-7027W|TM-9720|TM-9725|TM-9737W|TM-1020|TM-9738W|TM-9740|TM-9743W|TB-807A|TB-771A|TB-727A|TB-725A|TB-719A|TB-823A|TB-805A|TB-723A|TB-715A|TB-707A|TB-705A|TB-709A|TB-711A|TB-890HD|TB-880HD|TB-790HD|TB-780HD|TB-770HD|TB-721HD|TB-710HD|TB-434HD|TB-860HD|TB-840HD|TB-760HD|TB-750HD|TB-740HD|TB-730HD|TB-722HD|TB-720HD|TB-700HD|TB-500HD|TB-470HD|TB-431HD|TB-430HD|TB-506|TB-504|TB-446|TB-436|TB-416|TB-146SE|TB-126SE", "PlaystationTablet": "Playstation.*(Portable|Vita)", "TrekstorTablet": "ST10416-1|VT10416-1|ST70408-1|ST702xx-1|ST702xx-2|ST80208|ST97216|ST70104-2|VT10416-2|ST10216-2A|SurfTab", "PyleAudioTablet": "\\b(PTBL10CEU|PTBL10C|PTBL72BC|PTBL72BCEU|PTBL7CEU|PTBL7C|PTBL92BC|PTBL92BCEU|PTBL9CEU|PTBL9CUK|PTBL9C)\\b", "AdvanTablet": "Android.* \\b(E3A|T3X|T5C|T5B|T3E|T3C|T3B|T1J|T1F|T2A|T1H|T1i|E1C|T1-E|T5-A|T4|E1-B|T2Ci|T1-B|T1-D|O1-A|E1-A|T1-A|T3A|T4i)\\b ", "DanyTechTablet": "Genius Tab G3|Genius Tab S2|Genius Tab Q3|Genius Tab G4|Genius Tab Q4|Genius Tab G-II|Genius TAB GII|Genius TAB GIII|Genius Tab S1", "GalapadTablet": "Android.*\\bG1\\b", "MicromaxTablet": "Funbook|Micromax.*\\b(P250|P560|P360|P362|P600|P300|P350|P500|P275)\\b", "KarbonnTablet": "Android.*\\b(A39|A37|A34|ST8|ST10|ST7|Smart Tab3|Smart Tab2)\\b", "AllFineTablet": "Fine7 Genius|Fine7 Shine|Fine7 Air|Fine8 Style|Fine9 More|Fine10 Joy|Fine11 Wide", "PROSCANTablet": "\\b(PEM63|PLT1023G|PLT1041|PLT1044|PLT1044G|PLT1091|PLT4311|PLT4311PL|PLT4315|PLT7030|PLT7033|PLT7033D|PLT7035|PLT7035D|PLT7044K|PLT7045K|PLT7045KB|PLT7071KG|PLT7072|PLT7223G|PLT7225G|PLT7777G|PLT7810K|PLT7849G|PLT7851G|PLT7852G|PLT8015|PLT8031|PLT8034|PLT8036|PLT8080K|PLT8082|PLT8088|PLT8223G|PLT8234G|PLT8235G|PLT8816K|PLT9011|PLT9045K|PLT9233G|PLT9735|PLT9760G|PLT9770G)\\b", "YONESTablet": "BQ1078|BC1003|BC1077|RK9702|BC9730|BC9001|IT9001|BC7008|BC7010|BC708|BC728|BC7012|BC7030|BC7027|BC7026", "ChangJiaTablet": "TPC7102|TPC7103|TPC7105|TPC7106|TPC7107|TPC7201|TPC7203|TPC7205|TPC7210|TPC7708|TPC7709|TPC7712|TPC7110|TPC8101|TPC8103|TPC8105|TPC8106|TPC8203|TPC8205|TPC8503|TPC9106|TPC9701|TPC97101|TPC97103|TPC97105|TPC97106|TPC97111|TPC97113|TPC97203|TPC97603|TPC97809|TPC97205|TPC10101|TPC10103|TPC10106|TPC10111|TPC10203|TPC10205|TPC10503", "GUTablet": "TX-A1301|TX-M9002|Q702|kf026", "PointOfViewTablet": "TAB-P506|TAB-navi-7-3G-M|TAB-P517|TAB-P-527|TAB-P701|TAB-P703|TAB-P721|TAB-P731N|TAB-P741|TAB-P825|TAB-P905|TAB-P925|TAB-PR945|TAB-PL1015|TAB-P1025|TAB-PI1045|TAB-P1325|TAB-PROTAB[0-9]+|TAB-PROTAB25|TAB-PROTAB26|TAB-PROTAB27|TAB-PROTAB26XL|TAB-PROTAB2-IPS9|TAB-PROTAB30-IPS9|TAB-PROTAB25XXL|TAB-PROTAB26-IPS10|TAB-PROTAB30-IPS10", "OvermaxTablet": "OV-(SteelCore|NewBase|Basecore|Baseone|Exellen|Quattor|EduTab|Solution|ACTION|BasicTab|TeddyTab|MagicTab|Stream|TB-08|TB-09)", "HCLTablet": "HCL.*Tablet|Connect-3G-2.0|Connect-2G-2.0|ME Tablet U1|ME Tablet U2|ME Tablet G1|ME Tablet X1|ME Tablet Y2|ME Tablet Sync", "DPSTablet": "DPS Dream 9|DPS Dual 7", "VistureTablet": "V97 HD|i75 3G|Visture V4( HD)?|Visture V5( HD)?|Visture V10", "CrestaTablet": "CTP(-)?810|CTP(-)?818|CTP(-)?828|CTP(-)?838|CTP(-)?888|CTP(-)?978|CTP(-)?980|CTP(-)?987|CTP(-)?988|CTP(-)?989", "MediatekTablet": "\\bMT8125|MT8389|MT8135|MT8377\\b", "ConcordeTablet": "Concorde([ ]+)?Tab|ConCorde ReadMan", "GoCleverTablet": "GOCLEVER TAB|A7GOCLEVER|M1042|M7841|M742|R1042BK|R1041|TAB A975|TAB A7842|TAB A741|TAB A741L|TAB M723G|TAB M721|TAB A1021|TAB I921|TAB R721|TAB I720|TAB T76|TAB R70|TAB R76.2|TAB R106|TAB R83.2|TAB M813G|TAB I721|GCTA722|TAB I70|TAB I71|TAB S73|TAB R73|TAB R74|TAB R93|TAB R75|TAB R76.1|TAB A73|TAB A93|TAB A93.2|TAB T72|TAB R83|TAB R974|TAB R973|TAB A101|TAB A103|TAB A104|TAB A104.2|R105BK|M713G|A972BK|TAB A971|TAB R974.2|TAB R104|TAB R83.3|TAB A1042", "ModecomTablet": "FreeTAB 9000|FreeTAB 7.4|FreeTAB 7004|FreeTAB 7800|FreeTAB 2096|FreeTAB 7.5|FreeTAB 1014|FreeTAB 1001 |FreeTAB 8001|FreeTAB 9706|FreeTAB 9702|FreeTAB 7003|FreeTAB 7002|FreeTAB 1002|FreeTAB 7801|FreeTAB 1331|FreeTAB 1004|FreeTAB 8002|FreeTAB 8014|FreeTAB 9704|FreeTAB 1003", "VoninoTablet": "\\b(Argus[ _]?S|Diamond[ _]?79HD|Emerald[ _]?78E|Luna[ _]?70C|Onyx[ _]?S|Onyx[ _]?Z|Orin[ _]?HD|Orin[ _]?S|Otis[ _]?S|SpeedStar[ _]?S|Magnet[ _]?M9|Primus[ _]?94[ _]?3G|Primus[ _]?94HD|Primus[ _]?QS|Android.*\\bQ8\\b|Sirius[ _]?EVO[ _]?QS|Sirius[ _]?QS|Spirit[ _]?S)\\b", "ECSTablet": "V07OT2|TM105A|S10OT1|TR10CS1", "StorexTablet": "eZee[_']?(Tab|Go)[0-9]+|TabLC7|Looney Tunes Tab", "VodafoneTablet": "SmartTab([ ]+)?[0-9]+|SmartTabII10|SmartTabII7|VF-1497", "EssentielBTablet": "Smart[ ']?TAB[ ]+?[0-9]+|Family[ ']?TAB2", "RossMoorTablet": "RM-790|RM-997|RMD-878G|RMD-974R|RMT-705A|RMT-701|RME-601|RMT-501|RMT-711", "iMobileTablet": "i-mobile i-note", "TolinoTablet": "tolino tab [0-9.]+|tolino shine", "AudioSonicTablet": "\\bC-22Q|T7-QC|T-17B|T-17P\\b", "AMPETablet": "Android.* A78 ", "SkkTablet": "Android.* (SKYPAD|PHOENIX|CYCLOPS)", "TecnoTablet": "TECNO P9", "JXDTablet": "Android.* \\b(F3000|A3300|JXD5000|JXD3000|JXD2000|JXD300B|JXD300|S5800|S7800|S602b|S5110b|S7300|S5300|S602|S603|S5100|S5110|S601|S7100a|P3000F|P3000s|P101|P200s|P1000m|P200m|P9100|P1000s|S6600b|S908|P1000|P300|S18|S6600|S9100)\\b", "iJoyTablet": "Tablet (Spirit 7|Essentia|Galatea|Fusion|Onix 7|Landa|Titan|Scooby|Deox|Stella|Themis|Argon|Unique 7|Sygnus|Hexen|Finity 7|Cream|Cream X2|Jade|Neon 7|Neron 7|Kandy|Scape|Saphyr 7|Rebel|Biox|Rebel|Rebel 8GB|Myst|Draco 7|Myst|Tab7-004|Myst|Tadeo Jones|Tablet Boing|Arrow|Draco Dual Cam|Aurix|Mint|Amity|Revolution|Finity 9|Neon 9|T9w|Amity 4GB Dual Cam|Stone 4GB|Stone 8GB|Andromeda|Silken|X2|Andromeda II|Halley|Flame|Saphyr 9,7|Touch 8|Planet|Triton|Unique 10|Hexen 10|Memphis 4GB|Memphis 8GB|Onix 10)", "FX2Tablet": "FX2 PAD7|FX2 PAD10", "XoroTablet": "KidsPAD 701|PAD[ ]?712|PAD[ ]?714|PAD[ ]?716|PAD[ ]?717|PAD[ ]?718|PAD[ ]?720|PAD[ ]?721|PAD[ ]?722|PAD[ ]?790|PAD[ ]?792|PAD[ ]?900|PAD[ ]?9715D|PAD[ ]?9716DR|PAD[ ]?9718DR|PAD[ ]?9719QR|PAD[ ]?9720QR|TelePAD1030|Telepad1032|TelePAD730|TelePAD731|TelePAD732|TelePAD735Q|TelePAD830|TelePAD9730|TelePAD795|MegaPAD 1331|MegaPAD 1851|MegaPAD 2151", "ViewsonicTablet": "ViewPad 10pi|ViewPad 10e|ViewPad 10s|ViewPad E72|ViewPad7|ViewPad E100|ViewPad 7e|ViewSonic VB733|VB100a", "OdysTablet": "LOOX|XENO10|ODYS[ -](Space|EVO|Xpress|NOON)|\\bXELIO\\b|Xelio10Pro|XELIO7PHONETAB|XELIO10EXTREME|XELIOPT2|NEO_QUAD10", "CaptivaTablet": "CAPTIVA PAD", "IconbitTablet": "NetTAB|NT-3702|NT-3702S|NT-3702S|NT-3603P|NT-3603P|NT-0704S|NT-0704S|NT-3805C|NT-3805C|NT-0806C|NT-0806C|NT-0909T|NT-0909T|NT-0907S|NT-0907S|NT-0902S|NT-0902S", "TeclastTablet": "T98 4G|\\bP80\\b|\\bX90HD\\b|X98 Air|X98 Air 3G|\\bX89\\b|P80 3G|\\bX80h\\b|P98 Air|\\bX89HD\\b|P98 3G|\\bP90HD\\b|P89 3G|X98 3G|\\bP70h\\b|P79HD 3G|G18d 3G|\\bP79HD\\b|\\bP89s\\b|\\bA88\\b|\\bP10HD\\b|\\bP19HD\\b|G18 3G|\\bP78HD\\b|\\bA78\\b|\\bP75\\b|G17s 3G|G17h 3G|\\bP85t\\b|\\bP90\\b|\\bP11\\b|\\bP98t\\b|\\bP98HD\\b|\\bG18d\\b|\\bP85s\\b|\\bP11HD\\b|\\bP88s\\b|\\bA80HD\\b|\\bA80se\\b|\\bA10h\\b|\\bP89\\b|\\bP78s\\b|\\bG18\\b|\\bP85\\b|\\bA70h\\b|\\bA70\\b|\\bG17\\b|\\bP18\\b|\\bA80s\\b|\\bA11s\\b|\\bP88HD\\b|\\bA80h\\b|\\bP76s\\b|\\bP76h\\b|\\bP98\\b|\\bA10HD\\b|\\bP78\\b|\\bP88\\b|\\bA11\\b|\\bA10t\\b|\\bP76a\\b|\\bP76t\\b|\\bP76e\\b|\\bP85HD\\b|\\bP85a\\b|\\bP86\\b|\\bP75HD\\b|\\bP76v\\b|\\bA12\\b|\\bP75a\\b|\\bA15\\b|\\bP76Ti\\b|\\bP81HD\\b|\\bA10\\b|\\bT760VE\\b|\\bT720HD\\b|\\bP76\\b|\\bP73\\b|\\bP71\\b|\\bP72\\b|\\bT720SE\\b|\\bC520Ti\\b|\\bT760\\b|\\bT720VE\\b|T720-3GE|T720-WiFi", "OndaTablet": "\\b(V975i|Vi30|VX530|V701|Vi60|V701s|Vi50|V801s|V719|Vx610w|VX610W|V819i|Vi10|VX580W|Vi10|V711s|V813|V811|V820w|V820|Vi20|V711|VI30W|V712|V891w|V972|V819w|V820w|Vi60|V820w|V711|V813s|V801|V819|V975s|V801|V819|V819|V818|V811|V712|V975m|V101w|V961w|V812|V818|V971|V971s|V919|V989|V116w|V102w|V973|Vi40)\\b[\\s]+", "JaytechTablet": "TPC-PA762", "BlaupunktTablet": "Endeavour 800NG|Endeavour 1010", "DigmaTablet": "\\b(iDx10|iDx9|iDx8|iDx7|iDxD7|iDxD8|iDsQ8|iDsQ7|iDsQ8|iDsD10|iDnD7|3TS804H|iDsQ11|iDj7|iDs10)\\b", "EvolioTablet": "ARIA_Mini_wifi|Aria[ _]Mini|Evolio X10|Evolio X7|Evolio X8|\\bEvotab\\b|\\bNeura\\b", "LavaTablet": "QPAD E704|\\bIvoryS\\b|E-TAB IVORY|\\bE-TAB\\b", "AocTablet": "MW0811|MW0812|MW0922|MTK8382|MW1031|MW0831|MW0821|MW0931|MW0712", "MpmanTablet": "MP11 OCTA|MP10 OCTA|MPQC1114|MPQC1004|MPQC994|MPQC974|MPQC973|MPQC804|MPQC784|MPQC780|\\bMPG7\\b|MPDCG75|MPDCG71|MPDC1006|MP101DC|MPDC9000|MPDC905|MPDC706HD|MPDC706|MPDC705|MPDC110|MPDC100|MPDC99|MPDC97|MPDC88|MPDC8|MPDC77|MP709|MID701|MID711|MID170|MPDC703|MPQC1010", "CelkonTablet": "CT695|CT888|CT[\\s]?910|CT7 Tab|CT9 Tab|CT3 Tab|CT2 Tab|CT1 Tab|C820|C720|\\bCT-1\\b", "WolderTablet": "miTab \\b(DIAMOND|SPACE|BROOKLYN|NEO|FLY|MANHATTAN|FUNK|EVOLUTION|SKY|GOCAR|IRON|GENIUS|POP|MINT|EPSILON|BROADWAY|JUMP|HOP|LEGEND|NEW AGE|LINE|ADVANCE|FEEL|FOLLOW|LIKE|LINK|LIVE|THINK|FREEDOM|CHICAGO|CLEVELAND|BALTIMORE-GH|IOWA|BOSTON|SEATTLE|PHOENIX|DALLAS|IN 101|MasterChef)\\b", "MiTablet": "\\bMI PAD\\b|\\bHM NOTE 1W\\b", "NibiruTablet": "Nibiru M1|Nibiru Jupiter One", "NexoTablet": "NEXO NOVA|NEXO 10|NEXO AVIO|NEXO FREE|NEXO GO|NEXO EVO|NEXO 3G|NEXO SMART|NEXO KIDDO|NEXO MOBI", "LeaderTablet": "TBLT10Q|TBLT10I|TBL-10WDKB|TBL-10WDKBO2013|TBL-W230V2|TBL-W450|TBL-W500|SV572|TBLT7I|TBA-AC7-8G|TBLT79|TBL-8W16|TBL-10W32|TBL-10WKB|TBL-W100", "UbislateTablet": "UbiSlate[\\s]?7C", "PocketBookTablet": "Pocketbook", "KocasoTablet": "\\b(TB-1207)\\b", "Hudl": "Hudl HT7S3|Hudl 2", "TelstraTablet": "T-Hub2", "GenericTablet": "Android.*\\b97D\\b|Tablet(?!.*PC)|BNTV250A|MID-WCDMA|LogicPD Zoom2|\\bA7EB\\b|CatNova8|A1_07|CT704|CT1002|\\bM721\\b|rk30sdk|\\bEVOTAB\\b|M758A|ET904|ALUMIUM10|Smartfren Tab|Endeavour 1010|Tablet-PC-4|Tagi Tab|\\bM6pro\\b|CT1020W|arc 10HD|\\bJolla\\b|\\bTP750\\b" }, "oss": { "androids": "Android", "BlackBerryOS": "blackberry|\\bBB10\\b|rim tablet os", "PalmOS": "PalmOS|avantgo|blazer|elaine|hiptop|palm|plucker|xiino", "SymbianOS": "Symbian|symbols|Series60|Series40|SYB-[0-9]+|\\bS60\\b", "WindowsMobileOS": "Windows CE.*(PPC|Smartphone|Mobile|[0-9]{3}x[0-9]{3})|Window Mobile|Windows Phone [0-9.]+|WCE;", "WindowsPhoneOS": "Windows Phone 10.0|Windows Phone 8.1|Windows Phone 8.0|Windows Phone OS|XBLWP7|ZuneWP7|Windows NT 6.[23]; ARM;", "iOS": "\\biPhone.*Mobile|\\biPod|\\biPad", "MeeGoOS": "MeeGo", "MaemoOS": "Maemo", "JavaOS": "J2ME\/|\\bMIDP\\b|\\bCLDC\\b", "webOS": "webOS|hpwOS", "badaOS": "\\bBada\\b", "BREWOS": "BREW" }, "uas": { "Vivaldi": "Vivaldi", "Chrome": "\\bCrMo\\b|CriOS|Android.*Chrome\/[.0-9]* (Mobile)?", "Dolfin": "\\bDolfin\\b", "Opera": "Opera.*Mini|Opera.*Mobi|Android.*Opera|Mobile.*OPR\/[0-9.]+|Coast\/[0-9.]+", "Skyfire": "Skyfire", "Edge": "Mobile Safari\/[.0-9]* Edge", "IE": "IEMobile|MSIEMobile", "Firefox": "fennec|firefox.*maemo|(Mobile|Tablet).*Firefox|Firefox.*Mobile", "Bolt": "bolt", "TeaShark": "teashark", "Blazer": "Blazer", "Safari": "Version.*Mobile.*Safari|Safari.*Mobile|MobileSafari", "Tizen": "Tizen", "UCBrowser": "UC.*Browser|UCWEB", "baiduboxapp": "baiduboxapp", "baidubrowser": "baidubrowser", "DiigoBrowser": "DiigoBrowser", "Puffin": "Puffin", "Mercury": "\\bMercury\\b", "ObigoBrowser": "Obigo", "NetFront": "NF-Browser", "GenericBrowser": "NokiaBrowser|OviBrowser|OneBrowser|TwonkyBeamBrowser|SEMC.*Browser|FlyFlow|Minimo|NetFront|Novarra-Vision|MQQBrowser|MicroMessenger", "PaleMoon": "Android.*PaleMoon|Mobile.*PaleMoon" }, "props": { "Mobile": "Mobile\/[VER]", "Build": "Build\/[VER]", "Version": "Version\/[VER]", "VendorID": "VendorID\/[VER]", "iPad": "iPad.*CPU[a-z ]+[VER]", "iPhone": "iPhone.*CPU[a-z ]+[VER]", "iPod": "iPod.*CPU[a-z ]+[VER]", "Kindle": "Kindle\/[VER]", "Chrome": [ "Chrome\/[VER]", "CriOS\/[VER]", "CrMo\/[VER]" ], "Coast": [ "Coast\/[VER]" ], "Dolfin": "Dolfin\/[VER]", "Firefox": "Firefox\/[VER]", "Fennec": "Fennec\/[VER]", "Edge": "Edge\/[VER]", "IE": [ "IEMobile\/[VER];", "IEMobile [VER]", "MSIE [VER];", "Trident\/[0-9.]+;.*rv:[VER]" ], "NetFront": "NetFront\/[VER]", "NokiaBrowser": "NokiaBrowser\/[VER]", "Opera": [ " OPR\/[VER]", "Opera Mini\/[VER]", "Version\/[VER]" ], "Opera Mini": "Opera Mini\/[VER]", "Opera Mobi": "Version\/[VER]", "UC Browser": "UC Browser[VER]", "MQQBrowser": "MQQBrowser\/[VER]", "MicroMessenger": "MicroMessenger\/[VER]", "baiduboxapp": "baiduboxapp\/[VER]", "baidubrowser": "baidubrowser\/[VER]", "Iron": "Iron\/[VER]", "Safari": [ "Version\/[VER]", "Safari\/[VER]" ], "Skyfire": "Skyfire\/[VER]", "Tizen": "Tizen\/[VER]", "Webkit": "webkit[ \/][VER]", "PaleMoon": "PaleMoon\/[VER]", "Gecko": "Gecko\/[VER]", "Trident": "Trident\/[VER]", "Presto": "Presto\/[VER]", "Goanna": "Goanna\/[VER]", "iOS": " \\bi?OS\\b [VER][ ;]{1}", "Android": "Android [VER]", "BlackBerry": [ "BlackBerry[\\w]+\/[VER]", "BlackBerry.*Version\/[VER]", "Version\/[VER]" ], "BREW": "BREW [VER]", "Java": "Java\/[VER]", "Windows Phone OS": [ "Windows Phone OS [VER]", "Windows Phone [VER]" ], "Windows Phone": "Windows Phone [VER]", "Windows CE": "Windows CE\/[VER]", "Windows NT": "Windows NT [VER]", "Symbian": [ "SymbianOS\/[VER]", "Symbian\/[VER]" ], "webOS": [ "webOS\/[VER]", "hpwOS\/[VER];" ] }, "utils": { "Bot": "Googlebot|facebookexternalhit|AdsBot-Google|Google Keyword Suggestion|Facebot|YandexBot|bingbot|ia_archiver|AhrefsBot|Ezooms|GSLFbot|WBSearchBot|Twitterbot|TweetmemeBot|Twikle|PaperLiBot|Wotbox|UnwindFetchor|Exabot|MJ12bot|YandexImages|TurnitinBot|Pingdom", "MobileBot": "Googlebot-Mobile|AdsBot-Google-Mobile|YahooSeeker\/M1A1-R2D2", "DesktopMode": "WPDesktop", "TV": "SonyDTV|HbbTV", "WebKit": "(webkit)[ \/]([\\w.]+)", "Console": "\\b(Nintendo|Nintendo WiiU|Nintendo 3DS|PLAYSTATION|Xbox)\\b", "Watch": "SM-V700" }}; // following patterns come from http://detectmobilebrowsers.com/ impl.detectMobileBrowsers = { fullPattern: /(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino/i, shortPattern: /1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i, tabletPattern: /android|ipad|playbook|silk/i }; var hasOwnProp = Object.prototype.hasOwnProperty, isArray; impl.FALLBACK_PHONE = 'UnknownPhone'; impl.FALLBACK_TABLET = 'UnknownTablet'; impl.FALLBACK_MOBILE = 'UnknownMobile'; isArray = ('isArray' in Array) ? Array.isArray : function (value) { return Object.prototype.toString.call(value) === '[object Array]'; }; isArray = 'isArray' in Array ? function (value) { return Object.prototype.toString.call(value) === '[object Array]'; } : Array.isArray; function equalIC(a, b) { return a != null && b != null && a.toLowerCase() === b.toLowerCase(); } function containsIC(array, value) { var valueLC, i, len = array.length; if (!len || !value) { return false; } valueLC = value.toLowerCase(); for (i = 0; i < len; ++i) { if (valueLC === array[i].toLowerCase()) { return true; } } return false; } function convertPropsToRegExp(object) { for (var key in object) { if (hasOwnProp.call(object, key)) { object[key] = new RegExp(object[key], 'i'); } } } (function init() { var key, values, value, i, len, verPos, mobileDetectRules = impl.mobileDetectRules; for (key in mobileDetectRules.props) { if (hasOwnProp.call(mobileDetectRules.props, key)) { values = mobileDetectRules.props[key]; if (!isArray(values)) { values = [values]; } len = values.length; for (i = 0; i < len; ++i) { value = values[i]; verPos = value.indexOf('[VER]'); if (verPos >= 0) { value = value.substring(0, verPos) + '([\\w._\\+]+)' + value.substring(verPos + 5); } values[i] = new RegExp(value, 'i'); } mobileDetectRules.props[key] = values; } } convertPropsToRegExp(mobileDetectRules.oss); convertPropsToRegExp(mobileDetectRules.phones); convertPropsToRegExp(mobileDetectRules.tablets); convertPropsToRegExp(mobileDetectRules.uas); convertPropsToRegExp(mobileDetectRules.utils); // copy some patterns to oss0 which are tested first (see issue#15) mobileDetectRules.oss0 = { WindowsPhoneOS: mobileDetectRules.oss.WindowsPhoneOS, WindowsMobileOS: mobileDetectRules.oss.WindowsMobileOS }; }()); /** * Test userAgent string against a set of rules and find the first matched key. * @param {Object} rules (key is String, value is RegExp) * @param {String} userAgent the navigator.userAgent (or HTTP-Header 'User-Agent'). * @returns {String|null} the matched key if found, otherwise null * @private */ impl.findMatch = function(rules, userAgent) { for (var key in rules) { if (hasOwnProp.call(rules, key)) { if (rules[key].test(userAgent)) { return key; } } } return null; }; /** * Test userAgent string against a set of rules and return an array of matched keys. * @param {Object} rules (key is String, value is RegExp) * @param {String} userAgent the navigator.userAgent (or HTTP-Header 'User-Agent'). * @returns {Array} an array of matched keys, may be empty when there is no match, but not null * @private */ impl.findMatches = function(rules, userAgent) { var result = []; for (var key in rules) { if (hasOwnProp.call(rules, key)) { if (rules[key].test(userAgent)) { result.push(key); } } } return result; }; /** * Check the version of the given property in the User-Agent. * * @param {String} propertyName * @param {String} userAgent * @return {String} version or null if version not found * @private */ impl.getVersionStr = function (propertyName, userAgent) { var props = impl.mobileDetectRules.props, patterns, i, len, match; if (hasOwnProp.call(props, propertyName)) { patterns = props[propertyName]; len = patterns.length; for (i = 0; i < len; ++i) { match = patterns[i].exec(userAgent); if (match !== null) { return match[1]; } } } return null; }; /** * Check the version of the given property in the User-Agent. * Will return a float number. (eg. 2_0 will return 2.0, 4.3.1 will return 4.31) * * @param {String} propertyName * @param {String} userAgent * @return {Number} version or NaN if version not found * @private */ impl.getVersion = function (propertyName, userAgent) { var version = impl.getVersionStr(propertyName, userAgent); return version ? impl.prepareVersionNo(version) : NaN; }; /** * Prepare the version number. * * @param {String} version * @return {Number} the version number as a floating number * @private */ impl.prepareVersionNo = function (version) { var numbers; numbers = version.split(/[a-z._ \/\-]/i); if (numbers.length === 1) { version = numbers[0]; } if (numbers.length > 1) { version = numbers[0] + '.'; numbers.shift(); version += numbers.join(''); } return Number(version); }; impl.isMobileFallback = function (userAgent) { return impl.detectMobileBrowsers.fullPattern.test(userAgent) || impl.detectMobileBrowsers.shortPattern.test(userAgent.substr(0,4)); }; impl.isTabletFallback = function (userAgent) { return impl.detectMobileBrowsers.tabletPattern.test(userAgent); }; impl.prepareDetectionCache = function (cache, userAgent, maxPhoneWidth) { if (cache.mobile !== undefined) { return; } var phone, tablet, phoneSized; // first check for stronger tablet rules, then phone (see issue#5) tablet = impl.findMatch(impl.mobileDetectRules.tablets, userAgent); if (tablet) { cache.mobile = cache.tablet = tablet; cache.phone = null; return; // unambiguously identified as tablet } phone = impl.findMatch(impl.mobileDetectRules.phones, userAgent); if (phone) { cache.mobile = cache.phone = phone; cache.tablet = null; return; // unambiguously identified as phone } // our rules haven't found a match -> try more general fallback rules if (impl.isMobileFallback(userAgent)) { phoneSized = MobileDetect.isPhoneSized(maxPhoneWidth); if (phoneSized === undefined) { cache.mobile = impl.FALLBACK_MOBILE; cache.tablet = cache.phone = null; } else if (phoneSized) { cache.mobile = cache.phone = impl.FALLBACK_PHONE; cache.tablet = null; } else { cache.mobile = cache.tablet = impl.FALLBACK_TABLET; cache.phone = null; } } else if (impl.isTabletFallback(userAgent)) { cache.mobile = cache.tablet = impl.FALLBACK_TABLET; cache.phone = null; } else { // not mobile at all! cache.mobile = cache.tablet = cache.phone = null; } }; // t is a reference to a MobileDetect instance impl.mobileGrade = function (t) { // impl note: // To keep in sync w/ Mobile_Detect.php easily, the following code is tightly aligned to the PHP version. // When changes are made in Mobile_Detect.php, copy this method and replace: // $this-> / t. // self::MOBILE_GRADE_(.) / '$1' // , self::VERSION_TYPE_FLOAT / (nothing) // isIOS() / os('iOS') // [reg] / (nothing) <-- jsdelivr complaining about unescaped unicode character U+00AE var $isMobile = t.mobile() !== null; if ( // Apple iOS 3.2-5.1 - Tested on the original iPad (4.3 / 5.0), iPad 2 (4.3), iPad 3 (5.1), original iPhone (3.1), iPhone 3 (3.2), 3GS (4.3), 4 (4.3 / 5.0), and 4S (5.1) t.os('iOS') && t.version('iPad')>=4.3 || t.os('iOS') && t.version('iPhone')>=3.1 || t.os('iOS') && t.version('iPod')>=3.1 || // Android 2.1-2.3 - Tested on the HTC Incredible (2.2), original Droid (2.2), HTC Aria (2.1), Google Nexus S (2.3). Functional on 1.5 & 1.6 but performance may be sluggish, tested on Google G1 (1.5) // Android 3.1 (Honeycomb) - Tested on the Samsung Galaxy Tab 10.1 and Motorola XOOM // Android 4.0 (ICS) - Tested on a Galaxy Nexus. Note: transition performance can be poor on upgraded devices // Android 4.1 (Jelly Bean) - Tested on a Galaxy Nexus and Galaxy 7 ( t.version('Android')>2.1 && t.is('Webkit') ) || // Windows Phone 7-7.5 - Tested on the HTC Surround (7.0) HTC Trophy (7.5), LG-E900 (7.5), Nokia Lumia 800 t.version('Windows Phone OS')>=7.0 || // Blackberry 7 - Tested on BlackBerry Torch 9810 // Blackberry 6.0 - Tested on the Torch 9800 and Style 9670 t.is('BlackBerry') && t.version('BlackBerry')>=6.0 || // Blackberry Playbook (1.0-2.0) - Tested on PlayBook t.match('Playbook.*Tablet') || // Palm WebOS (1.4-2.0) - Tested on the Palm Pixi (1.4), Pre (1.4), Pre 2 (2.0) ( t.version('webOS')>=1.4 && t.match('Palm|Pre|Pixi') ) || // Palm WebOS 3.0 - Tested on HP TouchPad t.match('hp.*TouchPad') || // Firefox Mobile (12 Beta) - Tested on Android 2.3 device ( t.is('Firefox') && t.version('Firefox')>=12 ) || // Chrome for Android - Tested on Android 4.0, 4.1 device ( t.is('Chrome') && t.is('androids') && t.version('Android')>=4.0 ) || // Skyfire 4.1 - Tested on Android 2.3 device ( t.is('Skyfire') && t.version('Skyfire')>=4.1 && t.is('androids') && t.version('Android')>=2.3 ) || // Opera Mobile 11.5-12: Tested on Android 2.3 ( t.is('Opera') && t.version('Opera Mobi')>11 && t.is('androids') ) || // Meego 1.2 - Tested on Nokia 950 and N9 t.is('MeeGoOS') || // Tizen (pre-release) - Tested on early hardware t.is('Tizen') || // Samsung Bada 2.0 - Tested on a Samsung Wave 3, Dolphin browser // @todo: more tests here! t.is('Dolfin') && t.version('Bada')>=2.0 || // UC Browser - Tested on Android 2.3 device ( (t.is('UC Browser') || t.is('Dolfin')) && t.version('Android')>=2.3 ) || // Kindle 3 and Fire - Tested on the built-in WebKit browser for each ( t.match('Kindle Fire') || t.is('Kindle') && t.version('Kindle')>=3.0 ) || // Nook Color 1.4.1 - Tested on original Nook Color, not Nook Tablet t.is('androids') && t.is('NookTablet') || // Chrome Desktop 11-21 - Tested on OS X 10.7 and Windows 7 t.version('Chrome')>=11 && !$isMobile || // Safari Desktop 4-5 - Tested on OS X 10.7 and Windows 7 t.version('Safari')>=5.0 && !$isMobile || // Firefox Desktop 4-13 - Tested on OS X 10.7 and Windows 7 t.version('Firefox')>=4.0 && !$isMobile || // Internet Explorer 7-9 - Tested on Windows XP, Vista and 7 t.version('MSIE')>=7.0 && !$isMobile || // Opera Desktop 10-12 - Tested on OS X 10.7 and Windows 7 // @reference: http://my.opera.com/community/openweb/idopera/ t.version('Opera')>=10 && !$isMobile ){ return 'A'; } if ( t.os('iOS') && t.version('iPad')<4.3 || t.os('iOS') && t.version('iPhone')<3.1 || t.os('iOS') && t.version('iPod')<3.1 || // Blackberry 5.0: Tested on the Storm 2 9550, Bold 9770 t.is('Blackberry') && t.version('BlackBerry')>=5 && t.version('BlackBerry')<6 || //Opera Mini (5.0-6.5) - Tested on iOS 3.2/4.3 and Android 2.3 ( t.version('Opera Mini')>=5.0 && t.version('Opera Mini')<=6.5 && (t.version('Android')>=2.3 || t.is('iOS')) ) || // Nokia Symbian^3 - Tested on Nokia N8 (Symbian^3), C7 (Symbian^3), also works on N97 (Symbian^1) t.match('NokiaN8|NokiaC7|N97.*Series60|Symbian/3') || // @todo: report this (tested on Nokia N71) t.version('Opera Mobi')>=11 && t.is('SymbianOS') ){ return 'B'; } if ( // Blackberry 4.x - Tested on the Curve 8330 t.version('BlackBerry')<5.0 || // Windows Mobile - Tested on the HTC Leo (WinMo 5.2) t.match('MSIEMobile|Windows CE.*Mobile') || t.version('Windows Mobile')<=5.2 ){ return 'C'; } //All older smartphone platforms and featurephones - Any device that doesn't support media queries //will receive the basic, C grade experience. return 'C'; }; impl.detectOS = function (ua) { return impl.findMatch(impl.mobileDetectRules.oss0, ua) || impl.findMatch(impl.mobileDetectRules.oss, ua); }; impl.getDeviceSmallerSide = function () { return window.screen.width < window.screen.height ? window.screen.width : window.screen.height; }; /** * Constructor for MobileDetect object. *
* Such an object will keep a reference to the given user-agent string and cache most of the detect queries.
*
* Find information how to download and install: * github.com/hgoebl/mobile-detect.js/ *
* * @example 
     *     var md = new MobileDetect(window.navigator.userAgent);     *     if (md.mobile()) {     *         location.href = (md.mobileGrade() === 'A') ? '/mobile/' : '/lynx/';     *     }     *
* * @param {string} userAgent typically taken from window.navigator.userAgent or http_header['User-Agent'] * @param {number} [maxPhoneWidth=600] only for browsers specify a value for the maximum * width of smallest device side (in logical "CSS" pixels) until a device detected as mobile will be handled * as phone. * This is only used in cases where the device cannot be classified as phone or tablet.
* See Declaring Tablet Layouts * for Android.
* If you provide a value < 0, then this "fuzzy" check is disabled. * @constructor * @global */ function MobileDetect(userAgent, maxPhoneWidth) { this.ua = userAgent || ''; this._cache = {}; //600dp is typical 7" tablet minimum width this.maxPhoneWidth = maxPhoneWidth || 600; } MobileDetect.prototype = { constructor: MobileDetect, /** * Returns the detected phone or tablet type or null if it is not a mobile device. *
* For a list of possible return values see {@link MobileDetect#phone} and {@link MobileDetect#tablet}.
*
* If the device is not detected by the regular expressions from Mobile-Detect, a test is made against * the patterns of detectmobilebrowsers.com. If this test * is positive, a value of UnknownPhone, UnknownTablet or * UnknownMobile is returned.
* When used in browser, the decision whether phone or tablet is made based on screen.width/height.
*
* When used server-side (node.js), there is no way to tell the difference between UnknownTablet * and UnknownMobile, so you will get UnknownMobile here.
* Be aware that since v1.0.0 in this special case you will get UnknownMobile only for: * {@link MobileDetect#mobile}, not for {@link MobileDetect#phone} and {@link MobileDetect#tablet}. * In versions before v1.0.0 all 3 methods returned UnknownMobile which was tedious to use. *
* In most cases you will use the return value just as a boolean. * * @returns {String} the key for the phone family or tablet family, e.g. "Nexus". * @function MobileDetect#mobile */ mobile: function () { impl.prepareDetectionCache(this._cache, this.ua, this.maxPhoneWidth); return this._cache.mobile; }, /** * Returns the detected phone type/family string or null. *
* The returned tablet (family or producer) is one of following keys:
*
iPhone, BlackBerry, HTC, Nexus, Dell, Motorola, Samsung, LG, Sony, Asus, * NokiaLumia, Micromax, Palm, Vertu, Pantech, Fly, Wiko, iMobile, SimValley, * Wolfgang, Alcatel, Nintendo, Amoi, INQ, GenericPhone
*
* If the device is not detected by the regular expressions from Mobile-Detect, a test is made against * the patterns of detectmobilebrowsers.com. If this test * is positive, a value of UnknownPhone or UnknownMobile is returned.
* When used in browser, the decision whether phone or tablet is made based on screen.width/height.
*
* When used server-side (node.js), there is no way to tell the difference between UnknownTablet * and UnknownMobile, so you will get null here, while {@link MobileDetect#mobile} * will return UnknownMobile.
* Be aware that since v1.0.0 in this special case you will get UnknownMobile only for: * {@link MobileDetect#mobile}, not for {@link MobileDetect#phone} and {@link MobileDetect#tablet}. * In versions before v1.0.0 all 3 methods returned UnknownMobile which was tedious to use. *
* In most cases you will use the return value just as a boolean. * * @returns {String} the key of the phone family or producer, e.g. "iPhone" * @function MobileDetect#phone */ phone: function () { impl.prepareDetectionCache(this._cache, this.ua, this.maxPhoneWidth); return this._cache.phone; }, /** * Returns the detected tablet type/family string or null. *
* The returned tablet (family or producer) is one of following keys:
*
iPad, NexusTablet, SamsungTablet, Kindle, SurfaceTablet, HPTablet, AsusTablet, * BlackBerryTablet, HTCtablet, MotorolaTablet, NookTablet, AcerTablet, * ToshibaTablet, LGTablet, FujitsuTablet, PrestigioTablet, LenovoTablet, * DellTablet, YarvikTablet, MedionTablet, ArnovaTablet, IntensoTablet, IRUTablet, * MegafonTablet, EbodaTablet, AllViewTablet, ArchosTablet, AinolTablet, * NokiaLumiaTablet, SonyTablet, PhilipsTablet, CubeTablet, CobyTablet, MIDTablet, * MSITablet, SMiTTablet, RockChipTablet, FlyTablet, bqTablet, HuaweiTablet, * NecTablet, PantechTablet, BronchoTablet, VersusTablet, ZyncTablet, * PositivoTablet, NabiTablet, KoboTablet, DanewTablet, TexetTablet, * PlaystationTablet, TrekstorTablet, PyleAudioTablet, AdvanTablet, * DanyTechTablet, GalapadTablet, MicromaxTablet, KarbonnTablet, AllFineTablet, * PROSCANTablet, YONESTablet, ChangJiaTablet, GUTablet, PointOfViewTablet, * OvermaxTablet, HCLTablet, DPSTablet, VistureTablet, CrestaTablet, * MediatekTablet, ConcordeTablet, GoCleverTablet, ModecomTablet, VoninoTablet, * ECSTablet, StorexTablet, VodafoneTablet, EssentielBTablet, RossMoorTablet, * iMobileTablet, TolinoTablet, AudioSonicTablet, AMPETablet, SkkTablet, * TecnoTablet, JXDTablet, iJoyTablet, FX2Tablet, XoroTablet, ViewsonicTablet, * OdysTablet, CaptivaTablet, IconbitTablet, TeclastTablet, OndaTablet, * JaytechTablet, BlaupunktTablet, DigmaTablet, EvolioTablet, LavaTablet, * AocTablet, MpmanTablet, CelkonTablet, WolderTablet, MiTablet, NibiruTablet, * NexoTablet, LeaderTablet, UbislateTablet, PocketBookTablet, KocasoTablet, Hudl, * TelstraTablet, GenericTablet
*
* If the device is not detected by the regular expressions from Mobile-Detect, a test is made against * the patterns of detectmobilebrowsers.com. If this test * is positive, a value of UnknownTablet or UnknownMobile is returned.
* When used in browser, the decision whether phone or tablet is made based on screen.width/height.
*
* When used server-side (node.js), there is no way to tell the difference between UnknownTablet * and UnknownMobile, so you will get null here, while {@link MobileDetect#mobile} * will return UnknownMobile.
* Be aware that since v1.0.0 in this special case you will get UnknownMobile only for: * {@link MobileDetect#mobile}, not for {@link MobileDetect#phone} and {@link MobileDetect#tablet}. * In versions before v1.0.0 all 3 methods returned UnknownMobile which was tedious to use. *
* In most cases you will use the return value just as a boolean. * * @returns {String} the key of the tablet family or producer, e.g. "SamsungTablet" * @function MobileDetect#tablet */ tablet: function () { impl.prepareDetectionCache(this._cache, this.ua, this.maxPhoneWidth); return this._cache.tablet; }, /** * Returns the (first) detected user-agent string or null. *
* The returned user-agent is one of following keys:
*
Vivaldi, Chrome, Dolfin, Opera, Skyfire, Edge, IE, Firefox, Bolt, TeaShark, * Blazer, Safari, Tizen, UCBrowser, baiduboxapp, baidubrowser, DiigoBrowser, * Puffin, Mercury, ObigoBrowser, NetFront, GenericBrowser, PaleMoon
*
* In most cases calling {@link MobileDetect#userAgent} will be sufficient. But there are rare * cases where a mobile device pretends to be more than one particular browser. You can get the * list of all matches with {@link MobileDetect#userAgents} or check for a particular value by * providing one of the defined keys as first argument to {@link MobileDetect#is}. * * @returns {String} the key for the detected user-agent or null * @function MobileDetect#userAgent */ userAgent: function () { if (this._cache.userAgent === undefined) { this._cache.userAgent = impl.findMatch(impl.mobileDetectRules.uas, this.ua); } return this._cache.userAgent; }, /** * Returns all detected user-agent strings. *
* The array is empty or contains one or more of following keys:
*
Vivaldi, Chrome, Dolfin, Opera, Skyfire, Edge, IE, Firefox, Bolt, TeaShark, * Blazer, Safari, Tizen, UCBrowser, baiduboxapp, baidubrowser, DiigoBrowser, * Puffin, Mercury, ObigoBrowser, NetFront, GenericBrowser, PaleMoon
*
* In most cases calling {@link MobileDetect#userAgent} will be sufficient. But there are rare * cases where a mobile device pretends to be more than one particular browser. You can get the * list of all matches with {@link MobileDetect#userAgents} or check for a particular value by * providing one of the defined keys as first argument to {@link MobileDetect#is}. * * @returns {Array} the array of detected user-agent keys or [] * @function MobileDetect#userAgents */ userAgents: function () { if (this._cache.userAgents === undefined) { this._cache.userAgents = impl.findMatches(impl.mobileDetectRules.uas, this.ua); } return this._cache.userAgents; }, /** * Returns the detected operating system string or null. *
* The operating system is one of following keys:
*
androids, BlackBerryOS, PalmOS, SymbianOS, WindowsMobileOS, WindowsPhoneOS, * iOS, MeeGoOS, MaemoOS, JavaOS, webOS, badaOS, BREWOS
* * @returns {String} the key for the detected operating system. * @function MobileDetect#os */ os: function () { if (this._cache.os === undefined) { this._cache.os = impl.detectOS(this.ua); } return this._cache.os; }, /** * Get the version (as Number) of the given property in the User-Agent. *
* Will return a float number. (eg. 2_0 will return 2.0, 4.3.1 will return 4.31) * * @param {String} key a key defining a thing which has a version.
* You can use one of following keys:
*
Mobile, Build, Version, VendorID, iPad, iPhone, iPod, Kindle, Chrome, Coast, * Dolfin, Firefox, Fennec, Edge, IE, NetFront, NokiaBrowser, Opera, Opera Mini, * Opera Mobi, UC Browser, MQQBrowser, MicroMessenger, baiduboxapp, baidubrowser, * Iron, Safari, Skyfire, Tizen, Webkit, PaleMoon, Gecko, Trident, Presto, Goanna, * iOS, Android, BlackBerry, BREW, Java, Windows Phone OS, Windows Phone, Windows * CE, Windows NT, Symbian, webOS
* * @returns {Number} the version as float or NaN if User-Agent doesn't contain this version. * Be careful when comparing this value with '==' operator! * @function MobileDetect#version */ version: function (key) { return impl.getVersion(key, this.ua); }, /** * Get the version (as String) of the given property in the User-Agent. *
* * @param {String} key a key defining a thing which has a version.
* You can use one of following keys:
*
Mobile, Build, Version, VendorID, iPad, iPhone, iPod, Kindle, Chrome, Coast, * Dolfin, Firefox, Fennec, Edge, IE, NetFront, NokiaBrowser, Opera, Opera Mini, * Opera Mobi, UC Browser, MQQBrowser, MicroMessenger, baiduboxapp, baidubrowser, * Iron, Safari, Skyfire, Tizen, Webkit, PaleMoon, Gecko, Trident, Presto, Goanna, * iOS, Android, BlackBerry, BREW, Java, Windows Phone OS, Windows Phone, Windows * CE, Windows NT, Symbian, webOS
* * @returns {String} the "raw" version as String or null if User-Agent doesn't contain this version. * * @function MobileDetect#versionStr */ versionStr: function (key) { return impl.getVersionStr(key, this.ua); }, /** * Global test key against userAgent, os, phone, tablet and some other properties of userAgent string. * * @param {String} key the key (case-insensitive) of a userAgent, an operating system, phone or * tablet family.
* For a complete list of possible values, see {@link MobileDetect#userAgent}, * {@link MobileDetect#os}, {@link MobileDetect#phone}, {@link MobileDetect#tablet}.
* Additionally you have following keys:
*
Bot, MobileBot, DesktopMode, TV, WebKit, Console, Watch
* * @returns {boolean} true when the given key is one of the defined keys of userAgent, os, phone, * tablet or one of the listed additional keys, otherwise false * @function MobileDetect#is */ is: function (key) { return containsIC(this.userAgents(), key) || equalIC(key, this.os()) || equalIC(key, this.phone()) || equalIC(key, this.tablet()) || containsIC(impl.findMatches(impl.mobileDetectRules.utils, this.ua), key); }, /** * Do a quick test against navigator::userAgent. * * @param {String|RegExp} pattern the pattern, either as String or RegExp * (a string will be converted to a case-insensitive RegExp). * @returns {boolean} true when the pattern matches, otherwise false * @function MobileDetect#match */ match: function (pattern) { if (!(pattern instanceof RegExp)) { pattern = new RegExp(pattern, 'i'); } return pattern.test(this.ua); }, /** * Checks whether the mobile device can be considered as phone regarding screen.width. *
* Obviously this method makes sense in browser environments only (not for Node.js)! * @param {number} [maxPhoneWidth] the maximum logical pixels (aka. CSS-pixels) to be considered as phone.
* The argument is optional and if not present or falsy, the value of the constructor is taken. * @returns {boolean|undefined} undefined if screen size wasn't detectable, else true * when screen.width is less or equal to maxPhoneWidth, otherwise false.
* Will always return undefined server-side. */ isPhoneSized: function (maxPhoneWidth) { return MobileDetect.isPhoneSized(maxPhoneWidth || this.maxPhoneWidth); }, /** * Returns the mobile grade ('A', 'B', 'C'). * * @returns {String} one of the mobile grades ('A', 'B', 'C'). * @function MobileDetect#mobileGrade */ mobileGrade: function () { if (this._cache.grade === undefined) { this._cache.grade = impl.mobileGrade(this); } return this._cache.grade; } }; // environment-dependent if (typeof window !== 'undefined' && window.screen) { MobileDetect.isPhoneSized = function (maxPhoneWidth) { return maxPhoneWidth < 0 ? undefined : impl.getDeviceSmallerSide() <= maxPhoneWidth; }; } else { MobileDetect.isPhoneSized = function () {}; } // should not be replaced by a completely new object - just overwrite existing methods MobileDetect._impl = impl; MobileDetect.version = '1.3.3 2016-07-31'; return MobileDetect;}) : any > : ^^^ >define : any > : ^^^ ->function () { 'use strict'; var impl = {}; impl.mobileDetectRules = { "phones": { "iPhone": "\\biPhone\\b|\\biPod\\b", "BlackBerry": "BlackBerry|\\bBB10\\b|rim[0-9]+", "HTC": "HTC|HTC.*(Sensation|Evo|Vision|Explorer|6800|8100|8900|A7272|S510e|C110e|Legend|Desire|T8282)|APX515CKT|Qtek9090|APA9292KT|HD_mini|Sensation.*Z710e|PG86100|Z715e|Desire.*(A8181|HD)|ADR6200|ADR6400L|ADR6425|001HT|Inspire 4G|Android.*\\bEVO\\b|T-Mobile G1|Z520m", "Nexus": "Nexus One|Nexus S|Galaxy.*Nexus|Android.*Nexus.*Mobile|Nexus 4|Nexus 5|Nexus 6", "Dell": "Dell.*Streak|Dell.*Aero|Dell.*Venue|DELL.*Venue Pro|Dell Flash|Dell Smoke|Dell Mini 3iX|XCD28|XCD35|\\b001DL\\b|\\b101DL\\b|\\bGS01\\b", "Motorola": "Motorola|DROIDX|DROID BIONIC|\\bDroid\\b.*Build|Android.*Xoom|HRI39|MOT-|A1260|A1680|A555|A853|A855|A953|A955|A956|Motorola.*ELECTRIFY|Motorola.*i1|i867|i940|MB200|MB300|MB501|MB502|MB508|MB511|MB520|MB525|MB526|MB611|MB612|MB632|MB810|MB855|MB860|MB861|MB865|MB870|ME501|ME502|ME511|ME525|ME600|ME632|ME722|ME811|ME860|ME863|ME865|MT620|MT710|MT716|MT720|MT810|MT870|MT917|Motorola.*TITANIUM|WX435|WX445|XT300|XT301|XT311|XT316|XT317|XT319|XT320|XT390|XT502|XT530|XT531|XT532|XT535|XT603|XT610|XT611|XT615|XT681|XT701|XT702|XT711|XT720|XT800|XT806|XT860|XT862|XT875|XT882|XT883|XT894|XT901|XT907|XT909|XT910|XT912|XT928|XT926|XT915|XT919|XT925|XT1021|\\bMoto E\\b", "Samsung": "Samsung|SM-G9250|GT-19300|SGH-I337|BGT-S5230|GT-B2100|GT-B2700|GT-B2710|GT-B3210|GT-B3310|GT-B3410|GT-B3730|GT-B3740|GT-B5510|GT-B5512|GT-B5722|GT-B6520|GT-B7300|GT-B7320|GT-B7330|GT-B7350|GT-B7510|GT-B7722|GT-B7800|GT-C3010|GT-C3011|GT-C3060|GT-C3200|GT-C3212|GT-C3212I|GT-C3262|GT-C3222|GT-C3300|GT-C3300K|GT-C3303|GT-C3303K|GT-C3310|GT-C3322|GT-C3330|GT-C3350|GT-C3500|GT-C3510|GT-C3530|GT-C3630|GT-C3780|GT-C5010|GT-C5212|GT-C6620|GT-C6625|GT-C6712|GT-E1050|GT-E1070|GT-E1075|GT-E1080|GT-E1081|GT-E1085|GT-E1087|GT-E1100|GT-E1107|GT-E1110|GT-E1120|GT-E1125|GT-E1130|GT-E1160|GT-E1170|GT-E1175|GT-E1180|GT-E1182|GT-E1200|GT-E1210|GT-E1225|GT-E1230|GT-E1390|GT-E2100|GT-E2120|GT-E2121|GT-E2152|GT-E2220|GT-E2222|GT-E2230|GT-E2232|GT-E2250|GT-E2370|GT-E2550|GT-E2652|GT-E3210|GT-E3213|GT-I5500|GT-I5503|GT-I5700|GT-I5800|GT-I5801|GT-I6410|GT-I6420|GT-I7110|GT-I7410|GT-I7500|GT-I8000|GT-I8150|GT-I8160|GT-I8190|GT-I8320|GT-I8330|GT-I8350|GT-I8530|GT-I8700|GT-I8703|GT-I8910|GT-I9000|GT-I9001|GT-I9003|GT-I9010|GT-I9020|GT-I9023|GT-I9070|GT-I9082|GT-I9100|GT-I9103|GT-I9220|GT-I9250|GT-I9300|GT-I9305|GT-I9500|GT-I9505|GT-M3510|GT-M5650|GT-M7500|GT-M7600|GT-M7603|GT-M8800|GT-M8910|GT-N7000|GT-S3110|GT-S3310|GT-S3350|GT-S3353|GT-S3370|GT-S3650|GT-S3653|GT-S3770|GT-S3850|GT-S5210|GT-S5220|GT-S5229|GT-S5230|GT-S5233|GT-S5250|GT-S5253|GT-S5260|GT-S5263|GT-S5270|GT-S5300|GT-S5330|GT-S5350|GT-S5360|GT-S5363|GT-S5369|GT-S5380|GT-S5380D|GT-S5560|GT-S5570|GT-S5600|GT-S5603|GT-S5610|GT-S5620|GT-S5660|GT-S5670|GT-S5690|GT-S5750|GT-S5780|GT-S5830|GT-S5839|GT-S6102|GT-S6500|GT-S7070|GT-S7200|GT-S7220|GT-S7230|GT-S7233|GT-S7250|GT-S7500|GT-S7530|GT-S7550|GT-S7562|GT-S7710|GT-S8000|GT-S8003|GT-S8500|GT-S8530|GT-S8600|SCH-A310|SCH-A530|SCH-A570|SCH-A610|SCH-A630|SCH-A650|SCH-A790|SCH-A795|SCH-A850|SCH-A870|SCH-A890|SCH-A930|SCH-A950|SCH-A970|SCH-A990|SCH-I100|SCH-I110|SCH-I400|SCH-I405|SCH-I500|SCH-I510|SCH-I515|SCH-I600|SCH-I730|SCH-I760|SCH-I770|SCH-I830|SCH-I910|SCH-I920|SCH-I959|SCH-LC11|SCH-N150|SCH-N300|SCH-R100|SCH-R300|SCH-R351|SCH-R400|SCH-R410|SCH-T300|SCH-U310|SCH-U320|SCH-U350|SCH-U360|SCH-U365|SCH-U370|SCH-U380|SCH-U410|SCH-U430|SCH-U450|SCH-U460|SCH-U470|SCH-U490|SCH-U540|SCH-U550|SCH-U620|SCH-U640|SCH-U650|SCH-U660|SCH-U700|SCH-U740|SCH-U750|SCH-U810|SCH-U820|SCH-U900|SCH-U940|SCH-U960|SCS-26UC|SGH-A107|SGH-A117|SGH-A127|SGH-A137|SGH-A157|SGH-A167|SGH-A177|SGH-A187|SGH-A197|SGH-A227|SGH-A237|SGH-A257|SGH-A437|SGH-A517|SGH-A597|SGH-A637|SGH-A657|SGH-A667|SGH-A687|SGH-A697|SGH-A707|SGH-A717|SGH-A727|SGH-A737|SGH-A747|SGH-A767|SGH-A777|SGH-A797|SGH-A817|SGH-A827|SGH-A837|SGH-A847|SGH-A867|SGH-A877|SGH-A887|SGH-A897|SGH-A927|SGH-B100|SGH-B130|SGH-B200|SGH-B220|SGH-C100|SGH-C110|SGH-C120|SGH-C130|SGH-C140|SGH-C160|SGH-C170|SGH-C180|SGH-C200|SGH-C207|SGH-C210|SGH-C225|SGH-C230|SGH-C417|SGH-C450|SGH-D307|SGH-D347|SGH-D357|SGH-D407|SGH-D415|SGH-D780|SGH-D807|SGH-D980|SGH-E105|SGH-E200|SGH-E315|SGH-E316|SGH-E317|SGH-E335|SGH-E590|SGH-E635|SGH-E715|SGH-E890|SGH-F300|SGH-F480|SGH-I200|SGH-I300|SGH-I320|SGH-I550|SGH-I577|SGH-I600|SGH-I607|SGH-I617|SGH-I627|SGH-I637|SGH-I677|SGH-I700|SGH-I717|SGH-I727|SGH-i747M|SGH-I777|SGH-I780|SGH-I827|SGH-I847|SGH-I857|SGH-I896|SGH-I897|SGH-I900|SGH-I907|SGH-I917|SGH-I927|SGH-I937|SGH-I997|SGH-J150|SGH-J200|SGH-L170|SGH-L700|SGH-M110|SGH-M150|SGH-M200|SGH-N105|SGH-N500|SGH-N600|SGH-N620|SGH-N625|SGH-N700|SGH-N710|SGH-P107|SGH-P207|SGH-P300|SGH-P310|SGH-P520|SGH-P735|SGH-P777|SGH-Q105|SGH-R210|SGH-R220|SGH-R225|SGH-S105|SGH-S307|SGH-T109|SGH-T119|SGH-T139|SGH-T209|SGH-T219|SGH-T229|SGH-T239|SGH-T249|SGH-T259|SGH-T309|SGH-T319|SGH-T329|SGH-T339|SGH-T349|SGH-T359|SGH-T369|SGH-T379|SGH-T409|SGH-T429|SGH-T439|SGH-T459|SGH-T469|SGH-T479|SGH-T499|SGH-T509|SGH-T519|SGH-T539|SGH-T559|SGH-T589|SGH-T609|SGH-T619|SGH-T629|SGH-T639|SGH-T659|SGH-T669|SGH-T679|SGH-T709|SGH-T719|SGH-T729|SGH-T739|SGH-T746|SGH-T749|SGH-T759|SGH-T769|SGH-T809|SGH-T819|SGH-T839|SGH-T919|SGH-T929|SGH-T939|SGH-T959|SGH-T989|SGH-U100|SGH-U200|SGH-U800|SGH-V205|SGH-V206|SGH-X100|SGH-X105|SGH-X120|SGH-X140|SGH-X426|SGH-X427|SGH-X475|SGH-X495|SGH-X497|SGH-X507|SGH-X600|SGH-X610|SGH-X620|SGH-X630|SGH-X700|SGH-X820|SGH-X890|SGH-Z130|SGH-Z150|SGH-Z170|SGH-ZX10|SGH-ZX20|SHW-M110|SPH-A120|SPH-A400|SPH-A420|SPH-A460|SPH-A500|SPH-A560|SPH-A600|SPH-A620|SPH-A660|SPH-A700|SPH-A740|SPH-A760|SPH-A790|SPH-A800|SPH-A820|SPH-A840|SPH-A880|SPH-A900|SPH-A940|SPH-A960|SPH-D600|SPH-D700|SPH-D710|SPH-D720|SPH-I300|SPH-I325|SPH-I330|SPH-I350|SPH-I500|SPH-I600|SPH-I700|SPH-L700|SPH-M100|SPH-M220|SPH-M240|SPH-M300|SPH-M305|SPH-M320|SPH-M330|SPH-M350|SPH-M360|SPH-M370|SPH-M380|SPH-M510|SPH-M540|SPH-M550|SPH-M560|SPH-M570|SPH-M580|SPH-M610|SPH-M620|SPH-M630|SPH-M800|SPH-M810|SPH-M850|SPH-M900|SPH-M910|SPH-M920|SPH-M930|SPH-N100|SPH-N200|SPH-N240|SPH-N300|SPH-N400|SPH-Z400|SWC-E100|SCH-i909|GT-N7100|GT-N7105|SCH-I535|SM-N900A|SGH-I317|SGH-T999L|GT-S5360B|GT-I8262|GT-S6802|GT-S6312|GT-S6310|GT-S5312|GT-S5310|GT-I9105|GT-I8510|GT-S6790N|SM-G7105|SM-N9005|GT-S5301|GT-I9295|GT-I9195|SM-C101|GT-S7392|GT-S7560|GT-B7610|GT-I5510|GT-S7582|GT-S7530E|GT-I8750|SM-G9006V|SM-G9008V|SM-G9009D|SM-G900A|SM-G900D|SM-G900F|SM-G900H|SM-G900I|SM-G900J|SM-G900K|SM-G900L|SM-G900M|SM-G900P|SM-G900R4|SM-G900S|SM-G900T|SM-G900V|SM-G900W8|SHV-E160K|SCH-P709|SCH-P729|SM-T2558|GT-I9205|SM-G9350|SM-J120F", "LG": "\\bLG\\b;|LG[- ]?(C800|C900|E400|E610|E900|E-900|F160|F180K|F180L|F180S|730|855|L160|LS740|LS840|LS970|LU6200|MS690|MS695|MS770|MS840|MS870|MS910|P500|P700|P705|VM696|AS680|AS695|AX840|C729|E970|GS505|272|C395|E739BK|E960|L55C|L75C|LS696|LS860|P769BK|P350|P500|P509|P870|UN272|US730|VS840|VS950|LN272|LN510|LS670|LS855|LW690|MN270|MN510|P509|P769|P930|UN200|UN270|UN510|UN610|US670|US740|US760|UX265|UX840|VN271|VN530|VS660|VS700|VS740|VS750|VS910|VS920|VS930|VX9200|VX11000|AX840A|LW770|P506|P925|P999|E612|D955|D802|MS323)", "Sony": "SonyST|SonyLT|SonyEricsson|SonyEricssonLT15iv|LT18i|E10i|LT28h|LT26w|SonyEricssonMT27i|C5303|C6902|C6903|C6906|C6943|D2533", "Asus": "Asus.*Galaxy|PadFone.*Mobile", "NokiaLumia": "Lumia [0-9]{3,4}", "Micromax": "Micromax.*\\b(A210|A92|A88|A72|A111|A110Q|A115|A116|A110|A90S|A26|A51|A35|A54|A25|A27|A89|A68|A65|A57|A90)\\b", "Palm": "PalmSource|Palm", "Vertu": "Vertu|Vertu.*Ltd|Vertu.*Ascent|Vertu.*Ayxta|Vertu.*Constellation(F|Quest)?|Vertu.*Monika|Vertu.*Signature", "Pantech": "PANTECH|IM-A850S|IM-A840S|IM-A830L|IM-A830K|IM-A830S|IM-A820L|IM-A810K|IM-A810S|IM-A800S|IM-T100K|IM-A725L|IM-A780L|IM-A775C|IM-A770K|IM-A760S|IM-A750K|IM-A740S|IM-A730S|IM-A720L|IM-A710K|IM-A690L|IM-A690S|IM-A650S|IM-A630K|IM-A600S|VEGA PTL21|PT003|P8010|ADR910L|P6030|P6020|P9070|P4100|P9060|P5000|CDM8992|TXT8045|ADR8995|IS11PT|P2030|P6010|P8000|PT002|IS06|CDM8999|P9050|PT001|TXT8040|P2020|P9020|P2000|P7040|P7000|C790", "Fly": "IQ230|IQ444|IQ450|IQ440|IQ442|IQ441|IQ245|IQ256|IQ236|IQ255|IQ235|IQ245|IQ275|IQ240|IQ285|IQ280|IQ270|IQ260|IQ250", "Wiko": "KITE 4G|HIGHWAY|GETAWAY|STAIRWAY|DARKSIDE|DARKFULL|DARKNIGHT|DARKMOON|SLIDE|WAX 4G|RAINBOW|BLOOM|SUNSET|GOA(?!nna)|LENNY|BARRY|IGGY|OZZY|CINK FIVE|CINK PEAX|CINK PEAX 2|CINK SLIM|CINK SLIM 2|CINK +|CINK KING|CINK PEAX|CINK SLIM|SUBLIM", "iMobile": "i-mobile (IQ|i-STYLE|idea|ZAA|Hitz)", "SimValley": "\\b(SP-80|XT-930|SX-340|XT-930|SX-310|SP-360|SP60|SPT-800|SP-120|SPT-800|SP-140|SPX-5|SPX-8|SP-100|SPX-8|SPX-12)\\b", "Wolfgang": "AT-B24D|AT-AS50HD|AT-AS40W|AT-AS55HD|AT-AS45q2|AT-B26D|AT-AS50Q", "Alcatel": "Alcatel", "Nintendo": "Nintendo 3DS", "Amoi": "Amoi", "INQ": "INQ", "GenericPhone": "Tapatalk|PDA;|SAGEM|\\bmmp\\b|pocket|\\bpsp\\b|symbian|Smartphone|smartfon|treo|up.browser|up.link|vodafone|\\bwap\\b|nokia|Series40|Series60|S60|SonyEricsson|N900|MAUI.*WAP.*Browser" }, "tablets": { "iPad": "iPad|iPad.*Mobile", "NexusTablet": "Android.*Nexus[\\s]+(7|9|10)", "SamsungTablet": "SAMSUNG.*Tablet|Galaxy.*Tab|SC-01C|GT-P1000|GT-P1003|GT-P1010|GT-P3105|GT-P6210|GT-P6800|GT-P6810|GT-P7100|GT-P7300|GT-P7310|GT-P7500|GT-P7510|SCH-I800|SCH-I815|SCH-I905|SGH-I957|SGH-I987|SGH-T849|SGH-T859|SGH-T869|SPH-P100|GT-P3100|GT-P3108|GT-P3110|GT-P5100|GT-P5110|GT-P6200|GT-P7320|GT-P7511|GT-N8000|GT-P8510|SGH-I497|SPH-P500|SGH-T779|SCH-I705|SCH-I915|GT-N8013|GT-P3113|GT-P5113|GT-P8110|GT-N8010|GT-N8005|GT-N8020|GT-P1013|GT-P6201|GT-P7501|GT-N5100|GT-N5105|GT-N5110|SHV-E140K|SHV-E140L|SHV-E140S|SHV-E150S|SHV-E230K|SHV-E230L|SHV-E230S|SHW-M180K|SHW-M180L|SHW-M180S|SHW-M180W|SHW-M300W|SHW-M305W|SHW-M380K|SHW-M380S|SHW-M380W|SHW-M430W|SHW-M480K|SHW-M480S|SHW-M480W|SHW-M485W|SHW-M486W|SHW-M500W|GT-I9228|SCH-P739|SCH-I925|GT-I9200|GT-P5200|GT-P5210|GT-P5210X|SM-T311|SM-T310|SM-T310X|SM-T210|SM-T210R|SM-T211|SM-P600|SM-P601|SM-P605|SM-P900|SM-P901|SM-T217|SM-T217A|SM-T217S|SM-P6000|SM-T3100|SGH-I467|XE500|SM-T110|GT-P5220|GT-I9200X|GT-N5110X|GT-N5120|SM-P905|SM-T111|SM-T2105|SM-T315|SM-T320|SM-T320X|SM-T321|SM-T520|SM-T525|SM-T530NU|SM-T230NU|SM-T330NU|SM-T900|XE500T1C|SM-P605V|SM-P905V|SM-T337V|SM-T537V|SM-T707V|SM-T807V|SM-P600X|SM-P900X|SM-T210X|SM-T230|SM-T230X|SM-T325|GT-P7503|SM-T531|SM-T330|SM-T530|SM-T705|SM-T705C|SM-T535|SM-T331|SM-T800|SM-T700|SM-T537|SM-T807|SM-P907A|SM-T337A|SM-T537A|SM-T707A|SM-T807A|SM-T237|SM-T807P|SM-P607T|SM-T217T|SM-T337T|SM-T807T|SM-T116NQ|SM-P550|SM-T350|SM-T550|SM-T9000|SM-P9000|SM-T705Y|SM-T805|GT-P3113|SM-T710|SM-T810|SM-T815|SM-T360|SM-T533|SM-T113|SM-T335|SM-T715|SM-T560|SM-T670|SM-T677|SM-T377|SM-T567|SM-T357T|SM-T555|SM-T561", "Kindle": "Kindle|Silk.*Accelerated|Android.*\\b(KFOT|KFTT|KFJWI|KFJWA|KFOTE|KFSOWI|KFTHWI|KFTHWA|KFAPWI|KFAPWA|WFJWAE|KFSAWA|KFSAWI|KFASWI|KFARWI)\\b", "SurfaceTablet": "Windows NT [0-9.]+; ARM;.*(Tablet|ARMBJS)", "HPTablet": "HP Slate (7|8|10)|HP ElitePad 900|hp-tablet|EliteBook.*Touch|HP 8|Slate 21|HP SlateBook 10", "AsusTablet": "^.*PadFone((?!Mobile).)*$|Transformer|TF101|TF101G|TF300T|TF300TG|TF300TL|TF700T|TF700KL|TF701T|TF810C|ME171|ME301T|ME302C|ME371MG|ME370T|ME372MG|ME172V|ME173X|ME400C|Slider SL101|\\bK00F\\b|\\bK00C\\b|\\bK00E\\b|\\bK00L\\b|TX201LA|ME176C|ME102A|\\bM80TA\\b|ME372CL|ME560CG|ME372CG|ME302KL| K010 | K017 |ME572C|ME103K|ME170C|ME171C|\\bME70C\\b|ME581C|ME581CL|ME8510C|ME181C|P01Y|PO1MA", "BlackBerryTablet": "PlayBook|RIM Tablet", "HTCtablet": "HTC_Flyer_P512|HTC Flyer|HTC Jetstream|HTC-P715a|HTC EVO View 4G|PG41200|PG09410", "MotorolaTablet": "xoom|sholest|MZ615|MZ605|MZ505|MZ601|MZ602|MZ603|MZ604|MZ606|MZ607|MZ608|MZ609|MZ615|MZ616|MZ617", "NookTablet": "Android.*Nook|NookColor|nook browser|BNRV200|BNRV200A|BNTV250|BNTV250A|BNTV400|BNTV600|LogicPD Zoom2", "AcerTablet": "Android.*; \\b(A100|A101|A110|A200|A210|A211|A500|A501|A510|A511|A700|A701|W500|W500P|W501|W501P|W510|W511|W700|G100|G100W|B1-A71|B1-710|B1-711|A1-810|A1-811|A1-830)\\b|W3-810|\\bA3-A10\\b|\\bA3-A11\\b|\\bA3-A20", "ToshibaTablet": "Android.*(AT100|AT105|AT200|AT205|AT270|AT275|AT300|AT305|AT1S5|AT500|AT570|AT700|AT830)|TOSHIBA.*FOLIO", "LGTablet": "\\bL-06C|LG-V909|LG-V900|LG-V700|LG-V510|LG-V500|LG-V410|LG-V400|LG-VK810\\b", "FujitsuTablet": "Android.*\\b(F-01D|F-02F|F-05E|F-10D|M532|Q572)\\b", "PrestigioTablet": "PMP3170B|PMP3270B|PMP3470B|PMP7170B|PMP3370B|PMP3570C|PMP5870C|PMP3670B|PMP5570C|PMP5770D|PMP3970B|PMP3870C|PMP5580C|PMP5880D|PMP5780D|PMP5588C|PMP7280C|PMP7280C3G|PMP7280|PMP7880D|PMP5597D|PMP5597|PMP7100D|PER3464|PER3274|PER3574|PER3884|PER5274|PER5474|PMP5097CPRO|PMP5097|PMP7380D|PMP5297C|PMP5297C_QUAD|PMP812E|PMP812E3G|PMP812F|PMP810E|PMP880TD|PMT3017|PMT3037|PMT3047|PMT3057|PMT7008|PMT5887|PMT5001|PMT5002", "LenovoTablet": "Lenovo TAB|Idea(Tab|Pad)( A1|A10| K1|)|ThinkPad([ ]+)?Tablet|YT3-X90L|YT3-X90F|YT3-X90X|Lenovo.*(S2109|S2110|S5000|S6000|K3011|A3000|A3500|A1000|A2107|A2109|A1107|A5500|A7600|B6000|B8000|B8080)(-|)(FL|F|HV|H|)", "DellTablet": "Venue 11|Venue 8|Venue 7|Dell Streak 10|Dell Streak 7", "YarvikTablet": "Android.*\\b(TAB210|TAB211|TAB224|TAB250|TAB260|TAB264|TAB310|TAB360|TAB364|TAB410|TAB411|TAB420|TAB424|TAB450|TAB460|TAB461|TAB464|TAB465|TAB467|TAB468|TAB07-100|TAB07-101|TAB07-150|TAB07-151|TAB07-152|TAB07-200|TAB07-201-3G|TAB07-210|TAB07-211|TAB07-212|TAB07-214|TAB07-220|TAB07-400|TAB07-485|TAB08-150|TAB08-200|TAB08-201-3G|TAB08-201-30|TAB09-100|TAB09-211|TAB09-410|TAB10-150|TAB10-201|TAB10-211|TAB10-400|TAB10-410|TAB13-201|TAB274EUK|TAB275EUK|TAB374EUK|TAB462EUK|TAB474EUK|TAB9-200)\\b", "MedionTablet": "Android.*\\bOYO\\b|LIFE.*(P9212|P9514|P9516|S9512)|LIFETAB", "ArnovaTablet": "AN10G2|AN7bG3|AN7fG3|AN8G3|AN8cG3|AN7G3|AN9G3|AN7dG3|AN7dG3ST|AN7dG3ChildPad|AN10bG3|AN10bG3DT|AN9G2", "IntensoTablet": "INM8002KP|INM1010FP|INM805ND|Intenso Tab|TAB1004", "IRUTablet": "M702pro", "MegafonTablet": "MegaFon V9|\\bZTE V9\\b|Android.*\\bMT7A\\b", "EbodaTablet": "E-Boda (Supreme|Impresspeed|Izzycomm|Essential)", "AllViewTablet": "Allview.*(Viva|Alldro|City|Speed|All TV|Frenzy|Quasar|Shine|TX1|AX1|AX2)", "ArchosTablet": "\\b(101G9|80G9|A101IT)\\b|Qilive 97R|Archos5|\\bARCHOS (70|79|80|90|97|101|FAMILYPAD|)(b|)(G10| Cobalt| TITANIUM(HD|)| Xenon| Neon|XSK| 2| XS 2| PLATINUM| CARBON|GAMEPAD)\\b", "AinolTablet": "NOVO7|NOVO8|NOVO10|Novo7Aurora|Novo7Basic|NOVO7PALADIN|novo9-Spark", "NokiaLumiaTablet": "Lumia 2520", "SonyTablet": "Sony.*Tablet|Xperia Tablet|Sony Tablet S|SO-03E|SGPT12|SGPT13|SGPT114|SGPT121|SGPT122|SGPT123|SGPT111|SGPT112|SGPT113|SGPT131|SGPT132|SGPT133|SGPT211|SGPT212|SGPT213|SGP311|SGP312|SGP321|EBRD1101|EBRD1102|EBRD1201|SGP351|SGP341|SGP511|SGP512|SGP521|SGP541|SGP551|SGP621|SGP612|SOT31", "PhilipsTablet": "\\b(PI2010|PI3000|PI3100|PI3105|PI3110|PI3205|PI3210|PI3900|PI4010|PI7000|PI7100)\\b", "CubeTablet": "Android.*(K8GT|U9GT|U10GT|U16GT|U17GT|U18GT|U19GT|U20GT|U23GT|U30GT)|CUBE U8GT", "CobyTablet": "MID1042|MID1045|MID1125|MID1126|MID7012|MID7014|MID7015|MID7034|MID7035|MID7036|MID7042|MID7048|MID7127|MID8042|MID8048|MID8127|MID9042|MID9740|MID9742|MID7022|MID7010", "MIDTablet": "M9701|M9000|M9100|M806|M1052|M806|T703|MID701|MID713|MID710|MID727|MID760|MID830|MID728|MID933|MID125|MID810|MID732|MID120|MID930|MID800|MID731|MID900|MID100|MID820|MID735|MID980|MID130|MID833|MID737|MID960|MID135|MID860|MID736|MID140|MID930|MID835|MID733|MID4X10", "MSITablet": "MSI \\b(Primo 73K|Primo 73L|Primo 81L|Primo 77|Primo 93|Primo 75|Primo 76|Primo 73|Primo 81|Primo 91|Primo 90|Enjoy 71|Enjoy 7|Enjoy 10)\\b", "SMiTTablet": "Android.*(\\bMID\\b|MID-560|MTV-T1200|MTV-PND531|MTV-P1101|MTV-PND530)", "RockChipTablet": "Android.*(RK2818|RK2808A|RK2918|RK3066)|RK2738|RK2808A", "FlyTablet": "IQ310|Fly Vision", "bqTablet": "Android.*(bq)?.*(Elcano|Curie|Edison|Maxwell|Kepler|Pascal|Tesla|Hypatia|Platon|Newton|Livingstone|Cervantes|Avant|Aquaris E10)|Maxwell.*Lite|Maxwell.*Plus", "HuaweiTablet": "MediaPad|MediaPad 7 Youth|IDEOS S7|S7-201c|S7-202u|S7-101|S7-103|S7-104|S7-105|S7-106|S7-201|S7-Slim", "NecTablet": "\\bN-06D|\\bN-08D", "PantechTablet": "Pantech.*P4100", "BronchoTablet": "Broncho.*(N701|N708|N802|a710)", "VersusTablet": "TOUCHPAD.*[78910]|\\bTOUCHTAB\\b", "ZyncTablet": "z1000|Z99 2G|z99|z930|z999|z990|z909|Z919|z900", "PositivoTablet": "TB07STA|TB10STA|TB07FTA|TB10FTA", "NabiTablet": "Android.*\\bNabi", "KoboTablet": "Kobo Touch|\\bK080\\b|\\bVox\\b Build|\\bArc\\b Build", "DanewTablet": "DSlide.*\\b(700|701R|702|703R|704|802|970|971|972|973|974|1010|1012)\\b", "TexetTablet": "NaviPad|TB-772A|TM-7045|TM-7055|TM-9750|TM-7016|TM-7024|TM-7026|TM-7041|TM-7043|TM-7047|TM-8041|TM-9741|TM-9747|TM-9748|TM-9751|TM-7022|TM-7021|TM-7020|TM-7011|TM-7010|TM-7023|TM-7025|TM-7037W|TM-7038W|TM-7027W|TM-9720|TM-9725|TM-9737W|TM-1020|TM-9738W|TM-9740|TM-9743W|TB-807A|TB-771A|TB-727A|TB-725A|TB-719A|TB-823A|TB-805A|TB-723A|TB-715A|TB-707A|TB-705A|TB-709A|TB-711A|TB-890HD|TB-880HD|TB-790HD|TB-780HD|TB-770HD|TB-721HD|TB-710HD|TB-434HD|TB-860HD|TB-840HD|TB-760HD|TB-750HD|TB-740HD|TB-730HD|TB-722HD|TB-720HD|TB-700HD|TB-500HD|TB-470HD|TB-431HD|TB-430HD|TB-506|TB-504|TB-446|TB-436|TB-416|TB-146SE|TB-126SE", "PlaystationTablet": "Playstation.*(Portable|Vita)", "TrekstorTablet": "ST10416-1|VT10416-1|ST70408-1|ST702xx-1|ST702xx-2|ST80208|ST97216|ST70104-2|VT10416-2|ST10216-2A|SurfTab", "PyleAudioTablet": "\\b(PTBL10CEU|PTBL10C|PTBL72BC|PTBL72BCEU|PTBL7CEU|PTBL7C|PTBL92BC|PTBL92BCEU|PTBL9CEU|PTBL9CUK|PTBL9C)\\b", "AdvanTablet": "Android.* \\b(E3A|T3X|T5C|T5B|T3E|T3C|T3B|T1J|T1F|T2A|T1H|T1i|E1C|T1-E|T5-A|T4|E1-B|T2Ci|T1-B|T1-D|O1-A|E1-A|T1-A|T3A|T4i)\\b ", "DanyTechTablet": "Genius Tab G3|Genius Tab S2|Genius Tab Q3|Genius Tab G4|Genius Tab Q4|Genius Tab G-II|Genius TAB GII|Genius TAB GIII|Genius Tab S1", "GalapadTablet": "Android.*\\bG1\\b", "MicromaxTablet": "Funbook|Micromax.*\\b(P250|P560|P360|P362|P600|P300|P350|P500|P275)\\b", "KarbonnTablet": "Android.*\\b(A39|A37|A34|ST8|ST10|ST7|Smart Tab3|Smart Tab2)\\b", "AllFineTablet": "Fine7 Genius|Fine7 Shine|Fine7 Air|Fine8 Style|Fine9 More|Fine10 Joy|Fine11 Wide", "PROSCANTablet": "\\b(PEM63|PLT1023G|PLT1041|PLT1044|PLT1044G|PLT1091|PLT4311|PLT4311PL|PLT4315|PLT7030|PLT7033|PLT7033D|PLT7035|PLT7035D|PLT7044K|PLT7045K|PLT7045KB|PLT7071KG|PLT7072|PLT7223G|PLT7225G|PLT7777G|PLT7810K|PLT7849G|PLT7851G|PLT7852G|PLT8015|PLT8031|PLT8034|PLT8036|PLT8080K|PLT8082|PLT8088|PLT8223G|PLT8234G|PLT8235G|PLT8816K|PLT9011|PLT9045K|PLT9233G|PLT9735|PLT9760G|PLT9770G)\\b", "YONESTablet": "BQ1078|BC1003|BC1077|RK9702|BC9730|BC9001|IT9001|BC7008|BC7010|BC708|BC728|BC7012|BC7030|BC7027|BC7026", "ChangJiaTablet": "TPC7102|TPC7103|TPC7105|TPC7106|TPC7107|TPC7201|TPC7203|TPC7205|TPC7210|TPC7708|TPC7709|TPC7712|TPC7110|TPC8101|TPC8103|TPC8105|TPC8106|TPC8203|TPC8205|TPC8503|TPC9106|TPC9701|TPC97101|TPC97103|TPC97105|TPC97106|TPC97111|TPC97113|TPC97203|TPC97603|TPC97809|TPC97205|TPC10101|TPC10103|TPC10106|TPC10111|TPC10203|TPC10205|TPC10503", "GUTablet": "TX-A1301|TX-M9002|Q702|kf026", "PointOfViewTablet": "TAB-P506|TAB-navi-7-3G-M|TAB-P517|TAB-P-527|TAB-P701|TAB-P703|TAB-P721|TAB-P731N|TAB-P741|TAB-P825|TAB-P905|TAB-P925|TAB-PR945|TAB-PL1015|TAB-P1025|TAB-PI1045|TAB-P1325|TAB-PROTAB[0-9]+|TAB-PROTAB25|TAB-PROTAB26|TAB-PROTAB27|TAB-PROTAB26XL|TAB-PROTAB2-IPS9|TAB-PROTAB30-IPS9|TAB-PROTAB25XXL|TAB-PROTAB26-IPS10|TAB-PROTAB30-IPS10", "OvermaxTablet": "OV-(SteelCore|NewBase|Basecore|Baseone|Exellen|Quattor|EduTab|Solution|ACTION|BasicTab|TeddyTab|MagicTab|Stream|TB-08|TB-09)", "HCLTablet": "HCL.*Tablet|Connect-3G-2.0|Connect-2G-2.0|ME Tablet U1|ME Tablet U2|ME Tablet G1|ME Tablet X1|ME Tablet Y2|ME Tablet Sync", "DPSTablet": "DPS Dream 9|DPS Dual 7", "VistureTablet": "V97 HD|i75 3G|Visture V4( HD)?|Visture V5( HD)?|Visture V10", "CrestaTablet": "CTP(-)?810|CTP(-)?818|CTP(-)?828|CTP(-)?838|CTP(-)?888|CTP(-)?978|CTP(-)?980|CTP(-)?987|CTP(-)?988|CTP(-)?989", "MediatekTablet": "\\bMT8125|MT8389|MT8135|MT8377\\b", "ConcordeTablet": "Concorde([ ]+)?Tab|ConCorde ReadMan", "GoCleverTablet": "GOCLEVER TAB|A7GOCLEVER|M1042|M7841|M742|R1042BK|R1041|TAB A975|TAB A7842|TAB A741|TAB A741L|TAB M723G|TAB M721|TAB A1021|TAB I921|TAB R721|TAB I720|TAB T76|TAB R70|TAB R76.2|TAB R106|TAB R83.2|TAB M813G|TAB I721|GCTA722|TAB I70|TAB I71|TAB S73|TAB R73|TAB R74|TAB R93|TAB R75|TAB R76.1|TAB A73|TAB A93|TAB A93.2|TAB T72|TAB R83|TAB R974|TAB R973|TAB A101|TAB A103|TAB A104|TAB A104.2|R105BK|M713G|A972BK|TAB A971|TAB R974.2|TAB R104|TAB R83.3|TAB A1042", "ModecomTablet": "FreeTAB 9000|FreeTAB 7.4|FreeTAB 7004|FreeTAB 7800|FreeTAB 2096|FreeTAB 7.5|FreeTAB 1014|FreeTAB 1001 |FreeTAB 8001|FreeTAB 9706|FreeTAB 9702|FreeTAB 7003|FreeTAB 7002|FreeTAB 1002|FreeTAB 7801|FreeTAB 1331|FreeTAB 1004|FreeTAB 8002|FreeTAB 8014|FreeTAB 9704|FreeTAB 1003", "VoninoTablet": "\\b(Argus[ _]?S|Diamond[ _]?79HD|Emerald[ _]?78E|Luna[ _]?70C|Onyx[ _]?S|Onyx[ _]?Z|Orin[ _]?HD|Orin[ _]?S|Otis[ _]?S|SpeedStar[ _]?S|Magnet[ _]?M9|Primus[ _]?94[ _]?3G|Primus[ _]?94HD|Primus[ _]?QS|Android.*\\bQ8\\b|Sirius[ _]?EVO[ _]?QS|Sirius[ _]?QS|Spirit[ _]?S)\\b", "ECSTablet": "V07OT2|TM105A|S10OT1|TR10CS1", "StorexTablet": "eZee[_']?(Tab|Go)[0-9]+|TabLC7|Looney Tunes Tab", "VodafoneTablet": "SmartTab([ ]+)?[0-9]+|SmartTabII10|SmartTabII7|VF-1497", "EssentielBTablet": "Smart[ ']?TAB[ ]+?[0-9]+|Family[ ']?TAB2", "RossMoorTablet": "RM-790|RM-997|RMD-878G|RMD-974R|RMT-705A|RMT-701|RME-601|RMT-501|RMT-711", "iMobileTablet": "i-mobile i-note", "TolinoTablet": "tolino tab [0-9.]+|tolino shine", "AudioSonicTablet": "\\bC-22Q|T7-QC|T-17B|T-17P\\b", "AMPETablet": "Android.* A78 ", "SkkTablet": "Android.* (SKYPAD|PHOENIX|CYCLOPS)", "TecnoTablet": "TECNO P9", "JXDTablet": "Android.* \\b(F3000|A3300|JXD5000|JXD3000|JXD2000|JXD300B|JXD300|S5800|S7800|S602b|S5110b|S7300|S5300|S602|S603|S5100|S5110|S601|S7100a|P3000F|P3000s|P101|P200s|P1000m|P200m|P9100|P1000s|S6600b|S908|P1000|P300|S18|S6600|S9100)\\b", "iJoyTablet": "Tablet (Spirit 7|Essentia|Galatea|Fusion|Onix 7|Landa|Titan|Scooby|Deox|Stella|Themis|Argon|Unique 7|Sygnus|Hexen|Finity 7|Cream|Cream X2|Jade|Neon 7|Neron 7|Kandy|Scape|Saphyr 7|Rebel|Biox|Rebel|Rebel 8GB|Myst|Draco 7|Myst|Tab7-004|Myst|Tadeo Jones|Tablet Boing|Arrow|Draco Dual Cam|Aurix|Mint|Amity|Revolution|Finity 9|Neon 9|T9w|Amity 4GB Dual Cam|Stone 4GB|Stone 8GB|Andromeda|Silken|X2|Andromeda II|Halley|Flame|Saphyr 9,7|Touch 8|Planet|Triton|Unique 10|Hexen 10|Memphis 4GB|Memphis 8GB|Onix 10)", "FX2Tablet": "FX2 PAD7|FX2 PAD10", "XoroTablet": "KidsPAD 701|PAD[ ]?712|PAD[ ]?714|PAD[ ]?716|PAD[ ]?717|PAD[ ]?718|PAD[ ]?720|PAD[ ]?721|PAD[ ]?722|PAD[ ]?790|PAD[ ]?792|PAD[ ]?900|PAD[ ]?9715D|PAD[ ]?9716DR|PAD[ ]?9718DR|PAD[ ]?9719QR|PAD[ ]?9720QR|TelePAD1030|Telepad1032|TelePAD730|TelePAD731|TelePAD732|TelePAD735Q|TelePAD830|TelePAD9730|TelePAD795|MegaPAD 1331|MegaPAD 1851|MegaPAD 2151", "ViewsonicTablet": "ViewPad 10pi|ViewPad 10e|ViewPad 10s|ViewPad E72|ViewPad7|ViewPad E100|ViewPad 7e|ViewSonic VB733|VB100a", "OdysTablet": "LOOX|XENO10|ODYS[ -](Space|EVO|Xpress|NOON)|\\bXELIO\\b|Xelio10Pro|XELIO7PHONETAB|XELIO10EXTREME|XELIOPT2|NEO_QUAD10", "CaptivaTablet": "CAPTIVA PAD", "IconbitTablet": "NetTAB|NT-3702|NT-3702S|NT-3702S|NT-3603P|NT-3603P|NT-0704S|NT-0704S|NT-3805C|NT-3805C|NT-0806C|NT-0806C|NT-0909T|NT-0909T|NT-0907S|NT-0907S|NT-0902S|NT-0902S", "TeclastTablet": "T98 4G|\\bP80\\b|\\bX90HD\\b|X98 Air|X98 Air 3G|\\bX89\\b|P80 3G|\\bX80h\\b|P98 Air|\\bX89HD\\b|P98 3G|\\bP90HD\\b|P89 3G|X98 3G|\\bP70h\\b|P79HD 3G|G18d 3G|\\bP79HD\\b|\\bP89s\\b|\\bA88\\b|\\bP10HD\\b|\\bP19HD\\b|G18 3G|\\bP78HD\\b|\\bA78\\b|\\bP75\\b|G17s 3G|G17h 3G|\\bP85t\\b|\\bP90\\b|\\bP11\\b|\\bP98t\\b|\\bP98HD\\b|\\bG18d\\b|\\bP85s\\b|\\bP11HD\\b|\\bP88s\\b|\\bA80HD\\b|\\bA80se\\b|\\bA10h\\b|\\bP89\\b|\\bP78s\\b|\\bG18\\b|\\bP85\\b|\\bA70h\\b|\\bA70\\b|\\bG17\\b|\\bP18\\b|\\bA80s\\b|\\bA11s\\b|\\bP88HD\\b|\\bA80h\\b|\\bP76s\\b|\\bP76h\\b|\\bP98\\b|\\bA10HD\\b|\\bP78\\b|\\bP88\\b|\\bA11\\b|\\bA10t\\b|\\bP76a\\b|\\bP76t\\b|\\bP76e\\b|\\bP85HD\\b|\\bP85a\\b|\\bP86\\b|\\bP75HD\\b|\\bP76v\\b|\\bA12\\b|\\bP75a\\b|\\bA15\\b|\\bP76Ti\\b|\\bP81HD\\b|\\bA10\\b|\\bT760VE\\b|\\bT720HD\\b|\\bP76\\b|\\bP73\\b|\\bP71\\b|\\bP72\\b|\\bT720SE\\b|\\bC520Ti\\b|\\bT760\\b|\\bT720VE\\b|T720-3GE|T720-WiFi", "OndaTablet": "\\b(V975i|Vi30|VX530|V701|Vi60|V701s|Vi50|V801s|V719|Vx610w|VX610W|V819i|Vi10|VX580W|Vi10|V711s|V813|V811|V820w|V820|Vi20|V711|VI30W|V712|V891w|V972|V819w|V820w|Vi60|V820w|V711|V813s|V801|V819|V975s|V801|V819|V819|V818|V811|V712|V975m|V101w|V961w|V812|V818|V971|V971s|V919|V989|V116w|V102w|V973|Vi40)\\b[\\s]+", "JaytechTablet": "TPC-PA762", "BlaupunktTablet": "Endeavour 800NG|Endeavour 1010", "DigmaTablet": "\\b(iDx10|iDx9|iDx8|iDx7|iDxD7|iDxD8|iDsQ8|iDsQ7|iDsQ8|iDsD10|iDnD7|3TS804H|iDsQ11|iDj7|iDs10)\\b", "EvolioTablet": "ARIA_Mini_wifi|Aria[ _]Mini|Evolio X10|Evolio X7|Evolio X8|\\bEvotab\\b|\\bNeura\\b", "LavaTablet": "QPAD E704|\\bIvoryS\\b|E-TAB IVORY|\\bE-TAB\\b", "AocTablet": "MW0811|MW0812|MW0922|MTK8382|MW1031|MW0831|MW0821|MW0931|MW0712", "MpmanTablet": "MP11 OCTA|MP10 OCTA|MPQC1114|MPQC1004|MPQC994|MPQC974|MPQC973|MPQC804|MPQC784|MPQC780|\\bMPG7\\b|MPDCG75|MPDCG71|MPDC1006|MP101DC|MPDC9000|MPDC905|MPDC706HD|MPDC706|MPDC705|MPDC110|MPDC100|MPDC99|MPDC97|MPDC88|MPDC8|MPDC77|MP709|MID701|MID711|MID170|MPDC703|MPQC1010", "CelkonTablet": "CT695|CT888|CT[\\s]?910|CT7 Tab|CT9 Tab|CT3 Tab|CT2 Tab|CT1 Tab|C820|C720|\\bCT-1\\b", "WolderTablet": "miTab \\b(DIAMOND|SPACE|BROOKLYN|NEO|FLY|MANHATTAN|FUNK|EVOLUTION|SKY|GOCAR|IRON|GENIUS|POP|MINT|EPSILON|BROADWAY|JUMP|HOP|LEGEND|NEW AGE|LINE|ADVANCE|FEEL|FOLLOW|LIKE|LINK|LIVE|THINK|FREEDOM|CHICAGO|CLEVELAND|BALTIMORE-GH|IOWA|BOSTON|SEATTLE|PHOENIX|DALLAS|IN 101|MasterChef)\\b", "MiTablet": "\\bMI PAD\\b|\\bHM NOTE 1W\\b", "NibiruTablet": "Nibiru M1|Nibiru Jupiter One", "NexoTablet": "NEXO NOVA|NEXO 10|NEXO AVIO|NEXO FREE|NEXO GO|NEXO EVO|NEXO 3G|NEXO SMART|NEXO KIDDO|NEXO MOBI", "LeaderTablet": "TBLT10Q|TBLT10I|TBL-10WDKB|TBL-10WDKBO2013|TBL-W230V2|TBL-W450|TBL-W500|SV572|TBLT7I|TBA-AC7-8G|TBLT79|TBL-8W16|TBL-10W32|TBL-10WKB|TBL-W100", "UbislateTablet": "UbiSlate[\\s]?7C", "PocketBookTablet": "Pocketbook", "KocasoTablet": "\\b(TB-1207)\\b", "Hudl": "Hudl HT7S3|Hudl 2", "TelstraTablet": "T-Hub2", "GenericTablet": "Android.*\\b97D\\b|Tablet(?!.*PC)|BNTV250A|MID-WCDMA|LogicPD Zoom2|\\bA7EB\\b|CatNova8|A1_07|CT704|CT1002|\\bM721\\b|rk30sdk|\\bEVOTAB\\b|M758A|ET904|ALUMIUM10|Smartfren Tab|Endeavour 1010|Tablet-PC-4|Tagi Tab|\\bM6pro\\b|CT1020W|arc 10HD|\\bJolla\\b|\\bTP750\\b" }, "oss": { "AndroidOS": "Android", "BlackBerryOS": "blackberry|\\bBB10\\b|rim tablet os", "PalmOS": "PalmOS|avantgo|blazer|elaine|hiptop|palm|plucker|xiino", "SymbianOS": "Symbian|SymbOS|Series60|Series40|SYB-[0-9]+|\\bS60\\b", "WindowsMobileOS": "Windows CE.*(PPC|Smartphone|Mobile|[0-9]{3}x[0-9]{3})|Window Mobile|Windows Phone [0-9.]+|WCE;", "WindowsPhoneOS": "Windows Phone 10.0|Windows Phone 8.1|Windows Phone 8.0|Windows Phone OS|XBLWP7|ZuneWP7|Windows NT 6.[23]; ARM;", "iOS": "\\biPhone.*Mobile|\\biPod|\\biPad", "MeeGoOS": "MeeGo", "MaemoOS": "Maemo", "JavaOS": "J2ME\/|\\bMIDP\\b|\\bCLDC\\b", "webOS": "webOS|hpwOS", "badaOS": "\\bBada\\b", "BREWOS": "BREW" }, "uas": { "Vivaldi": "Vivaldi", "Chrome": "\\bCrMo\\b|CriOS|Android.*Chrome\/[.0-9]* (Mobile)?", "Dolfin": "\\bDolfin\\b", "Opera": "Opera.*Mini|Opera.*Mobi|Android.*Opera|Mobile.*OPR\/[0-9.]+|Coast\/[0-9.]+", "Skyfire": "Skyfire", "Edge": "Mobile Safari\/[.0-9]* Edge", "IE": "IEMobile|MSIEMobile", "Firefox": "fennec|firefox.*maemo|(Mobile|Tablet).*Firefox|Firefox.*Mobile", "Bolt": "bolt", "TeaShark": "teashark", "Blazer": "Blazer", "Safari": "Version.*Mobile.*Safari|Safari.*Mobile|MobileSafari", "Tizen": "Tizen", "UCBrowser": "UC.*Browser|UCWEB", "baiduboxapp": "baiduboxapp", "baidubrowser": "baidubrowser", "DiigoBrowser": "DiigoBrowser", "Puffin": "Puffin", "Mercury": "\\bMercury\\b", "ObigoBrowser": "Obigo", "NetFront": "NF-Browser", "GenericBrowser": "NokiaBrowser|OviBrowser|OneBrowser|TwonkyBeamBrowser|SEMC.*Browser|FlyFlow|Minimo|NetFront|Novarra-Vision|MQQBrowser|MicroMessenger", "PaleMoon": "Android.*PaleMoon|Mobile.*PaleMoon" }, "props": { "Mobile": "Mobile\/[VER]", "Build": "Build\/[VER]", "Version": "Version\/[VER]", "VendorID": "VendorID\/[VER]", "iPad": "iPad.*CPU[a-z ]+[VER]", "iPhone": "iPhone.*CPU[a-z ]+[VER]", "iPod": "iPod.*CPU[a-z ]+[VER]", "Kindle": "Kindle\/[VER]", "Chrome": [ "Chrome\/[VER]", "CriOS\/[VER]", "CrMo\/[VER]" ], "Coast": [ "Coast\/[VER]" ], "Dolfin": "Dolfin\/[VER]", "Firefox": "Firefox\/[VER]", "Fennec": "Fennec\/[VER]", "Edge": "Edge\/[VER]", "IE": [ "IEMobile\/[VER];", "IEMobile [VER]", "MSIE [VER];", "Trident\/[0-9.]+;.*rv:[VER]" ], "NetFront": "NetFront\/[VER]", "NokiaBrowser": "NokiaBrowser\/[VER]", "Opera": [ " OPR\/[VER]", "Opera Mini\/[VER]", "Version\/[VER]" ], "Opera Mini": "Opera Mini\/[VER]", "Opera Mobi": "Version\/[VER]", "UC Browser": "UC Browser[VER]", "MQQBrowser": "MQQBrowser\/[VER]", "MicroMessenger": "MicroMessenger\/[VER]", "baiduboxapp": "baiduboxapp\/[VER]", "baidubrowser": "baidubrowser\/[VER]", "Iron": "Iron\/[VER]", "Safari": [ "Version\/[VER]", "Safari\/[VER]" ], "Skyfire": "Skyfire\/[VER]", "Tizen": "Tizen\/[VER]", "Webkit": "webkit[ \/][VER]", "PaleMoon": "PaleMoon\/[VER]", "Gecko": "Gecko\/[VER]", "Trident": "Trident\/[VER]", "Presto": "Presto\/[VER]", "Goanna": "Goanna\/[VER]", "iOS": " \\bi?OS\\b [VER][ ;]{1}", "Android": "Android [VER]", "BlackBerry": [ "BlackBerry[\\w]+\/[VER]", "BlackBerry.*Version\/[VER]", "Version\/[VER]" ], "BREW": "BREW [VER]", "Java": "Java\/[VER]", "Windows Phone OS": [ "Windows Phone OS [VER]", "Windows Phone [VER]" ], "Windows Phone": "Windows Phone [VER]", "Windows CE": "Windows CE\/[VER]", "Windows NT": "Windows NT [VER]", "Symbian": [ "SymbianOS\/[VER]", "Symbian\/[VER]" ], "webOS": [ "webOS\/[VER]", "hpwOS\/[VER];" ] }, "utils": { "Bot": "Googlebot|facebookexternalhit|AdsBot-Google|Google Keyword Suggestion|Facebot|YandexBot|bingbot|ia_archiver|AhrefsBot|Ezooms|GSLFbot|WBSearchBot|Twitterbot|TweetmemeBot|Twikle|PaperLiBot|Wotbox|UnwindFetchor|Exabot|MJ12bot|YandexImages|TurnitinBot|Pingdom", "MobileBot": "Googlebot-Mobile|AdsBot-Google-Mobile|YahooSeeker\/M1A1-R2D2", "DesktopMode": "WPDesktop", "TV": "SonyDTV|HbbTV", "WebKit": "(webkit)[ \/]([\\w.]+)", "Console": "\\b(Nintendo|Nintendo WiiU|Nintendo 3DS|PLAYSTATION|Xbox)\\b", "Watch": "SM-V700" }}; // following patterns come from http://detectmobilebrowsers.com/ impl.detectMobileBrowsers = { fullPattern: /(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino/i, shortPattern: /1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i, tabletPattern: /android|ipad|playbook|silk/i }; var hasOwnProp = Object.prototype.hasOwnProperty, isArray; impl.FALLBACK_PHONE = 'UnknownPhone'; impl.FALLBACK_TABLET = 'UnknownTablet'; impl.FALLBACK_MOBILE = 'UnknownMobile'; isArray = ('isArray' in Array) ? Array.isArray : function (value) { return Object.prototype.toString.call(value) === '[object Array]'; }; isArray = 'isArray' in Array ? function (value) { return Object.prototype.toString.call(value) === '[object Array]'; } : Array.isArray; function equalIC(a, b) { return a != null && b != null && a.toLowerCase() === b.toLowerCase(); } function containsIC(array, value) { var valueLC, i, len = array.length; if (!len || !value) { return false; } valueLC = value.toLowerCase(); for (i = 0; i < len; ++i) { if (valueLC === array[i].toLowerCase()) { return true; } } return false; } function convertPropsToRegExp(object) { for (var key in object) { if (hasOwnProp.call(object, key)) { object[key] = new RegExp(object[key], 'i'); } } } (function init() { var key, values, value, i, len, verPos, mobileDetectRules = impl.mobileDetectRules; for (key in mobileDetectRules.props) { if (hasOwnProp.call(mobileDetectRules.props, key)) { values = mobileDetectRules.props[key]; if (!isArray(values)) { values = [values]; } len = values.length; for (i = 0; i < len; ++i) { value = values[i]; verPos = value.indexOf('[VER]'); if (verPos >= 0) { value = value.substring(0, verPos) + '([\\w._\\+]+)' + value.substring(verPos + 5); } values[i] = new RegExp(value, 'i'); } mobileDetectRules.props[key] = values; } } convertPropsToRegExp(mobileDetectRules.oss); convertPropsToRegExp(mobileDetectRules.phones); convertPropsToRegExp(mobileDetectRules.tablets); convertPropsToRegExp(mobileDetectRules.uas); convertPropsToRegExp(mobileDetectRules.utils); // copy some patterns to oss0 which are tested first (see issue#15) mobileDetectRules.oss0 = { WindowsPhoneOS: mobileDetectRules.oss.WindowsPhoneOS, WindowsMobileOS: mobileDetectRules.oss.WindowsMobileOS }; }()); /** * Test userAgent string against a set of rules and find the first matched key. * @param {Object} rules (key is String, value is RegExp) * @param {String} userAgent the navigator.userAgent (or HTTP-Header 'User-Agent'). * @returns {String|null} the matched key if found, otherwise null * @private */ impl.findMatch = function(rules, userAgent) { for (var key in rules) { if (hasOwnProp.call(rules, key)) { if (rules[key].test(userAgent)) { return key; } } } return null; }; /** * Test userAgent string against a set of rules and return an array of matched keys. * @param {Object} rules (key is String, value is RegExp) * @param {String} userAgent the navigator.userAgent (or HTTP-Header 'User-Agent'). * @returns {Array} an array of matched keys, may be empty when there is no match, but not null * @private */ impl.findMatches = function(rules, userAgent) { var result = []; for (var key in rules) { if (hasOwnProp.call(rules, key)) { if (rules[key].test(userAgent)) { result.push(key); } } } return result; }; /** * Check the version of the given property in the User-Agent. * * @param {String} propertyName * @param {String} userAgent * @return {String} version or null if version not found * @private */ impl.getVersionStr = function (propertyName, userAgent) { var props = impl.mobileDetectRules.props, patterns, i, len, match; if (hasOwnProp.call(props, propertyName)) { patterns = props[propertyName]; len = patterns.length; for (i = 0; i < len; ++i) { match = patterns[i].exec(userAgent); if (match !== null) { return match[1]; } } } return null; }; /** * Check the version of the given property in the User-Agent. * Will return a float number. (eg. 2_0 will return 2.0, 4.3.1 will return 4.31) * * @param {String} propertyName * @param {String} userAgent * @return {Number} version or NaN if version not found * @private */ impl.getVersion = function (propertyName, userAgent) { var version = impl.getVersionStr(propertyName, userAgent); return version ? impl.prepareVersionNo(version) : NaN; }; /** * Prepare the version number. * * @param {String} version * @return {Number} the version number as a floating number * @private */ impl.prepareVersionNo = function (version) { var numbers; numbers = version.split(/[a-z._ \/\-]/i); if (numbers.length === 1) { version = numbers[0]; } if (numbers.length > 1) { version = numbers[0] + '.'; numbers.shift(); version += numbers.join(''); } return Number(version); }; impl.isMobileFallback = function (userAgent) { return impl.detectMobileBrowsers.fullPattern.test(userAgent) || impl.detectMobileBrowsers.shortPattern.test(userAgent.substr(0,4)); }; impl.isTabletFallback = function (userAgent) { return impl.detectMobileBrowsers.tabletPattern.test(userAgent); }; impl.prepareDetectionCache = function (cache, userAgent, maxPhoneWidth) { if (cache.mobile !== undefined) { return; } var phone, tablet, phoneSized; // first check for stronger tablet rules, then phone (see issue#5) tablet = impl.findMatch(impl.mobileDetectRules.tablets, userAgent); if (tablet) { cache.mobile = cache.tablet = tablet; cache.phone = null; return; // unambiguously identified as tablet } phone = impl.findMatch(impl.mobileDetectRules.phones, userAgent); if (phone) { cache.mobile = cache.phone = phone; cache.tablet = null; return; // unambiguously identified as phone } // our rules haven't found a match -> try more general fallback rules if (impl.isMobileFallback(userAgent)) { phoneSized = MobileDetect.isPhoneSized(maxPhoneWidth); if (phoneSized === undefined) { cache.mobile = impl.FALLBACK_MOBILE; cache.tablet = cache.phone = null; } else if (phoneSized) { cache.mobile = cache.phone = impl.FALLBACK_PHONE; cache.tablet = null; } else { cache.mobile = cache.tablet = impl.FALLBACK_TABLET; cache.phone = null; } } else if (impl.isTabletFallback(userAgent)) { cache.mobile = cache.tablet = impl.FALLBACK_TABLET; cache.phone = null; } else { // not mobile at all! cache.mobile = cache.tablet = cache.phone = null; } }; // t is a reference to a MobileDetect instance impl.mobileGrade = function (t) { // impl note: // To keep in sync w/ Mobile_Detect.php easily, the following code is tightly aligned to the PHP version. // When changes are made in Mobile_Detect.php, copy this method and replace: // $this-> / t. // self::MOBILE_GRADE_(.) / '$1' // , self::VERSION_TYPE_FLOAT / (nothing) // isIOS() / os('iOS') // [reg] / (nothing) <-- jsdelivr complaining about unescaped unicode character U+00AE var $isMobile = t.mobile() !== null; if ( // Apple iOS 3.2-5.1 - Tested on the original iPad (4.3 / 5.0), iPad 2 (4.3), iPad 3 (5.1), original iPhone (3.1), iPhone 3 (3.2), 3GS (4.3), 4 (4.3 / 5.0), and 4S (5.1) t.os('iOS') && t.version('iPad')>=4.3 || t.os('iOS') && t.version('iPhone')>=3.1 || t.os('iOS') && t.version('iPod')>=3.1 || // Android 2.1-2.3 - Tested on the HTC Incredible (2.2), original Droid (2.2), HTC Aria (2.1), Google Nexus S (2.3). Functional on 1.5 & 1.6 but performance may be sluggish, tested on Google G1 (1.5) // Android 3.1 (Honeycomb) - Tested on the Samsung Galaxy Tab 10.1 and Motorola XOOM // Android 4.0 (ICS) - Tested on a Galaxy Nexus. Note: transition performance can be poor on upgraded devices // Android 4.1 (Jelly Bean) - Tested on a Galaxy Nexus and Galaxy 7 ( t.version('Android')>2.1 && t.is('Webkit') ) || // Windows Phone 7-7.5 - Tested on the HTC Surround (7.0) HTC Trophy (7.5), LG-E900 (7.5), Nokia Lumia 800 t.version('Windows Phone OS')>=7.0 || // Blackberry 7 - Tested on BlackBerry Torch 9810 // Blackberry 6.0 - Tested on the Torch 9800 and Style 9670 t.is('BlackBerry') && t.version('BlackBerry')>=6.0 || // Blackberry Playbook (1.0-2.0) - Tested on PlayBook t.match('Playbook.*Tablet') || // Palm WebOS (1.4-2.0) - Tested on the Palm Pixi (1.4), Pre (1.4), Pre 2 (2.0) ( t.version('webOS')>=1.4 && t.match('Palm|Pre|Pixi') ) || // Palm WebOS 3.0 - Tested on HP TouchPad t.match('hp.*TouchPad') || // Firefox Mobile (12 Beta) - Tested on Android 2.3 device ( t.is('Firefox') && t.version('Firefox')>=12 ) || // Chrome for Android - Tested on Android 4.0, 4.1 device ( t.is('Chrome') && t.is('AndroidOS') && t.version('Android')>=4.0 ) || // Skyfire 4.1 - Tested on Android 2.3 device ( t.is('Skyfire') && t.version('Skyfire')>=4.1 && t.is('AndroidOS') && t.version('Android')>=2.3 ) || // Opera Mobile 11.5-12: Tested on Android 2.3 ( t.is('Opera') && t.version('Opera Mobi')>11 && t.is('AndroidOS') ) || // Meego 1.2 - Tested on Nokia 950 and N9 t.is('MeeGoOS') || // Tizen (pre-release) - Tested on early hardware t.is('Tizen') || // Samsung Bada 2.0 - Tested on a Samsung Wave 3, Dolphin browser // @todo: more tests here! t.is('Dolfin') && t.version('Bada')>=2.0 || // UC Browser - Tested on Android 2.3 device ( (t.is('UC Browser') || t.is('Dolfin')) && t.version('Android')>=2.3 ) || // Kindle 3 and Fire - Tested on the built-in WebKit browser for each ( t.match('Kindle Fire') || t.is('Kindle') && t.version('Kindle')>=3.0 ) || // Nook Color 1.4.1 - Tested on original Nook Color, not Nook Tablet t.is('AndroidOS') && t.is('NookTablet') || // Chrome Desktop 11-21 - Tested on OS X 10.7 and Windows 7 t.version('Chrome')>=11 && !$isMobile || // Safari Desktop 4-5 - Tested on OS X 10.7 and Windows 7 t.version('Safari')>=5.0 && !$isMobile || // Firefox Desktop 4-13 - Tested on OS X 10.7 and Windows 7 t.version('Firefox')>=4.0 && !$isMobile || // Internet Explorer 7-9 - Tested on Windows XP, Vista and 7 t.version('MSIE')>=7.0 && !$isMobile || // Opera Desktop 10-12 - Tested on OS X 10.7 and Windows 7 // @reference: http://my.opera.com/community/openweb/idopera/ t.version('Opera')>=10 && !$isMobile ){ return 'A'; } if ( t.os('iOS') && t.version('iPad')<4.3 || t.os('iOS') && t.version('iPhone')<3.1 || t.os('iOS') && t.version('iPod')<3.1 || // Blackberry 5.0: Tested on the Storm 2 9550, Bold 9770 t.is('Blackberry') && t.version('BlackBerry')>=5 && t.version('BlackBerry')<6 || //Opera Mini (5.0-6.5) - Tested on iOS 3.2/4.3 and Android 2.3 ( t.version('Opera Mini')>=5.0 && t.version('Opera Mini')<=6.5 && (t.version('Android')>=2.3 || t.is('iOS')) ) || // Nokia Symbian^3 - Tested on Nokia N8 (Symbian^3), C7 (Symbian^3), also works on N97 (Symbian^1) t.match('NokiaN8|NokiaC7|N97.*Series60|Symbian/3') || // @todo: report this (tested on Nokia N71) t.version('Opera Mobi')>=11 && t.is('SymbianOS') ){ return 'B'; } if ( // Blackberry 4.x - Tested on the Curve 8330 t.version('BlackBerry')<5.0 || // Windows Mobile - Tested on the HTC Leo (WinMo 5.2) t.match('MSIEMobile|Windows CE.*Mobile') || t.version('Windows Mobile')<=5.2 ){ return 'C'; } //All older smartphone platforms and featurephones - Any device that doesn't support media queries //will receive the basic, C grade experience. return 'C'; }; impl.detectOS = function (ua) { return impl.findMatch(impl.mobileDetectRules.oss0, ua) || impl.findMatch(impl.mobileDetectRules.oss, ua); }; impl.getDeviceSmallerSide = function () { return window.screen.width < window.screen.height ? window.screen.width : window.screen.height; }; /** * Constructor for MobileDetect object. *
* Such an object will keep a reference to the given user-agent string and cache most of the detect queries.
*
* Find information how to download and install: * github.com/hgoebl/mobile-detect.js/ *
* * @example 
     *     var md = new MobileDetect(window.navigator.userAgent);     *     if (md.mobile()) {     *         location.href = (md.mobileGrade() === 'A') ? '/mobile/' : '/lynx/';     *     }     *
* * @param {string} userAgent typically taken from window.navigator.userAgent or http_header['User-Agent'] * @param {number} [maxPhoneWidth=600] only for browsers specify a value for the maximum * width of smallest device side (in logical "CSS" pixels) until a device detected as mobile will be handled * as phone. * This is only used in cases where the device cannot be classified as phone or tablet.
* See Declaring Tablet Layouts * for Android.
* If you provide a value < 0, then this "fuzzy" check is disabled. * @constructor * @global */ function MobileDetect(userAgent, maxPhoneWidth) { this.ua = userAgent || ''; this._cache = {}; //600dp is typical 7" tablet minimum width this.maxPhoneWidth = maxPhoneWidth || 600; } MobileDetect.prototype = { constructor: MobileDetect, /** * Returns the detected phone or tablet type or null if it is not a mobile device. *
* For a list of possible return values see {@link MobileDetect#phone} and {@link MobileDetect#tablet}.
*
* If the device is not detected by the regular expressions from Mobile-Detect, a test is made against * the patterns of detectmobilebrowsers.com. If this test * is positive, a value of UnknownPhone, UnknownTablet or * UnknownMobile is returned.
* When used in browser, the decision whether phone or tablet is made based on screen.width/height.
*
* When used server-side (node.js), there is no way to tell the difference between UnknownTablet * and UnknownMobile, so you will get UnknownMobile here.
* Be aware that since v1.0.0 in this special case you will get UnknownMobile only for: * {@link MobileDetect#mobile}, not for {@link MobileDetect#phone} and {@link MobileDetect#tablet}. * In versions before v1.0.0 all 3 methods returned UnknownMobile which was tedious to use. *
* In most cases you will use the return value just as a boolean. * * @returns {String} the key for the phone family or tablet family, e.g. "Nexus". * @function MobileDetect#mobile */ mobile: function () { impl.prepareDetectionCache(this._cache, this.ua, this.maxPhoneWidth); return this._cache.mobile; }, /** * Returns the detected phone type/family string or null. *
* The returned tablet (family or producer) is one of following keys:
*
iPhone, BlackBerry, HTC, Nexus, Dell, Motorola, Samsung, LG, Sony, Asus, * NokiaLumia, Micromax, Palm, Vertu, Pantech, Fly, Wiko, iMobile, SimValley, * Wolfgang, Alcatel, Nintendo, Amoi, INQ, GenericPhone
*
* If the device is not detected by the regular expressions from Mobile-Detect, a test is made against * the patterns of detectmobilebrowsers.com. If this test * is positive, a value of UnknownPhone or UnknownMobile is returned.
* When used in browser, the decision whether phone or tablet is made based on screen.width/height.
*
* When used server-side (node.js), there is no way to tell the difference between UnknownTablet * and UnknownMobile, so you will get null here, while {@link MobileDetect#mobile} * will return UnknownMobile.
* Be aware that since v1.0.0 in this special case you will get UnknownMobile only for: * {@link MobileDetect#mobile}, not for {@link MobileDetect#phone} and {@link MobileDetect#tablet}. * In versions before v1.0.0 all 3 methods returned UnknownMobile which was tedious to use. *
* In most cases you will use the return value just as a boolean. * * @returns {String} the key of the phone family or producer, e.g. "iPhone" * @function MobileDetect#phone */ phone: function () { impl.prepareDetectionCache(this._cache, this.ua, this.maxPhoneWidth); return this._cache.phone; }, /** * Returns the detected tablet type/family string or null. *
* The returned tablet (family or producer) is one of following keys:
*
iPad, NexusTablet, SamsungTablet, Kindle, SurfaceTablet, HPTablet, AsusTablet, * BlackBerryTablet, HTCtablet, MotorolaTablet, NookTablet, AcerTablet, * ToshibaTablet, LGTablet, FujitsuTablet, PrestigioTablet, LenovoTablet, * DellTablet, YarvikTablet, MedionTablet, ArnovaTablet, IntensoTablet, IRUTablet, * MegafonTablet, EbodaTablet, AllViewTablet, ArchosTablet, AinolTablet, * NokiaLumiaTablet, SonyTablet, PhilipsTablet, CubeTablet, CobyTablet, MIDTablet, * MSITablet, SMiTTablet, RockChipTablet, FlyTablet, bqTablet, HuaweiTablet, * NecTablet, PantechTablet, BronchoTablet, VersusTablet, ZyncTablet, * PositivoTablet, NabiTablet, KoboTablet, DanewTablet, TexetTablet, * PlaystationTablet, TrekstorTablet, PyleAudioTablet, AdvanTablet, * DanyTechTablet, GalapadTablet, MicromaxTablet, KarbonnTablet, AllFineTablet, * PROSCANTablet, YONESTablet, ChangJiaTablet, GUTablet, PointOfViewTablet, * OvermaxTablet, HCLTablet, DPSTablet, VistureTablet, CrestaTablet, * MediatekTablet, ConcordeTablet, GoCleverTablet, ModecomTablet, VoninoTablet, * ECSTablet, StorexTablet, VodafoneTablet, EssentielBTablet, RossMoorTablet, * iMobileTablet, TolinoTablet, AudioSonicTablet, AMPETablet, SkkTablet, * TecnoTablet, JXDTablet, iJoyTablet, FX2Tablet, XoroTablet, ViewsonicTablet, * OdysTablet, CaptivaTablet, IconbitTablet, TeclastTablet, OndaTablet, * JaytechTablet, BlaupunktTablet, DigmaTablet, EvolioTablet, LavaTablet, * AocTablet, MpmanTablet, CelkonTablet, WolderTablet, MiTablet, NibiruTablet, * NexoTablet, LeaderTablet, UbislateTablet, PocketBookTablet, KocasoTablet, Hudl, * TelstraTablet, GenericTablet
*
* If the device is not detected by the regular expressions from Mobile-Detect, a test is made against * the patterns of detectmobilebrowsers.com. If this test * is positive, a value of UnknownTablet or UnknownMobile is returned.
* When used in browser, the decision whether phone or tablet is made based on screen.width/height.
*
* When used server-side (node.js), there is no way to tell the difference between UnknownTablet * and UnknownMobile, so you will get null here, while {@link MobileDetect#mobile} * will return UnknownMobile.
* Be aware that since v1.0.0 in this special case you will get UnknownMobile only for: * {@link MobileDetect#mobile}, not for {@link MobileDetect#phone} and {@link MobileDetect#tablet}. * In versions before v1.0.0 all 3 methods returned UnknownMobile which was tedious to use. *
* In most cases you will use the return value just as a boolean. * * @returns {String} the key of the tablet family or producer, e.g. "SamsungTablet" * @function MobileDetect#tablet */ tablet: function () { impl.prepareDetectionCache(this._cache, this.ua, this.maxPhoneWidth); return this._cache.tablet; }, /** * Returns the (first) detected user-agent string or null. *
* The returned user-agent is one of following keys:
*
Vivaldi, Chrome, Dolfin, Opera, Skyfire, Edge, IE, Firefox, Bolt, TeaShark, * Blazer, Safari, Tizen, UCBrowser, baiduboxapp, baidubrowser, DiigoBrowser, * Puffin, Mercury, ObigoBrowser, NetFront, GenericBrowser, PaleMoon
*
* In most cases calling {@link MobileDetect#userAgent} will be sufficient. But there are rare * cases where a mobile device pretends to be more than one particular browser. You can get the * list of all matches with {@link MobileDetect#userAgents} or check for a particular value by * providing one of the defined keys as first argument to {@link MobileDetect#is}. * * @returns {String} the key for the detected user-agent or null * @function MobileDetect#userAgent */ userAgent: function () { if (this._cache.userAgent === undefined) { this._cache.userAgent = impl.findMatch(impl.mobileDetectRules.uas, this.ua); } return this._cache.userAgent; }, /** * Returns all detected user-agent strings. *
* The array is empty or contains one or more of following keys:
*
Vivaldi, Chrome, Dolfin, Opera, Skyfire, Edge, IE, Firefox, Bolt, TeaShark, * Blazer, Safari, Tizen, UCBrowser, baiduboxapp, baidubrowser, DiigoBrowser, * Puffin, Mercury, ObigoBrowser, NetFront, GenericBrowser, PaleMoon
*
* In most cases calling {@link MobileDetect#userAgent} will be sufficient. But there are rare * cases where a mobile device pretends to be more than one particular browser. You can get the * list of all matches with {@link MobileDetect#userAgents} or check for a particular value by * providing one of the defined keys as first argument to {@link MobileDetect#is}. * * @returns {Array} the array of detected user-agent keys or [] * @function MobileDetect#userAgents */ userAgents: function () { if (this._cache.userAgents === undefined) { this._cache.userAgents = impl.findMatches(impl.mobileDetectRules.uas, this.ua); } return this._cache.userAgents; }, /** * Returns the detected operating system string or null. *
* The operating system is one of following keys:
*
AndroidOS, BlackBerryOS, PalmOS, SymbianOS, WindowsMobileOS, WindowsPhoneOS, * iOS, MeeGoOS, MaemoOS, JavaOS, webOS, badaOS, BREWOS
* * @returns {String} the key for the detected operating system. * @function MobileDetect#os */ os: function () { if (this._cache.os === undefined) { this._cache.os = impl.detectOS(this.ua); } return this._cache.os; }, /** * Get the version (as Number) of the given property in the User-Agent. *
* Will return a float number. (eg. 2_0 will return 2.0, 4.3.1 will return 4.31) * * @param {String} key a key defining a thing which has a version.
* You can use one of following keys:
*
Mobile, Build, Version, VendorID, iPad, iPhone, iPod, Kindle, Chrome, Coast, * Dolfin, Firefox, Fennec, Edge, IE, NetFront, NokiaBrowser, Opera, Opera Mini, * Opera Mobi, UC Browser, MQQBrowser, MicroMessenger, baiduboxapp, baidubrowser, * Iron, Safari, Skyfire, Tizen, Webkit, PaleMoon, Gecko, Trident, Presto, Goanna, * iOS, Android, BlackBerry, BREW, Java, Windows Phone OS, Windows Phone, Windows * CE, Windows NT, Symbian, webOS
* * @returns {Number} the version as float or NaN if User-Agent doesn't contain this version. * Be careful when comparing this value with '==' operator! * @function MobileDetect#version */ version: function (key) { return impl.getVersion(key, this.ua); }, /** * Get the version (as String) of the given property in the User-Agent. *
* * @param {String} key a key defining a thing which has a version.
* You can use one of following keys:
*
Mobile, Build, Version, VendorID, iPad, iPhone, iPod, Kindle, Chrome, Coast, * Dolfin, Firefox, Fennec, Edge, IE, NetFront, NokiaBrowser, Opera, Opera Mini, * Opera Mobi, UC Browser, MQQBrowser, MicroMessenger, baiduboxapp, baidubrowser, * Iron, Safari, Skyfire, Tizen, Webkit, PaleMoon, Gecko, Trident, Presto, Goanna, * iOS, Android, BlackBerry, BREW, Java, Windows Phone OS, Windows Phone, Windows * CE, Windows NT, Symbian, webOS
* * @returns {String} the "raw" version as String or null if User-Agent doesn't contain this version. * * @function MobileDetect#versionStr */ versionStr: function (key) { return impl.getVersionStr(key, this.ua); }, /** * Global test key against userAgent, os, phone, tablet and some other properties of userAgent string. * * @param {String} key the key (case-insensitive) of a userAgent, an operating system, phone or * tablet family.
* For a complete list of possible values, see {@link MobileDetect#userAgent}, * {@link MobileDetect#os}, {@link MobileDetect#phone}, {@link MobileDetect#tablet}.
* Additionally you have following keys:
*
Bot, MobileBot, DesktopMode, TV, WebKit, Console, Watch
* * @returns {boolean} true when the given key is one of the defined keys of userAgent, os, phone, * tablet or one of the listed additional keys, otherwise false * @function MobileDetect#is */ is: function (key) { return containsIC(this.userAgents(), key) || equalIC(key, this.os()) || equalIC(key, this.phone()) || equalIC(key, this.tablet()) || containsIC(impl.findMatches(impl.mobileDetectRules.utils, this.ua), key); }, /** * Do a quick test against navigator::userAgent. * * @param {String|RegExp} pattern the pattern, either as String or RegExp * (a string will be converted to a case-insensitive RegExp). * @returns {boolean} true when the pattern matches, otherwise false * @function MobileDetect#match */ match: function (pattern) { if (!(pattern instanceof RegExp)) { pattern = new RegExp(pattern, 'i'); } return pattern.test(this.ua); }, /** * Checks whether the mobile device can be considered as phone regarding screen.width. *
* Obviously this method makes sense in browser environments only (not for Node.js)! * @param {number} [maxPhoneWidth] the maximum logical pixels (aka. CSS-pixels) to be considered as phone.
* The argument is optional and if not present or falsy, the value of the constructor is taken. * @returns {boolean|undefined} undefined if screen size wasn't detectable, else true * when screen.width is less or equal to maxPhoneWidth, otherwise false.
* Will always return undefined server-side. */ isPhoneSized: function (maxPhoneWidth) { return MobileDetect.isPhoneSized(maxPhoneWidth || this.maxPhoneWidth); }, /** * Returns the mobile grade ('A', 'B', 'C'). * * @returns {String} one of the mobile grades ('A', 'B', 'C'). * @function MobileDetect#mobileGrade */ mobileGrade: function () { if (this._cache.grade === undefined) { this._cache.grade = impl.mobileGrade(this); } return this._cache.grade; } }; // environment-dependent if (typeof window !== 'undefined' && window.screen) { MobileDetect.isPhoneSized = function (maxPhoneWidth) { return maxPhoneWidth < 0 ? undefined : impl.getDeviceSmallerSide() <= maxPhoneWidth; }; } else { MobileDetect.isPhoneSized = function () {}; } // should not be replaced by a completely new object - just overwrite existing methods MobileDetect._impl = impl; MobileDetect.version = '1.3.3 2016-07-31'; return MobileDetect;} : () => { (userAgent: any, maxPhoneWidth: any): void; isPhoneSized(maxPhoneWidth: any): any; _impl: {}; version: string; } +>function () { 'use strict'; var impl = {}; impl.mobileDetectRules = { "phones": { "iPhone": "\\biPhone\\b|\\biPod\\b", "BlackBerry": "BlackBerry|\\bBB10\\b|rim[0-9]+", "HTC": "HTC|HTC.*(Sensation|Evo|Vision|Explorer|6800|8100|8900|A7272|S510e|C110e|Legend|Desire|T8282)|APX515CKT|Qtek9090|APA9292KT|HD_mini|Sensation.*Z710e|PG86100|Z715e|Desire.*(A8181|HD)|ADR6200|ADR6400L|ADR6425|001HT|Inspire 4G|Android.*\\bEVO\\b|T-Mobile G1|Z520m", "Nexus": "Nexus One|Nexus S|Galaxy.*Nexus|Android.*Nexus.*Mobile|Nexus 4|Nexus 5|Nexus 6", "Dell": "Dell.*Streak|Dell.*Aero|Dell.*Venue|DELL.*Venue Pro|Dell Flash|Dell Smoke|Dell Mini 3iX|XCD28|XCD35|\\b001DL\\b|\\b101DL\\b|\\bGS01\\b", "Motorola": "Motorola|DROIDX|DROID BIONIC|\\bDroid\\b.*Build|Android.*Xoom|HRI39|MOT-|A1260|A1680|A555|A853|A855|A953|A955|A956|Motorola.*ELECTRIFY|Motorola.*i1|i867|i940|MB200|MB300|MB501|MB502|MB508|MB511|MB520|MB525|MB526|MB611|MB612|MB632|MB810|MB855|MB860|MB861|MB865|MB870|ME501|ME502|ME511|ME525|ME600|ME632|ME722|ME811|ME860|ME863|ME865|MT620|MT710|MT716|MT720|MT810|MT870|MT917|Motorola.*TITANIUM|WX435|WX445|XT300|XT301|XT311|XT316|XT317|XT319|XT320|XT390|XT502|XT530|XT531|XT532|XT535|XT603|XT610|XT611|XT615|XT681|XT701|XT702|XT711|XT720|XT800|XT806|XT860|XT862|XT875|XT882|XT883|XT894|XT901|XT907|XT909|XT910|XT912|XT928|XT926|XT915|XT919|XT925|XT1021|\\bMoto E\\b", "Samsung": "Samsung|SM-G9250|GT-19300|SGH-I337|BGT-S5230|GT-B2100|GT-B2700|GT-B2710|GT-B3210|GT-B3310|GT-B3410|GT-B3730|GT-B3740|GT-B5510|GT-B5512|GT-B5722|GT-B6520|GT-B7300|GT-B7320|GT-B7330|GT-B7350|GT-B7510|GT-B7722|GT-B7800|GT-C3010|GT-C3011|GT-C3060|GT-C3200|GT-C3212|GT-C3212I|GT-C3262|GT-C3222|GT-C3300|GT-C3300K|GT-C3303|GT-C3303K|GT-C3310|GT-C3322|GT-C3330|GT-C3350|GT-C3500|GT-C3510|GT-C3530|GT-C3630|GT-C3780|GT-C5010|GT-C5212|GT-C6620|GT-C6625|GT-C6712|GT-E1050|GT-E1070|GT-E1075|GT-E1080|GT-E1081|GT-E1085|GT-E1087|GT-E1100|GT-E1107|GT-E1110|GT-E1120|GT-E1125|GT-E1130|GT-E1160|GT-E1170|GT-E1175|GT-E1180|GT-E1182|GT-E1200|GT-E1210|GT-E1225|GT-E1230|GT-E1390|GT-E2100|GT-E2120|GT-E2121|GT-E2152|GT-E2220|GT-E2222|GT-E2230|GT-E2232|GT-E2250|GT-E2370|GT-E2550|GT-E2652|GT-E3210|GT-E3213|GT-I5500|GT-I5503|GT-I5700|GT-I5800|GT-I5801|GT-I6410|GT-I6420|GT-I7110|GT-I7410|GT-I7500|GT-I8000|GT-I8150|GT-I8160|GT-I8190|GT-I8320|GT-I8330|GT-I8350|GT-I8530|GT-I8700|GT-I8703|GT-I8910|GT-I9000|GT-I9001|GT-I9003|GT-I9010|GT-I9020|GT-I9023|GT-I9070|GT-I9082|GT-I9100|GT-I9103|GT-I9220|GT-I9250|GT-I9300|GT-I9305|GT-I9500|GT-I9505|GT-M3510|GT-M5650|GT-M7500|GT-M7600|GT-M7603|GT-M8800|GT-M8910|GT-N7000|GT-S3110|GT-S3310|GT-S3350|GT-S3353|GT-S3370|GT-S3650|GT-S3653|GT-S3770|GT-S3850|GT-S5210|GT-S5220|GT-S5229|GT-S5230|GT-S5233|GT-S5250|GT-S5253|GT-S5260|GT-S5263|GT-S5270|GT-S5300|GT-S5330|GT-S5350|GT-S5360|GT-S5363|GT-S5369|GT-S5380|GT-S5380D|GT-S5560|GT-S5570|GT-S5600|GT-S5603|GT-S5610|GT-S5620|GT-S5660|GT-S5670|GT-S5690|GT-S5750|GT-S5780|GT-S5830|GT-S5839|GT-S6102|GT-S6500|GT-S7070|GT-S7200|GT-S7220|GT-S7230|GT-S7233|GT-S7250|GT-S7500|GT-S7530|GT-S7550|GT-S7562|GT-S7710|GT-S8000|GT-S8003|GT-S8500|GT-S8530|GT-S8600|SCH-A310|SCH-A530|SCH-A570|SCH-A610|SCH-A630|SCH-A650|SCH-A790|SCH-A795|SCH-A850|SCH-A870|SCH-A890|SCH-A930|SCH-A950|SCH-A970|SCH-A990|SCH-I100|SCH-I110|SCH-I400|SCH-I405|SCH-I500|SCH-I510|SCH-I515|SCH-I600|SCH-I730|SCH-I760|SCH-I770|SCH-I830|SCH-I910|SCH-I920|SCH-I959|SCH-LC11|SCH-N150|SCH-N300|SCH-R100|SCH-R300|SCH-R351|SCH-R400|SCH-R410|SCH-T300|SCH-U310|SCH-U320|SCH-U350|SCH-U360|SCH-U365|SCH-U370|SCH-U380|SCH-U410|SCH-U430|SCH-U450|SCH-U460|SCH-U470|SCH-U490|SCH-U540|SCH-U550|SCH-U620|SCH-U640|SCH-U650|SCH-U660|SCH-U700|SCH-U740|SCH-U750|SCH-U810|SCH-U820|SCH-U900|SCH-U940|SCH-U960|SCS-26UC|SGH-A107|SGH-A117|SGH-A127|SGH-A137|SGH-A157|SGH-A167|SGH-A177|SGH-A187|SGH-A197|SGH-A227|SGH-A237|SGH-A257|SGH-A437|SGH-A517|SGH-A597|SGH-A637|SGH-A657|SGH-A667|SGH-A687|SGH-A697|SGH-A707|SGH-A717|SGH-A727|SGH-A737|SGH-A747|SGH-A767|SGH-A777|SGH-A797|SGH-A817|SGH-A827|SGH-A837|SGH-A847|SGH-A867|SGH-A877|SGH-A887|SGH-A897|SGH-A927|SGH-B100|SGH-B130|SGH-B200|SGH-B220|SGH-C100|SGH-C110|SGH-C120|SGH-C130|SGH-C140|SGH-C160|SGH-C170|SGH-C180|SGH-C200|SGH-C207|SGH-C210|SGH-C225|SGH-C230|SGH-C417|SGH-C450|SGH-D307|SGH-D347|SGH-D357|SGH-D407|SGH-D415|SGH-D780|SGH-D807|SGH-D980|SGH-E105|SGH-E200|SGH-E315|SGH-E316|SGH-E317|SGH-E335|SGH-E590|SGH-E635|SGH-E715|SGH-E890|SGH-F300|SGH-F480|SGH-I200|SGH-I300|SGH-I320|SGH-I550|SGH-I577|SGH-I600|SGH-I607|SGH-I617|SGH-I627|SGH-I637|SGH-I677|SGH-I700|SGH-I717|SGH-I727|SGH-i747M|SGH-I777|SGH-I780|SGH-I827|SGH-I847|SGH-I857|SGH-I896|SGH-I897|SGH-I900|SGH-I907|SGH-I917|SGH-I927|SGH-I937|SGH-I997|SGH-J150|SGH-J200|SGH-L170|SGH-L700|SGH-M110|SGH-M150|SGH-M200|SGH-N105|SGH-N500|SGH-N600|SGH-N620|SGH-N625|SGH-N700|SGH-N710|SGH-P107|SGH-P207|SGH-P300|SGH-P310|SGH-P520|SGH-P735|SGH-P777|SGH-Q105|SGH-R210|SGH-R220|SGH-R225|SGH-S105|SGH-S307|SGH-T109|SGH-T119|SGH-T139|SGH-T209|SGH-T219|SGH-T229|SGH-T239|SGH-T249|SGH-T259|SGH-T309|SGH-T319|SGH-T329|SGH-T339|SGH-T349|SGH-T359|SGH-T369|SGH-T379|SGH-T409|SGH-T429|SGH-T439|SGH-T459|SGH-T469|SGH-T479|SGH-T499|SGH-T509|SGH-T519|SGH-T539|SGH-T559|SGH-T589|SGH-T609|SGH-T619|SGH-T629|SGH-T639|SGH-T659|SGH-T669|SGH-T679|SGH-T709|SGH-T719|SGH-T729|SGH-T739|SGH-T746|SGH-T749|SGH-T759|SGH-T769|SGH-T809|SGH-T819|SGH-T839|SGH-T919|SGH-T929|SGH-T939|SGH-T959|SGH-T989|SGH-U100|SGH-U200|SGH-U800|SGH-V205|SGH-V206|SGH-X100|SGH-X105|SGH-X120|SGH-X140|SGH-X426|SGH-X427|SGH-X475|SGH-X495|SGH-X497|SGH-X507|SGH-X600|SGH-X610|SGH-X620|SGH-X630|SGH-X700|SGH-X820|SGH-X890|SGH-Z130|SGH-Z150|SGH-Z170|SGH-ZX10|SGH-ZX20|SHW-M110|SPH-A120|SPH-A400|SPH-A420|SPH-A460|SPH-A500|SPH-A560|SPH-A600|SPH-A620|SPH-A660|SPH-A700|SPH-A740|SPH-A760|SPH-A790|SPH-A800|SPH-A820|SPH-A840|SPH-A880|SPH-A900|SPH-A940|SPH-A960|SPH-D600|SPH-D700|SPH-D710|SPH-D720|SPH-I300|SPH-I325|SPH-I330|SPH-I350|SPH-I500|SPH-I600|SPH-I700|SPH-L700|SPH-M100|SPH-M220|SPH-M240|SPH-M300|SPH-M305|SPH-M320|SPH-M330|SPH-M350|SPH-M360|SPH-M370|SPH-M380|SPH-M510|SPH-M540|SPH-M550|SPH-M560|SPH-M570|SPH-M580|SPH-M610|SPH-M620|SPH-M630|SPH-M800|SPH-M810|SPH-M850|SPH-M900|SPH-M910|SPH-M920|SPH-M930|SPH-N100|SPH-N200|SPH-N240|SPH-N300|SPH-N400|SPH-Z400|SWC-E100|SCH-i909|GT-N7100|GT-N7105|SCH-I535|SM-N900A|SGH-I317|SGH-T999L|GT-S5360B|GT-I8262|GT-S6802|GT-S6312|GT-S6310|GT-S5312|GT-S5310|GT-I9105|GT-I8510|GT-S6790N|SM-G7105|SM-N9005|GT-S5301|GT-I9295|GT-I9195|SM-C101|GT-S7392|GT-S7560|GT-B7610|GT-I5510|GT-S7582|GT-S7530E|GT-I8750|SM-G9006V|SM-G9008V|SM-G9009D|SM-G900A|SM-G900D|SM-G900F|SM-G900H|SM-G900I|SM-G900J|SM-G900K|SM-G900L|SM-G900M|SM-G900P|SM-G900R4|SM-G900S|SM-G900T|SM-G900V|SM-G900W8|SHV-E160K|SCH-P709|SCH-P729|SM-T2558|GT-I9205|SM-G9350|SM-J120F", "LG": "\\bLG\\b;|LG[- ]?(C800|C900|E400|E610|E900|E-900|F160|F180K|F180L|F180S|730|855|L160|LS740|LS840|LS970|LU6200|MS690|MS695|MS770|MS840|MS870|MS910|P500|P700|P705|VM696|AS680|AS695|AX840|C729|E970|GS505|272|C395|E739BK|E960|L55C|L75C|LS696|LS860|P769BK|P350|P500|P509|P870|UN272|US730|VS840|VS950|LN272|LN510|LS670|LS855|LW690|MN270|MN510|P509|P769|P930|UN200|UN270|UN510|UN610|US670|US740|US760|UX265|UX840|VN271|VN530|VS660|VS700|VS740|VS750|VS910|VS920|VS930|VX9200|VX11000|AX840A|LW770|P506|P925|P999|E612|D955|D802|MS323)", "Sony": "SonyST|SonyLT|SonyEricsson|SonyEricssonLT15iv|LT18i|E10i|LT28h|LT26w|SonyEricssonMT27i|C5303|C6902|C6903|C6906|C6943|D2533", "Asus": "Asus.*Galaxy|PadFone.*Mobile", "NokiaLumia": "Lumia [0-9]{3,4}", "Micromax": "Micromax.*\\b(A210|A92|A88|A72|A111|A110Q|A115|A116|A110|A90S|A26|A51|A35|A54|A25|A27|A89|A68|A65|A57|A90)\\b", "Palm": "PalmSource|Palm", "Vertu": "Vertu|Vertu.*Ltd|Vertu.*Ascent|Vertu.*Ayxta|Vertu.*Constellation(F|Quest)?|Vertu.*Monika|Vertu.*Signature", "Pantech": "PANTECH|IM-A850S|IM-A840S|IM-A830L|IM-A830K|IM-A830S|IM-A820L|IM-A810K|IM-A810S|IM-A800S|IM-T100K|IM-A725L|IM-A780L|IM-A775C|IM-A770K|IM-A760S|IM-A750K|IM-A740S|IM-A730S|IM-A720L|IM-A710K|IM-A690L|IM-A690S|IM-A650S|IM-A630K|IM-A600S|VEGA PTL21|PT003|P8010|ADR910L|P6030|P6020|P9070|P4100|P9060|P5000|CDM8992|TXT8045|ADR8995|IS11PT|P2030|P6010|P8000|PT002|IS06|CDM8999|P9050|PT001|TXT8040|P2020|P9020|P2000|P7040|P7000|C790", "Fly": "IQ230|IQ444|IQ450|IQ440|IQ442|IQ441|IQ245|IQ256|IQ236|IQ255|IQ235|IQ245|IQ275|IQ240|IQ285|IQ280|IQ270|IQ260|IQ250", "Wiko": "KITE 4G|HIGHWAY|GETAWAY|STAIRWAY|DARKSIDE|DARKFULL|DARKNIGHT|DARKMOON|SLIDE|WAX 4G|RAINBOW|BLOOM|SUNSET|GOA(?!nna)|LENNY|BARRY|IGGY|OZZY|CINK FIVE|CINK PEAX|CINK PEAX 2|CINK SLIM|CINK SLIM 2|CINK +|CINK KING|CINK PEAX|CINK SLIM|SUBLIM", "iMobile": "i-mobile (IQ|i-STYLE|idea|ZAA|Hitz)", "SimValley": "\\b(SP-80|XT-930|SX-340|XT-930|SX-310|SP-360|SP60|SPT-800|SP-120|SPT-800|SP-140|SPX-5|SPX-8|SP-100|SPX-8|SPX-12)\\b", "Wolfgang": "AT-B24D|AT-AS50HD|AT-AS40W|AT-AS55HD|AT-AS45q2|AT-B26D|AT-AS50Q", "Alcatel": "Alcatel", "Nintendo": "Nintendo 3DS", "Amoi": "Amoi", "INQ": "INQ", "GenericPhone": "Tapatalk|PDA;|SAGEM|\\bmmp\\b|pocket|\\bpsp\\b|symbian|Smartphone|smartfon|treo|up.browser|up.link|vodafone|\\bwap\\b|nokia|Series40|Series60|S60|SonyEricsson|N900|MAUI.*WAP.*Browser" }, "tablets": { "iPad": "iPad|iPad.*Mobile", "NexusTablet": "Android.*Nexus[\\s]+(7|9|10)", "SamsungTablet": "SAMSUNG.*Tablet|Galaxy.*Tab|SC-01C|GT-P1000|GT-P1003|GT-P1010|GT-P3105|GT-P6210|GT-P6800|GT-P6810|GT-P7100|GT-P7300|GT-P7310|GT-P7500|GT-P7510|SCH-I800|SCH-I815|SCH-I905|SGH-I957|SGH-I987|SGH-T849|SGH-T859|SGH-T869|SPH-P100|GT-P3100|GT-P3108|GT-P3110|GT-P5100|GT-P5110|GT-P6200|GT-P7320|GT-P7511|GT-N8000|GT-P8510|SGH-I497|SPH-P500|SGH-T779|SCH-I705|SCH-I915|GT-N8013|GT-P3113|GT-P5113|GT-P8110|GT-N8010|GT-N8005|GT-N8020|GT-P1013|GT-P6201|GT-P7501|GT-N5100|GT-N5105|GT-N5110|SHV-E140K|SHV-E140L|SHV-E140S|SHV-E150S|SHV-E230K|SHV-E230L|SHV-E230S|SHW-M180K|SHW-M180L|SHW-M180S|SHW-M180W|SHW-M300W|SHW-M305W|SHW-M380K|SHW-M380S|SHW-M380W|SHW-M430W|SHW-M480K|SHW-M480S|SHW-M480W|SHW-M485W|SHW-M486W|SHW-M500W|GT-I9228|SCH-P739|SCH-I925|GT-I9200|GT-P5200|GT-P5210|GT-P5210X|SM-T311|SM-T310|SM-T310X|SM-T210|SM-T210R|SM-T211|SM-P600|SM-P601|SM-P605|SM-P900|SM-P901|SM-T217|SM-T217A|SM-T217S|SM-P6000|SM-T3100|SGH-I467|XE500|SM-T110|GT-P5220|GT-I9200X|GT-N5110X|GT-N5120|SM-P905|SM-T111|SM-T2105|SM-T315|SM-T320|SM-T320X|SM-T321|SM-T520|SM-T525|SM-T530NU|SM-T230NU|SM-T330NU|SM-T900|XE500T1C|SM-P605V|SM-P905V|SM-T337V|SM-T537V|SM-T707V|SM-T807V|SM-P600X|SM-P900X|SM-T210X|SM-T230|SM-T230X|SM-T325|GT-P7503|SM-T531|SM-T330|SM-T530|SM-T705|SM-T705C|SM-T535|SM-T331|SM-T800|SM-T700|SM-T537|SM-T807|SM-P907A|SM-T337A|SM-T537A|SM-T707A|SM-T807A|SM-T237|SM-T807P|SM-P607T|SM-T217T|SM-T337T|SM-T807T|SM-T116NQ|SM-P550|SM-T350|SM-T550|SM-T9000|SM-P9000|SM-T705Y|SM-T805|GT-P3113|SM-T710|SM-T810|SM-T815|SM-T360|SM-T533|SM-T113|SM-T335|SM-T715|SM-T560|SM-T670|SM-T677|SM-T377|SM-T567|SM-T357T|SM-T555|SM-T561", "Kindle": "Kindle|Silk.*Accelerated|Android.*\\b(KFOT|KFTT|KFJWI|KFJWA|KFOTE|KFSOWI|KFTHWI|KFTHWA|KFAPWI|KFAPWA|WFJWAE|KFSAWA|KFSAWI|KFASWI|KFARWI)\\b", "SurfaceTablet": "Windows NT [0-9.]+; ARM;.*(Tablet|ARMBJS)", "HPTablet": "HP Slate (7|8|10)|HP ElitePad 900|hp-tablet|EliteBook.*Touch|HP 8|Slate 21|HP SlateBook 10", "AsusTablet": "^.*PadFone((?!Mobile).)*$|Transformer|TF101|TF101G|TF300T|TF300TG|TF300TL|TF700T|TF700KL|TF701T|TF810C|ME171|ME301T|ME302C|ME371MG|ME370T|ME372MG|ME172V|ME173X|ME400C|Slider SL101|\\bK00F\\b|\\bK00C\\b|\\bK00E\\b|\\bK00L\\b|TX201LA|ME176C|ME102A|\\bM80TA\\b|ME372CL|ME560CG|ME372CG|ME302KL| K010 | K017 |ME572C|ME103K|ME170C|ME171C|\\bME70C\\b|ME581C|ME581CL|ME8510C|ME181C|P01Y|PO1MA", "BlackBerryTablet": "PlayBook|RIM Tablet", "HTCtablet": "HTC_Flyer_P512|HTC Flyer|HTC Jetstream|HTC-P715a|HTC EVO View 4G|PG41200|PG09410", "MotorolaTablet": "xoom|sholest|MZ615|MZ605|MZ505|MZ601|MZ602|MZ603|MZ604|MZ606|MZ607|MZ608|MZ609|MZ615|MZ616|MZ617", "NookTablet": "Android.*Nook|NookColor|nook browser|BNRV200|BNRV200A|BNTV250|BNTV250A|BNTV400|BNTV600|LogicPD Zoom2", "AcerTablet": "Android.*; \\b(A100|A101|A110|A200|A210|A211|A500|A501|A510|A511|A700|A701|W500|W500P|W501|W501P|W510|W511|W700|G100|G100W|B1-A71|B1-710|B1-711|A1-810|A1-811|A1-830)\\b|W3-810|\\bA3-A10\\b|\\bA3-A11\\b|\\bA3-A20", "ToshibaTablet": "Android.*(AT100|AT105|AT200|AT205|AT270|AT275|AT300|AT305|AT1S5|AT500|AT570|AT700|AT830)|TOSHIBA.*FOLIO", "LGTablet": "\\bL-06C|LG-V909|LG-V900|LG-V700|LG-V510|LG-V500|LG-V410|LG-V400|LG-VK810\\b", "FujitsuTablet": "Android.*\\b(F-01D|F-02F|F-05E|F-10D|M532|Q572)\\b", "PrestigioTablet": "PMP3170B|PMP3270B|PMP3470B|PMP7170B|PMP3370B|PMP3570C|PMP5870C|PMP3670B|PMP5570C|PMP5770D|PMP3970B|PMP3870C|PMP5580C|PMP5880D|PMP5780D|PMP5588C|PMP7280C|PMP7280C3G|PMP7280|PMP7880D|PMP5597D|PMP5597|PMP7100D|PER3464|PER3274|PER3574|PER3884|PER5274|PER5474|PMP5097CPRO|PMP5097|PMP7380D|PMP5297C|PMP5297C_QUAD|PMP812E|PMP812E3G|PMP812F|PMP810E|PMP880TD|PMT3017|PMT3037|PMT3047|PMT3057|PMT7008|PMT5887|PMT5001|PMT5002", "LenovoTablet": "Lenovo TAB|Idea(Tab|Pad)( A1|A10| K1|)|ThinkPad([ ]+)?Tablet|YT3-X90L|YT3-X90F|YT3-X90X|Lenovo.*(S2109|S2110|S5000|S6000|K3011|A3000|A3500|A1000|A2107|A2109|A1107|A5500|A7600|B6000|B8000|B8080)(-|)(FL|F|HV|H|)", "DellTablet": "Venue 11|Venue 8|Venue 7|Dell Streak 10|Dell Streak 7", "YarvikTablet": "Android.*\\b(TAB210|TAB211|TAB224|TAB250|TAB260|TAB264|TAB310|TAB360|TAB364|TAB410|TAB411|TAB420|TAB424|TAB450|TAB460|TAB461|TAB464|TAB465|TAB467|TAB468|TAB07-100|TAB07-101|TAB07-150|TAB07-151|TAB07-152|TAB07-200|TAB07-201-3G|TAB07-210|TAB07-211|TAB07-212|TAB07-214|TAB07-220|TAB07-400|TAB07-485|TAB08-150|TAB08-200|TAB08-201-3G|TAB08-201-30|TAB09-100|TAB09-211|TAB09-410|TAB10-150|TAB10-201|TAB10-211|TAB10-400|TAB10-410|TAB13-201|TAB274EUK|TAB275EUK|TAB374EUK|TAB462EUK|TAB474EUK|TAB9-200)\\b", "MedionTablet": "Android.*\\bOYO\\b|LIFE.*(P9212|P9514|P9516|S9512)|LIFETAB", "ArnovaTablet": "AN10G2|AN7bG3|AN7fG3|AN8G3|AN8cG3|AN7G3|AN9G3|AN7dG3|AN7dG3ST|AN7dG3ChildPad|AN10bG3|AN10bG3DT|AN9G2", "IntensoTablet": "INM8002KP|INM1010FP|INM805ND|Intenso Tab|TAB1004", "IRUTablet": "M702pro", "MegafonTablet": "MegaFon V9|\\bZTE V9\\b|Android.*\\bMT7A\\b", "EbodaTablet": "E-Boda (Supreme|Impresspeed|Izzycomm|Essential)", "AllViewTablet": "Allview.*(Viva|Alldro|City|Speed|All TV|Frenzy|Quasar|Shine|TX1|AX1|AX2)", "ArchosTablet": "\\b(101G9|80G9|A101IT)\\b|Qilive 97R|Archos5|\\bARCHOS (70|79|80|90|97|101|FAMILYPAD|)(b|)(G10| Cobalt| TITANIUM(HD|)| Xenon| Neon|XSK| 2| XS 2| PLATINUM| CARBON|GAMEPAD)\\b", "AinolTablet": "NOVO7|NOVO8|NOVO10|Novo7Aurora|Novo7Basic|NOVO7PALADIN|novo9-Spark", "NokiaLumiaTablet": "Lumia 2520", "SonyTablet": "Sony.*Tablet|Xperia Tablet|Sony Tablet S|SO-03E|SGPT12|SGPT13|SGPT114|SGPT121|SGPT122|SGPT123|SGPT111|SGPT112|SGPT113|SGPT131|SGPT132|SGPT133|SGPT211|SGPT212|SGPT213|SGP311|SGP312|SGP321|EBRD1101|EBRD1102|EBRD1201|SGP351|SGP341|SGP511|SGP512|SGP521|SGP541|SGP551|SGP621|SGP612|SOT31", "PhilipsTablet": "\\b(PI2010|PI3000|PI3100|PI3105|PI3110|PI3205|PI3210|PI3900|PI4010|PI7000|PI7100)\\b", "CubeTablet": "Android.*(K8GT|U9GT|U10GT|U16GT|U17GT|U18GT|U19GT|U20GT|U23GT|U30GT)|CUBE U8GT", "CobyTablet": "MID1042|MID1045|MID1125|MID1126|MID7012|MID7014|MID7015|MID7034|MID7035|MID7036|MID7042|MID7048|MID7127|MID8042|MID8048|MID8127|MID9042|MID9740|MID9742|MID7022|MID7010", "MIDTablet": "M9701|M9000|M9100|M806|M1052|M806|T703|MID701|MID713|MID710|MID727|MID760|MID830|MID728|MID933|MID125|MID810|MID732|MID120|MID930|MID800|MID731|MID900|MID100|MID820|MID735|MID980|MID130|MID833|MID737|MID960|MID135|MID860|MID736|MID140|MID930|MID835|MID733|MID4X10", "MSITablet": "MSI \\b(Primo 73K|Primo 73L|Primo 81L|Primo 77|Primo 93|Primo 75|Primo 76|Primo 73|Primo 81|Primo 91|Primo 90|Enjoy 71|Enjoy 7|Enjoy 10)\\b", "SMiTTablet": "Android.*(\\bMID\\b|MID-560|MTV-T1200|MTV-PND531|MTV-P1101|MTV-PND530)", "RockChipTablet": "Android.*(RK2818|RK2808A|RK2918|RK3066)|RK2738|RK2808A", "FlyTablet": "IQ310|Fly Vision", "bqTablet": "Android.*(bq)?.*(Elcano|Curie|Edison|Maxwell|Kepler|Pascal|Tesla|Hypatia|Platon|Newton|Livingstone|Cervantes|Avant|Aquaris E10)|Maxwell.*Lite|Maxwell.*Plus", "HuaweiTablet": "MediaPad|MediaPad 7 Youth|IDEOS S7|S7-201c|S7-202u|S7-101|S7-103|S7-104|S7-105|S7-106|S7-201|S7-Slim", "NecTablet": "\\bN-06D|\\bN-08D", "PantechTablet": "Pantech.*P4100", "BronchoTablet": "Broncho.*(N701|N708|N802|a710)", "VersusTablet": "TOUCHPAD.*[78910]|\\bTOUCHTAB\\b", "ZyncTablet": "z1000|Z99 2G|z99|z930|z999|z990|z909|Z919|z900", "PositivoTablet": "TB07STA|TB10STA|TB07FTA|TB10FTA", "NabiTablet": "Android.*\\bNabi", "KoboTablet": "Kobo Touch|\\bK080\\b|\\bVox\\b Build|\\bArc\\b Build", "DanewTablet": "DSlide.*\\b(700|701R|702|703R|704|802|970|971|972|973|974|1010|1012)\\b", "TexetTablet": "NaviPad|TB-772A|TM-7045|TM-7055|TM-9750|TM-7016|TM-7024|TM-7026|TM-7041|TM-7043|TM-7047|TM-8041|TM-9741|TM-9747|TM-9748|TM-9751|TM-7022|TM-7021|TM-7020|TM-7011|TM-7010|TM-7023|TM-7025|TM-7037W|TM-7038W|TM-7027W|TM-9720|TM-9725|TM-9737W|TM-1020|TM-9738W|TM-9740|TM-9743W|TB-807A|TB-771A|TB-727A|TB-725A|TB-719A|TB-823A|TB-805A|TB-723A|TB-715A|TB-707A|TB-705A|TB-709A|TB-711A|TB-890HD|TB-880HD|TB-790HD|TB-780HD|TB-770HD|TB-721HD|TB-710HD|TB-434HD|TB-860HD|TB-840HD|TB-760HD|TB-750HD|TB-740HD|TB-730HD|TB-722HD|TB-720HD|TB-700HD|TB-500HD|TB-470HD|TB-431HD|TB-430HD|TB-506|TB-504|TB-446|TB-436|TB-416|TB-146SE|TB-126SE", "PlaystationTablet": "Playstation.*(Portable|Vita)", "TrekstorTablet": "ST10416-1|VT10416-1|ST70408-1|ST702xx-1|ST702xx-2|ST80208|ST97216|ST70104-2|VT10416-2|ST10216-2A|SurfTab", "PyleAudioTablet": "\\b(PTBL10CEU|PTBL10C|PTBL72BC|PTBL72BCEU|PTBL7CEU|PTBL7C|PTBL92BC|PTBL92BCEU|PTBL9CEU|PTBL9CUK|PTBL9C)\\b", "AdvanTablet": "Android.* \\b(E3A|T3X|T5C|T5B|T3E|T3C|T3B|T1J|T1F|T2A|T1H|T1i|E1C|T1-E|T5-A|T4|E1-B|T2Ci|T1-B|T1-D|O1-A|E1-A|T1-A|T3A|T4i)\\b ", "DanyTechTablet": "Genius Tab G3|Genius Tab S2|Genius Tab Q3|Genius Tab G4|Genius Tab Q4|Genius Tab G-II|Genius TAB GII|Genius TAB GIII|Genius Tab S1", "GalapadTablet": "Android.*\\bG1\\b", "MicromaxTablet": "Funbook|Micromax.*\\b(P250|P560|P360|P362|P600|P300|P350|P500|P275)\\b", "KarbonnTablet": "Android.*\\b(A39|A37|A34|ST8|ST10|ST7|Smart Tab3|Smart Tab2)\\b", "AllFineTablet": "Fine7 Genius|Fine7 Shine|Fine7 Air|Fine8 Style|Fine9 More|Fine10 Joy|Fine11 Wide", "PROSCANTablet": "\\b(PEM63|PLT1023G|PLT1041|PLT1044|PLT1044G|PLT1091|PLT4311|PLT4311PL|PLT4315|PLT7030|PLT7033|PLT7033D|PLT7035|PLT7035D|PLT7044K|PLT7045K|PLT7045KB|PLT7071KG|PLT7072|PLT7223G|PLT7225G|PLT7777G|PLT7810K|PLT7849G|PLT7851G|PLT7852G|PLT8015|PLT8031|PLT8034|PLT8036|PLT8080K|PLT8082|PLT8088|PLT8223G|PLT8234G|PLT8235G|PLT8816K|PLT9011|PLT9045K|PLT9233G|PLT9735|PLT9760G|PLT9770G)\\b", "YONESTablet": "BQ1078|BC1003|BC1077|RK9702|BC9730|BC9001|IT9001|BC7008|BC7010|BC708|BC728|BC7012|BC7030|BC7027|BC7026", "ChangJiaTablet": "TPC7102|TPC7103|TPC7105|TPC7106|TPC7107|TPC7201|TPC7203|TPC7205|TPC7210|TPC7708|TPC7709|TPC7712|TPC7110|TPC8101|TPC8103|TPC8105|TPC8106|TPC8203|TPC8205|TPC8503|TPC9106|TPC9701|TPC97101|TPC97103|TPC97105|TPC97106|TPC97111|TPC97113|TPC97203|TPC97603|TPC97809|TPC97205|TPC10101|TPC10103|TPC10106|TPC10111|TPC10203|TPC10205|TPC10503", "GUTablet": "TX-A1301|TX-M9002|Q702|kf026", "PointOfViewTablet": "TAB-P506|TAB-navi-7-3G-M|TAB-P517|TAB-P-527|TAB-P701|TAB-P703|TAB-P721|TAB-P731N|TAB-P741|TAB-P825|TAB-P905|TAB-P925|TAB-PR945|TAB-PL1015|TAB-P1025|TAB-PI1045|TAB-P1325|TAB-PROTAB[0-9]+|TAB-PROTAB25|TAB-PROTAB26|TAB-PROTAB27|TAB-PROTAB26XL|TAB-PROTAB2-IPS9|TAB-PROTAB30-IPS9|TAB-PROTAB25XXL|TAB-PROTAB26-IPS10|TAB-PROTAB30-IPS10", "OvermaxTablet": "OV-(SteelCore|NewBase|Basecore|Baseone|Exellen|Quattor|EduTab|Solution|ACTION|BasicTab|TeddyTab|MagicTab|Stream|TB-08|TB-09)", "HCLTablet": "HCL.*Tablet|Connect-3G-2.0|Connect-2G-2.0|ME Tablet U1|ME Tablet U2|ME Tablet G1|ME Tablet X1|ME Tablet Y2|ME Tablet Sync", "DPSTablet": "DPS Dream 9|DPS Dual 7", "VistureTablet": "V97 HD|i75 3G|Visture V4( HD)?|Visture V5( HD)?|Visture V10", "CrestaTablet": "CTP(-)?810|CTP(-)?818|CTP(-)?828|CTP(-)?838|CTP(-)?888|CTP(-)?978|CTP(-)?980|CTP(-)?987|CTP(-)?988|CTP(-)?989", "MediatekTablet": "\\bMT8125|MT8389|MT8135|MT8377\\b", "ConcordeTablet": "Concorde([ ]+)?Tab|ConCorde ReadMan", "GoCleverTablet": "GOCLEVER TAB|A7GOCLEVER|M1042|M7841|M742|R1042BK|R1041|TAB A975|TAB A7842|TAB A741|TAB A741L|TAB M723G|TAB M721|TAB A1021|TAB I921|TAB R721|TAB I720|TAB T76|TAB R70|TAB R76.2|TAB R106|TAB R83.2|TAB M813G|TAB I721|GCTA722|TAB I70|TAB I71|TAB S73|TAB R73|TAB R74|TAB R93|TAB R75|TAB R76.1|TAB A73|TAB A93|TAB A93.2|TAB T72|TAB R83|TAB R974|TAB R973|TAB A101|TAB A103|TAB A104|TAB A104.2|R105BK|M713G|A972BK|TAB A971|TAB R974.2|TAB R104|TAB R83.3|TAB A1042", "ModecomTablet": "FreeTAB 9000|FreeTAB 7.4|FreeTAB 7004|FreeTAB 7800|FreeTAB 2096|FreeTAB 7.5|FreeTAB 1014|FreeTAB 1001 |FreeTAB 8001|FreeTAB 9706|FreeTAB 9702|FreeTAB 7003|FreeTAB 7002|FreeTAB 1002|FreeTAB 7801|FreeTAB 1331|FreeTAB 1004|FreeTAB 8002|FreeTAB 8014|FreeTAB 9704|FreeTAB 1003", "VoninoTablet": "\\b(Argus[ _]?S|Diamond[ _]?79HD|Emerald[ _]?78E|Luna[ _]?70C|Onyx[ _]?S|Onyx[ _]?Z|Orin[ _]?HD|Orin[ _]?S|Otis[ _]?S|SpeedStar[ _]?S|Magnet[ _]?M9|Primus[ _]?94[ _]?3G|Primus[ _]?94HD|Primus[ _]?QS|Android.*\\bQ8\\b|Sirius[ _]?EVO[ _]?QS|Sirius[ _]?QS|Spirit[ _]?S)\\b", "ECSTablet": "V07OT2|TM105A|S10OT1|TR10CS1", "StorexTablet": "eZee[_']?(Tab|Go)[0-9]+|TabLC7|Looney Tunes Tab", "VodafoneTablet": "SmartTab([ ]+)?[0-9]+|SmartTabII10|SmartTabII7|VF-1497", "EssentielBTablet": "Smart[ ']?TAB[ ]+?[0-9]+|Family[ ']?TAB2", "RossMoorTablet": "RM-790|RM-997|RMD-878G|RMD-974R|RMT-705A|RMT-701|RME-601|RMT-501|RMT-711", "iMobileTablet": "i-mobile i-note", "TolinoTablet": "tolino tab [0-9.]+|tolino shine", "AudioSonicTablet": "\\bC-22Q|T7-QC|T-17B|T-17P\\b", "AMPETablet": "Android.* A78 ", "SkkTablet": "Android.* (SKYPAD|PHOENIX|CYCLOPS)", "TecnoTablet": "TECNO P9", "JXDTablet": "Android.* \\b(F3000|A3300|JXD5000|JXD3000|JXD2000|JXD300B|JXD300|S5800|S7800|S602b|S5110b|S7300|S5300|S602|S603|S5100|S5110|S601|S7100a|P3000F|P3000s|P101|P200s|P1000m|P200m|P9100|P1000s|S6600b|S908|P1000|P300|S18|S6600|S9100)\\b", "iJoyTablet": "Tablet (Spirit 7|Essentia|Galatea|Fusion|Onix 7|Landa|Titan|Scooby|Deox|Stella|Themis|Argon|Unique 7|Sygnus|Hexen|Finity 7|Cream|Cream X2|Jade|Neon 7|Neron 7|Kandy|Scape|Saphyr 7|Rebel|Biox|Rebel|Rebel 8GB|Myst|Draco 7|Myst|Tab7-004|Myst|Tadeo Jones|Tablet Boing|Arrow|Draco Dual Cam|Aurix|Mint|Amity|Revolution|Finity 9|Neon 9|T9w|Amity 4GB Dual Cam|Stone 4GB|Stone 8GB|Andromeda|Silken|X2|Andromeda II|Halley|Flame|Saphyr 9,7|Touch 8|Planet|Triton|Unique 10|Hexen 10|Memphis 4GB|Memphis 8GB|Onix 10)", "FX2Tablet": "FX2 PAD7|FX2 PAD10", "XoroTablet": "KidsPAD 701|PAD[ ]?712|PAD[ ]?714|PAD[ ]?716|PAD[ ]?717|PAD[ ]?718|PAD[ ]?720|PAD[ ]?721|PAD[ ]?722|PAD[ ]?790|PAD[ ]?792|PAD[ ]?900|PAD[ ]?9715D|PAD[ ]?9716DR|PAD[ ]?9718DR|PAD[ ]?9719QR|PAD[ ]?9720QR|TelePAD1030|Telepad1032|TelePAD730|TelePAD731|TelePAD732|TelePAD735Q|TelePAD830|TelePAD9730|TelePAD795|MegaPAD 1331|MegaPAD 1851|MegaPAD 2151", "ViewsonicTablet": "ViewPad 10pi|ViewPad 10e|ViewPad 10s|ViewPad E72|ViewPad7|ViewPad E100|ViewPad 7e|ViewSonic VB733|VB100a", "OdysTablet": "LOOX|XENO10|ODYS[ -](Space|EVO|Xpress|NOON)|\\bXELIO\\b|Xelio10Pro|XELIO7PHONETAB|XELIO10EXTREME|XELIOPT2|NEO_QUAD10", "CaptivaTablet": "CAPTIVA PAD", "IconbitTablet": "NetTAB|NT-3702|NT-3702S|NT-3702S|NT-3603P|NT-3603P|NT-0704S|NT-0704S|NT-3805C|NT-3805C|NT-0806C|NT-0806C|NT-0909T|NT-0909T|NT-0907S|NT-0907S|NT-0902S|NT-0902S", "TeclastTablet": "T98 4G|\\bP80\\b|\\bX90HD\\b|X98 Air|X98 Air 3G|\\bX89\\b|P80 3G|\\bX80h\\b|P98 Air|\\bX89HD\\b|P98 3G|\\bP90HD\\b|P89 3G|X98 3G|\\bP70h\\b|P79HD 3G|G18d 3G|\\bP79HD\\b|\\bP89s\\b|\\bA88\\b|\\bP10HD\\b|\\bP19HD\\b|G18 3G|\\bP78HD\\b|\\bA78\\b|\\bP75\\b|G17s 3G|G17h 3G|\\bP85t\\b|\\bP90\\b|\\bP11\\b|\\bP98t\\b|\\bP98HD\\b|\\bG18d\\b|\\bP85s\\b|\\bP11HD\\b|\\bP88s\\b|\\bA80HD\\b|\\bA80se\\b|\\bA10h\\b|\\bP89\\b|\\bP78s\\b|\\bG18\\b|\\bP85\\b|\\bA70h\\b|\\bA70\\b|\\bG17\\b|\\bP18\\b|\\bA80s\\b|\\bA11s\\b|\\bP88HD\\b|\\bA80h\\b|\\bP76s\\b|\\bP76h\\b|\\bP98\\b|\\bA10HD\\b|\\bP78\\b|\\bP88\\b|\\bA11\\b|\\bA10t\\b|\\bP76a\\b|\\bP76t\\b|\\bP76e\\b|\\bP85HD\\b|\\bP85a\\b|\\bP86\\b|\\bP75HD\\b|\\bP76v\\b|\\bA12\\b|\\bP75a\\b|\\bA15\\b|\\bP76Ti\\b|\\bP81HD\\b|\\bA10\\b|\\bT760VE\\b|\\bT720HD\\b|\\bP76\\b|\\bP73\\b|\\bP71\\b|\\bP72\\b|\\bT720SE\\b|\\bC520Ti\\b|\\bT760\\b|\\bT720VE\\b|T720-3GE|T720-WiFi", "OndaTablet": "\\b(V975i|Vi30|VX530|V701|Vi60|V701s|Vi50|V801s|V719|Vx610w|VX610W|V819i|Vi10|VX580W|Vi10|V711s|V813|V811|V820w|V820|Vi20|V711|VI30W|V712|V891w|V972|V819w|V820w|Vi60|V820w|V711|V813s|V801|V819|V975s|V801|V819|V819|V818|V811|V712|V975m|V101w|V961w|V812|V818|V971|V971s|V919|V989|V116w|V102w|V973|Vi40)\\b[\\s]+", "JaytechTablet": "TPC-PA762", "BlaupunktTablet": "Endeavour 800NG|Endeavour 1010", "DigmaTablet": "\\b(iDx10|iDx9|iDx8|iDx7|iDxD7|iDxD8|iDsQ8|iDsQ7|iDsQ8|iDsD10|iDnD7|3TS804H|iDsQ11|iDj7|iDs10)\\b", "EvolioTablet": "ARIA_Mini_wifi|Aria[ _]Mini|Evolio X10|Evolio X7|Evolio X8|\\bEvotab\\b|\\bNeura\\b", "LavaTablet": "QPAD E704|\\bIvoryS\\b|E-TAB IVORY|\\bE-TAB\\b", "AocTablet": "MW0811|MW0812|MW0922|MTK8382|MW1031|MW0831|MW0821|MW0931|MW0712", "MpmanTablet": "MP11 OCTA|MP10 OCTA|MPQC1114|MPQC1004|MPQC994|MPQC974|MPQC973|MPQC804|MPQC784|MPQC780|\\bMPG7\\b|MPDCG75|MPDCG71|MPDC1006|MP101DC|MPDC9000|MPDC905|MPDC706HD|MPDC706|MPDC705|MPDC110|MPDC100|MPDC99|MPDC97|MPDC88|MPDC8|MPDC77|MP709|MID701|MID711|MID170|MPDC703|MPQC1010", "CelkonTablet": "CT695|CT888|CT[\\s]?910|CT7 Tab|CT9 Tab|CT3 Tab|CT2 Tab|CT1 Tab|C820|C720|\\bCT-1\\b", "WolderTablet": "miTab \\b(DIAMOND|SPACE|BROOKLYN|NEO|FLY|MANHATTAN|FUNK|EVOLUTION|SKY|GOCAR|IRON|GENIUS|POP|MINT|EPSILON|BROADWAY|JUMP|HOP|LEGEND|NEW AGE|LINE|ADVANCE|FEEL|FOLLOW|LIKE|LINK|LIVE|THINK|FREEDOM|CHICAGO|CLEVELAND|BALTIMORE-GH|IOWA|BOSTON|SEATTLE|PHOENIX|DALLAS|IN 101|MasterChef)\\b", "MiTablet": "\\bMI PAD\\b|\\bHM NOTE 1W\\b", "NibiruTablet": "Nibiru M1|Nibiru Jupiter One", "NexoTablet": "NEXO NOVA|NEXO 10|NEXO AVIO|NEXO FREE|NEXO GO|NEXO EVO|NEXO 3G|NEXO SMART|NEXO KIDDO|NEXO MOBI", "LeaderTablet": "TBLT10Q|TBLT10I|TBL-10WDKB|TBL-10WDKBO2013|TBL-W230V2|TBL-W450|TBL-W500|SV572|TBLT7I|TBA-AC7-8G|TBLT79|TBL-8W16|TBL-10W32|TBL-10WKB|TBL-W100", "UbislateTablet": "UbiSlate[\\s]?7C", "PocketBookTablet": "Pocketbook", "KocasoTablet": "\\b(TB-1207)\\b", "Hudl": "Hudl HT7S3|Hudl 2", "TelstraTablet": "T-Hub2", "GenericTablet": "Android.*\\b97D\\b|Tablet(?!.*PC)|BNTV250A|MID-WCDMA|LogicPD Zoom2|\\bA7EB\\b|CatNova8|A1_07|CT704|CT1002|\\bM721\\b|rk30sdk|\\bEVOTAB\\b|M758A|ET904|ALUMIUM10|Smartfren Tab|Endeavour 1010|Tablet-PC-4|Tagi Tab|\\bM6pro\\b|CT1020W|arc 10HD|\\bJolla\\b|\\bTP750\\b" }, "oss": { "androids": "Android", "BlackBerryOS": "blackberry|\\bBB10\\b|rim tablet os", "PalmOS": "PalmOS|avantgo|blazer|elaine|hiptop|palm|plucker|xiino", "SymbianOS": "Symbian|symbols|Series60|Series40|SYB-[0-9]+|\\bS60\\b", "WindowsMobileOS": "Windows CE.*(PPC|Smartphone|Mobile|[0-9]{3}x[0-9]{3})|Window Mobile|Windows Phone [0-9.]+|WCE;", "WindowsPhoneOS": "Windows Phone 10.0|Windows Phone 8.1|Windows Phone 8.0|Windows Phone OS|XBLWP7|ZuneWP7|Windows NT 6.[23]; ARM;", "iOS": "\\biPhone.*Mobile|\\biPod|\\biPad", "MeeGoOS": "MeeGo", "MaemoOS": "Maemo", "JavaOS": "J2ME\/|\\bMIDP\\b|\\bCLDC\\b", "webOS": "webOS|hpwOS", "badaOS": "\\bBada\\b", "BREWOS": "BREW" }, "uas": { "Vivaldi": "Vivaldi", "Chrome": "\\bCrMo\\b|CriOS|Android.*Chrome\/[.0-9]* (Mobile)?", "Dolfin": "\\bDolfin\\b", "Opera": "Opera.*Mini|Opera.*Mobi|Android.*Opera|Mobile.*OPR\/[0-9.]+|Coast\/[0-9.]+", "Skyfire": "Skyfire", "Edge": "Mobile Safari\/[.0-9]* Edge", "IE": "IEMobile|MSIEMobile", "Firefox": "fennec|firefox.*maemo|(Mobile|Tablet).*Firefox|Firefox.*Mobile", "Bolt": "bolt", "TeaShark": "teashark", "Blazer": "Blazer", "Safari": "Version.*Mobile.*Safari|Safari.*Mobile|MobileSafari", "Tizen": "Tizen", "UCBrowser": "UC.*Browser|UCWEB", "baiduboxapp": "baiduboxapp", "baidubrowser": "baidubrowser", "DiigoBrowser": "DiigoBrowser", "Puffin": "Puffin", "Mercury": "\\bMercury\\b", "ObigoBrowser": "Obigo", "NetFront": "NF-Browser", "GenericBrowser": "NokiaBrowser|OviBrowser|OneBrowser|TwonkyBeamBrowser|SEMC.*Browser|FlyFlow|Minimo|NetFront|Novarra-Vision|MQQBrowser|MicroMessenger", "PaleMoon": "Android.*PaleMoon|Mobile.*PaleMoon" }, "props": { "Mobile": "Mobile\/[VER]", "Build": "Build\/[VER]", "Version": "Version\/[VER]", "VendorID": "VendorID\/[VER]", "iPad": "iPad.*CPU[a-z ]+[VER]", "iPhone": "iPhone.*CPU[a-z ]+[VER]", "iPod": "iPod.*CPU[a-z ]+[VER]", "Kindle": "Kindle\/[VER]", "Chrome": [ "Chrome\/[VER]", "CriOS\/[VER]", "CrMo\/[VER]" ], "Coast": [ "Coast\/[VER]" ], "Dolfin": "Dolfin\/[VER]", "Firefox": "Firefox\/[VER]", "Fennec": "Fennec\/[VER]", "Edge": "Edge\/[VER]", "IE": [ "IEMobile\/[VER];", "IEMobile [VER]", "MSIE [VER];", "Trident\/[0-9.]+;.*rv:[VER]" ], "NetFront": "NetFront\/[VER]", "NokiaBrowser": "NokiaBrowser\/[VER]", "Opera": [ " OPR\/[VER]", "Opera Mini\/[VER]", "Version\/[VER]" ], "Opera Mini": "Opera Mini\/[VER]", "Opera Mobi": "Version\/[VER]", "UC Browser": "UC Browser[VER]", "MQQBrowser": "MQQBrowser\/[VER]", "MicroMessenger": "MicroMessenger\/[VER]", "baiduboxapp": "baiduboxapp\/[VER]", "baidubrowser": "baidubrowser\/[VER]", "Iron": "Iron\/[VER]", "Safari": [ "Version\/[VER]", "Safari\/[VER]" ], "Skyfire": "Skyfire\/[VER]", "Tizen": "Tizen\/[VER]", "Webkit": "webkit[ \/][VER]", "PaleMoon": "PaleMoon\/[VER]", "Gecko": "Gecko\/[VER]", "Trident": "Trident\/[VER]", "Presto": "Presto\/[VER]", "Goanna": "Goanna\/[VER]", "iOS": " \\bi?OS\\b [VER][ ;]{1}", "Android": "Android [VER]", "BlackBerry": [ "BlackBerry[\\w]+\/[VER]", "BlackBerry.*Version\/[VER]", "Version\/[VER]" ], "BREW": "BREW [VER]", "Java": "Java\/[VER]", "Windows Phone OS": [ "Windows Phone OS [VER]", "Windows Phone [VER]" ], "Windows Phone": "Windows Phone [VER]", "Windows CE": "Windows CE\/[VER]", "Windows NT": "Windows NT [VER]", "Symbian": [ "SymbianOS\/[VER]", "Symbian\/[VER]" ], "webOS": [ "webOS\/[VER]", "hpwOS\/[VER];" ] }, "utils": { "Bot": "Googlebot|facebookexternalhit|AdsBot-Google|Google Keyword Suggestion|Facebot|YandexBot|bingbot|ia_archiver|AhrefsBot|Ezooms|GSLFbot|WBSearchBot|Twitterbot|TweetmemeBot|Twikle|PaperLiBot|Wotbox|UnwindFetchor|Exabot|MJ12bot|YandexImages|TurnitinBot|Pingdom", "MobileBot": "Googlebot-Mobile|AdsBot-Google-Mobile|YahooSeeker\/M1A1-R2D2", "DesktopMode": "WPDesktop", "TV": "SonyDTV|HbbTV", "WebKit": "(webkit)[ \/]([\\w.]+)", "Console": "\\b(Nintendo|Nintendo WiiU|Nintendo 3DS|PLAYSTATION|Xbox)\\b", "Watch": "SM-V700" }}; // following patterns come from http://detectmobilebrowsers.com/ impl.detectMobileBrowsers = { fullPattern: /(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino/i, shortPattern: /1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i, tabletPattern: /android|ipad|playbook|silk/i }; var hasOwnProp = Object.prototype.hasOwnProperty, isArray; impl.FALLBACK_PHONE = 'UnknownPhone'; impl.FALLBACK_TABLET = 'UnknownTablet'; impl.FALLBACK_MOBILE = 'UnknownMobile'; isArray = ('isArray' in Array) ? Array.isArray : function (value) { return Object.prototype.toString.call(value) === '[object Array]'; }; isArray = 'isArray' in Array ? function (value) { return Object.prototype.toString.call(value) === '[object Array]'; } : Array.isArray; function equalIC(a, b) { return a != null && b != null && a.toLowerCase() === b.toLowerCase(); } function containsIC(array, value) { var valueLC, i, len = array.length; if (!len || !value) { return false; } valueLC = value.toLowerCase(); for (i = 0; i < len; ++i) { if (valueLC === array[i].toLowerCase()) { return true; } } return false; } function convertPropsToRegExp(object) { for (var key in object) { if (hasOwnProp.call(object, key)) { object[key] = new RegExp(object[key], 'i'); } } } (function init() { var key, values, value, i, len, verPos, mobileDetectRules = impl.mobileDetectRules; for (key in mobileDetectRules.props) { if (hasOwnProp.call(mobileDetectRules.props, key)) { values = mobileDetectRules.props[key]; if (!isArray(values)) { values = [values]; } len = values.length; for (i = 0; i < len; ++i) { value = values[i]; verPos = value.indexOf('[VER]'); if (verPos >= 0) { value = value.substring(0, verPos) + '([\\w._\\+]+)' + value.substring(verPos + 5); } values[i] = new RegExp(value, 'i'); } mobileDetectRules.props[key] = values; } } convertPropsToRegExp(mobileDetectRules.oss); convertPropsToRegExp(mobileDetectRules.phones); convertPropsToRegExp(mobileDetectRules.tablets); convertPropsToRegExp(mobileDetectRules.uas); convertPropsToRegExp(mobileDetectRules.utils); // copy some patterns to oss0 which are tested first (see issue#15) mobileDetectRules.oss0 = { WindowsPhoneOS: mobileDetectRules.oss.WindowsPhoneOS, WindowsMobileOS: mobileDetectRules.oss.WindowsMobileOS }; }()); /** * Test userAgent string against a set of rules and find the first matched key. * @param {Object} rules (key is String, value is RegExp) * @param {String} userAgent the navigator.userAgent (or HTTP-Header 'User-Agent'). * @returns {String|null} the matched key if found, otherwise null * @private */ impl.findMatch = function(rules, userAgent) { for (var key in rules) { if (hasOwnProp.call(rules, key)) { if (rules[key].test(userAgent)) { return key; } } } return null; }; /** * Test userAgent string against a set of rules and return an array of matched keys. * @param {Object} rules (key is String, value is RegExp) * @param {String} userAgent the navigator.userAgent (or HTTP-Header 'User-Agent'). * @returns {Array} an array of matched keys, may be empty when there is no match, but not null * @private */ impl.findMatches = function(rules, userAgent) { var result = []; for (var key in rules) { if (hasOwnProp.call(rules, key)) { if (rules[key].test(userAgent)) { result.push(key); } } } return result; }; /** * Check the version of the given property in the User-Agent. * * @param {String} propertyName * @param {String} userAgent * @return {String} version or null if version not found * @private */ impl.getVersionStr = function (propertyName, userAgent) { var props = impl.mobileDetectRules.props, patterns, i, len, match; if (hasOwnProp.call(props, propertyName)) { patterns = props[propertyName]; len = patterns.length; for (i = 0; i < len; ++i) { match = patterns[i].exec(userAgent); if (match !== null) { return match[1]; } } } return null; }; /** * Check the version of the given property in the User-Agent. * Will return a float number. (eg. 2_0 will return 2.0, 4.3.1 will return 4.31) * * @param {String} propertyName * @param {String} userAgent * @return {Number} version or NaN if version not found * @private */ impl.getVersion = function (propertyName, userAgent) { var version = impl.getVersionStr(propertyName, userAgent); return version ? impl.prepareVersionNo(version) : NaN; }; /** * Prepare the version number. * * @param {String} version * @return {Number} the version number as a floating number * @private */ impl.prepareVersionNo = function (version) { var numbers; numbers = version.split(/[a-z._ \/\-]/i); if (numbers.length === 1) { version = numbers[0]; } if (numbers.length > 1) { version = numbers[0] + '.'; numbers.shift(); version += numbers.join(''); } return Number(version); }; impl.isMobileFallback = function (userAgent) { return impl.detectMobileBrowsers.fullPattern.test(userAgent) || impl.detectMobileBrowsers.shortPattern.test(userAgent.substr(0,4)); }; impl.isTabletFallback = function (userAgent) { return impl.detectMobileBrowsers.tabletPattern.test(userAgent); }; impl.prepareDetectionCache = function (cache, userAgent, maxPhoneWidth) { if (cache.mobile !== undefined) { return; } var phone, tablet, phoneSized; // first check for stronger tablet rules, then phone (see issue#5) tablet = impl.findMatch(impl.mobileDetectRules.tablets, userAgent); if (tablet) { cache.mobile = cache.tablet = tablet; cache.phone = null; return; // unambiguously identified as tablet } phone = impl.findMatch(impl.mobileDetectRules.phones, userAgent); if (phone) { cache.mobile = cache.phone = phone; cache.tablet = null; return; // unambiguously identified as phone } // our rules haven't found a match -> try more general fallback rules if (impl.isMobileFallback(userAgent)) { phoneSized = MobileDetect.isPhoneSized(maxPhoneWidth); if (phoneSized === undefined) { cache.mobile = impl.FALLBACK_MOBILE; cache.tablet = cache.phone = null; } else if (phoneSized) { cache.mobile = cache.phone = impl.FALLBACK_PHONE; cache.tablet = null; } else { cache.mobile = cache.tablet = impl.FALLBACK_TABLET; cache.phone = null; } } else if (impl.isTabletFallback(userAgent)) { cache.mobile = cache.tablet = impl.FALLBACK_TABLET; cache.phone = null; } else { // not mobile at all! cache.mobile = cache.tablet = cache.phone = null; } }; // t is a reference to a MobileDetect instance impl.mobileGrade = function (t) { // impl note: // To keep in sync w/ Mobile_Detect.php easily, the following code is tightly aligned to the PHP version. // When changes are made in Mobile_Detect.php, copy this method and replace: // $this-> / t. // self::MOBILE_GRADE_(.) / '$1' // , self::VERSION_TYPE_FLOAT / (nothing) // isIOS() / os('iOS') // [reg] / (nothing) <-- jsdelivr complaining about unescaped unicode character U+00AE var $isMobile = t.mobile() !== null; if ( // Apple iOS 3.2-5.1 - Tested on the original iPad (4.3 / 5.0), iPad 2 (4.3), iPad 3 (5.1), original iPhone (3.1), iPhone 3 (3.2), 3GS (4.3), 4 (4.3 / 5.0), and 4S (5.1) t.os('iOS') && t.version('iPad')>=4.3 || t.os('iOS') && t.version('iPhone')>=3.1 || t.os('iOS') && t.version('iPod')>=3.1 || // Android 2.1-2.3 - Tested on the HTC Incredible (2.2), original Droid (2.2), HTC Aria (2.1), Google Nexus S (2.3). Functional on 1.5 & 1.6 but performance may be sluggish, tested on Google G1 (1.5) // Android 3.1 (Honeycomb) - Tested on the Samsung Galaxy Tab 10.1 and Motorola XOOM // Android 4.0 (ICS) - Tested on a Galaxy Nexus. Note: transition performance can be poor on upgraded devices // Android 4.1 (Jelly Bean) - Tested on a Galaxy Nexus and Galaxy 7 ( t.version('Android')>2.1 && t.is('Webkit') ) || // Windows Phone 7-7.5 - Tested on the HTC Surround (7.0) HTC Trophy (7.5), LG-E900 (7.5), Nokia Lumia 800 t.version('Windows Phone OS')>=7.0 || // Blackberry 7 - Tested on BlackBerry Torch 9810 // Blackberry 6.0 - Tested on the Torch 9800 and Style 9670 t.is('BlackBerry') && t.version('BlackBerry')>=6.0 || // Blackberry Playbook (1.0-2.0) - Tested on PlayBook t.match('Playbook.*Tablet') || // Palm WebOS (1.4-2.0) - Tested on the Palm Pixi (1.4), Pre (1.4), Pre 2 (2.0) ( t.version('webOS')>=1.4 && t.match('Palm|Pre|Pixi') ) || // Palm WebOS 3.0 - Tested on HP TouchPad t.match('hp.*TouchPad') || // Firefox Mobile (12 Beta) - Tested on Android 2.3 device ( t.is('Firefox') && t.version('Firefox')>=12 ) || // Chrome for Android - Tested on Android 4.0, 4.1 device ( t.is('Chrome') && t.is('androids') && t.version('Android')>=4.0 ) || // Skyfire 4.1 - Tested on Android 2.3 device ( t.is('Skyfire') && t.version('Skyfire')>=4.1 && t.is('androids') && t.version('Android')>=2.3 ) || // Opera Mobile 11.5-12: Tested on Android 2.3 ( t.is('Opera') && t.version('Opera Mobi')>11 && t.is('androids') ) || // Meego 1.2 - Tested on Nokia 950 and N9 t.is('MeeGoOS') || // Tizen (pre-release) - Tested on early hardware t.is('Tizen') || // Samsung Bada 2.0 - Tested on a Samsung Wave 3, Dolphin browser // @todo: more tests here! t.is('Dolfin') && t.version('Bada')>=2.0 || // UC Browser - Tested on Android 2.3 device ( (t.is('UC Browser') || t.is('Dolfin')) && t.version('Android')>=2.3 ) || // Kindle 3 and Fire - Tested on the built-in WebKit browser for each ( t.match('Kindle Fire') || t.is('Kindle') && t.version('Kindle')>=3.0 ) || // Nook Color 1.4.1 - Tested on original Nook Color, not Nook Tablet t.is('androids') && t.is('NookTablet') || // Chrome Desktop 11-21 - Tested on OS X 10.7 and Windows 7 t.version('Chrome')>=11 && !$isMobile || // Safari Desktop 4-5 - Tested on OS X 10.7 and Windows 7 t.version('Safari')>=5.0 && !$isMobile || // Firefox Desktop 4-13 - Tested on OS X 10.7 and Windows 7 t.version('Firefox')>=4.0 && !$isMobile || // Internet Explorer 7-9 - Tested on Windows XP, Vista and 7 t.version('MSIE')>=7.0 && !$isMobile || // Opera Desktop 10-12 - Tested on OS X 10.7 and Windows 7 // @reference: http://my.opera.com/community/openweb/idopera/ t.version('Opera')>=10 && !$isMobile ){ return 'A'; } if ( t.os('iOS') && t.version('iPad')<4.3 || t.os('iOS') && t.version('iPhone')<3.1 || t.os('iOS') && t.version('iPod')<3.1 || // Blackberry 5.0: Tested on the Storm 2 9550, Bold 9770 t.is('Blackberry') && t.version('BlackBerry')>=5 && t.version('BlackBerry')<6 || //Opera Mini (5.0-6.5) - Tested on iOS 3.2/4.3 and Android 2.3 ( t.version('Opera Mini')>=5.0 && t.version('Opera Mini')<=6.5 && (t.version('Android')>=2.3 || t.is('iOS')) ) || // Nokia Symbian^3 - Tested on Nokia N8 (Symbian^3), C7 (Symbian^3), also works on N97 (Symbian^1) t.match('NokiaN8|NokiaC7|N97.*Series60|Symbian/3') || // @todo: report this (tested on Nokia N71) t.version('Opera Mobi')>=11 && t.is('SymbianOS') ){ return 'B'; } if ( // Blackberry 4.x - Tested on the Curve 8330 t.version('BlackBerry')<5.0 || // Windows Mobile - Tested on the HTC Leo (WinMo 5.2) t.match('MSIEMobile|Windows CE.*Mobile') || t.version('Windows Mobile')<=5.2 ){ return 'C'; } //All older smartphone platforms and featurephones - Any device that doesn't support media queries //will receive the basic, C grade experience. return 'C'; }; impl.detectOS = function (ua) { return impl.findMatch(impl.mobileDetectRules.oss0, ua) || impl.findMatch(impl.mobileDetectRules.oss, ua); }; impl.getDeviceSmallerSide = function () { return window.screen.width < window.screen.height ? window.screen.width : window.screen.height; }; /** * Constructor for MobileDetect object. *
* Such an object will keep a reference to the given user-agent string and cache most of the detect queries.
*
* Find information how to download and install: * github.com/hgoebl/mobile-detect.js/ *
* * @example 
     *     var md = new MobileDetect(window.navigator.userAgent);     *     if (md.mobile()) {     *         location.href = (md.mobileGrade() === 'A') ? '/mobile/' : '/lynx/';     *     }     *
* * @param {string} userAgent typically taken from window.navigator.userAgent or http_header['User-Agent'] * @param {number} [maxPhoneWidth=600] only for browsers specify a value for the maximum * width of smallest device side (in logical "CSS" pixels) until a device detected as mobile will be handled * as phone. * This is only used in cases where the device cannot be classified as phone or tablet.
* See Declaring Tablet Layouts * for Android.
* If you provide a value < 0, then this "fuzzy" check is disabled. * @constructor * @global */ function MobileDetect(userAgent, maxPhoneWidth) { this.ua = userAgent || ''; this._cache = {}; //600dp is typical 7" tablet minimum width this.maxPhoneWidth = maxPhoneWidth || 600; } MobileDetect.prototype = { constructor: MobileDetect, /** * Returns the detected phone or tablet type or null if it is not a mobile device. *
* For a list of possible return values see {@link MobileDetect#phone} and {@link MobileDetect#tablet}.
*
* If the device is not detected by the regular expressions from Mobile-Detect, a test is made against * the patterns of detectmobilebrowsers.com. If this test * is positive, a value of UnknownPhone, UnknownTablet or * UnknownMobile is returned.
* When used in browser, the decision whether phone or tablet is made based on screen.width/height.
*
* When used server-side (node.js), there is no way to tell the difference between UnknownTablet * and UnknownMobile, so you will get UnknownMobile here.
* Be aware that since v1.0.0 in this special case you will get UnknownMobile only for: * {@link MobileDetect#mobile}, not for {@link MobileDetect#phone} and {@link MobileDetect#tablet}. * In versions before v1.0.0 all 3 methods returned UnknownMobile which was tedious to use. *
* In most cases you will use the return value just as a boolean. * * @returns {String} the key for the phone family or tablet family, e.g. "Nexus". * @function MobileDetect#mobile */ mobile: function () { impl.prepareDetectionCache(this._cache, this.ua, this.maxPhoneWidth); return this._cache.mobile; }, /** * Returns the detected phone type/family string or null. *
* The returned tablet (family or producer) is one of following keys:
*
iPhone, BlackBerry, HTC, Nexus, Dell, Motorola, Samsung, LG, Sony, Asus, * NokiaLumia, Micromax, Palm, Vertu, Pantech, Fly, Wiko, iMobile, SimValley, * Wolfgang, Alcatel, Nintendo, Amoi, INQ, GenericPhone
*
* If the device is not detected by the regular expressions from Mobile-Detect, a test is made against * the patterns of detectmobilebrowsers.com. If this test * is positive, a value of UnknownPhone or UnknownMobile is returned.
* When used in browser, the decision whether phone or tablet is made based on screen.width/height.
*
* When used server-side (node.js), there is no way to tell the difference between UnknownTablet * and UnknownMobile, so you will get null here, while {@link MobileDetect#mobile} * will return UnknownMobile.
* Be aware that since v1.0.0 in this special case you will get UnknownMobile only for: * {@link MobileDetect#mobile}, not for {@link MobileDetect#phone} and {@link MobileDetect#tablet}. * In versions before v1.0.0 all 3 methods returned UnknownMobile which was tedious to use. *
* In most cases you will use the return value just as a boolean. * * @returns {String} the key of the phone family or producer, e.g. "iPhone" * @function MobileDetect#phone */ phone: function () { impl.prepareDetectionCache(this._cache, this.ua, this.maxPhoneWidth); return this._cache.phone; }, /** * Returns the detected tablet type/family string or null. *
* The returned tablet (family or producer) is one of following keys:
*
iPad, NexusTablet, SamsungTablet, Kindle, SurfaceTablet, HPTablet, AsusTablet, * BlackBerryTablet, HTCtablet, MotorolaTablet, NookTablet, AcerTablet, * ToshibaTablet, LGTablet, FujitsuTablet, PrestigioTablet, LenovoTablet, * DellTablet, YarvikTablet, MedionTablet, ArnovaTablet, IntensoTablet, IRUTablet, * MegafonTablet, EbodaTablet, AllViewTablet, ArchosTablet, AinolTablet, * NokiaLumiaTablet, SonyTablet, PhilipsTablet, CubeTablet, CobyTablet, MIDTablet, * MSITablet, SMiTTablet, RockChipTablet, FlyTablet, bqTablet, HuaweiTablet, * NecTablet, PantechTablet, BronchoTablet, VersusTablet, ZyncTablet, * PositivoTablet, NabiTablet, KoboTablet, DanewTablet, TexetTablet, * PlaystationTablet, TrekstorTablet, PyleAudioTablet, AdvanTablet, * DanyTechTablet, GalapadTablet, MicromaxTablet, KarbonnTablet, AllFineTablet, * PROSCANTablet, YONESTablet, ChangJiaTablet, GUTablet, PointOfViewTablet, * OvermaxTablet, HCLTablet, DPSTablet, VistureTablet, CrestaTablet, * MediatekTablet, ConcordeTablet, GoCleverTablet, ModecomTablet, VoninoTablet, * ECSTablet, StorexTablet, VodafoneTablet, EssentielBTablet, RossMoorTablet, * iMobileTablet, TolinoTablet, AudioSonicTablet, AMPETablet, SkkTablet, * TecnoTablet, JXDTablet, iJoyTablet, FX2Tablet, XoroTablet, ViewsonicTablet, * OdysTablet, CaptivaTablet, IconbitTablet, TeclastTablet, OndaTablet, * JaytechTablet, BlaupunktTablet, DigmaTablet, EvolioTablet, LavaTablet, * AocTablet, MpmanTablet, CelkonTablet, WolderTablet, MiTablet, NibiruTablet, * NexoTablet, LeaderTablet, UbislateTablet, PocketBookTablet, KocasoTablet, Hudl, * TelstraTablet, GenericTablet
*
* If the device is not detected by the regular expressions from Mobile-Detect, a test is made against * the patterns of detectmobilebrowsers.com. If this test * is positive, a value of UnknownTablet or UnknownMobile is returned.
* When used in browser, the decision whether phone or tablet is made based on screen.width/height.
*
* When used server-side (node.js), there is no way to tell the difference between UnknownTablet * and UnknownMobile, so you will get null here, while {@link MobileDetect#mobile} * will return UnknownMobile.
* Be aware that since v1.0.0 in this special case you will get UnknownMobile only for: * {@link MobileDetect#mobile}, not for {@link MobileDetect#phone} and {@link MobileDetect#tablet}. * In versions before v1.0.0 all 3 methods returned UnknownMobile which was tedious to use. *
* In most cases you will use the return value just as a boolean. * * @returns {String} the key of the tablet family or producer, e.g. "SamsungTablet" * @function MobileDetect#tablet */ tablet: function () { impl.prepareDetectionCache(this._cache, this.ua, this.maxPhoneWidth); return this._cache.tablet; }, /** * Returns the (first) detected user-agent string or null. *
* The returned user-agent is one of following keys:
*
Vivaldi, Chrome, Dolfin, Opera, Skyfire, Edge, IE, Firefox, Bolt, TeaShark, * Blazer, Safari, Tizen, UCBrowser, baiduboxapp, baidubrowser, DiigoBrowser, * Puffin, Mercury, ObigoBrowser, NetFront, GenericBrowser, PaleMoon
*
* In most cases calling {@link MobileDetect#userAgent} will be sufficient. But there are rare * cases where a mobile device pretends to be more than one particular browser. You can get the * list of all matches with {@link MobileDetect#userAgents} or check for a particular value by * providing one of the defined keys as first argument to {@link MobileDetect#is}. * * @returns {String} the key for the detected user-agent or null * @function MobileDetect#userAgent */ userAgent: function () { if (this._cache.userAgent === undefined) { this._cache.userAgent = impl.findMatch(impl.mobileDetectRules.uas, this.ua); } return this._cache.userAgent; }, /** * Returns all detected user-agent strings. *
* The array is empty or contains one or more of following keys:
*
Vivaldi, Chrome, Dolfin, Opera, Skyfire, Edge, IE, Firefox, Bolt, TeaShark, * Blazer, Safari, Tizen, UCBrowser, baiduboxapp, baidubrowser, DiigoBrowser, * Puffin, Mercury, ObigoBrowser, NetFront, GenericBrowser, PaleMoon
*
* In most cases calling {@link MobileDetect#userAgent} will be sufficient. But there are rare * cases where a mobile device pretends to be more than one particular browser. You can get the * list of all matches with {@link MobileDetect#userAgents} or check for a particular value by * providing one of the defined keys as first argument to {@link MobileDetect#is}. * * @returns {Array} the array of detected user-agent keys or [] * @function MobileDetect#userAgents */ userAgents: function () { if (this._cache.userAgents === undefined) { this._cache.userAgents = impl.findMatches(impl.mobileDetectRules.uas, this.ua); } return this._cache.userAgents; }, /** * Returns the detected operating system string or null. *
* The operating system is one of following keys:
*
androids, BlackBerryOS, PalmOS, SymbianOS, WindowsMobileOS, WindowsPhoneOS, * iOS, MeeGoOS, MaemoOS, JavaOS, webOS, badaOS, BREWOS
* * @returns {String} the key for the detected operating system. * @function MobileDetect#os */ os: function () { if (this._cache.os === undefined) { this._cache.os = impl.detectOS(this.ua); } return this._cache.os; }, /** * Get the version (as Number) of the given property in the User-Agent. *
* Will return a float number. (eg. 2_0 will return 2.0, 4.3.1 will return 4.31) * * @param {String} key a key defining a thing which has a version.
* You can use one of following keys:
*
Mobile, Build, Version, VendorID, iPad, iPhone, iPod, Kindle, Chrome, Coast, * Dolfin, Firefox, Fennec, Edge, IE, NetFront, NokiaBrowser, Opera, Opera Mini, * Opera Mobi, UC Browser, MQQBrowser, MicroMessenger, baiduboxapp, baidubrowser, * Iron, Safari, Skyfire, Tizen, Webkit, PaleMoon, Gecko, Trident, Presto, Goanna, * iOS, Android, BlackBerry, BREW, Java, Windows Phone OS, Windows Phone, Windows * CE, Windows NT, Symbian, webOS
* * @returns {Number} the version as float or NaN if User-Agent doesn't contain this version. * Be careful when comparing this value with '==' operator! * @function MobileDetect#version */ version: function (key) { return impl.getVersion(key, this.ua); }, /** * Get the version (as String) of the given property in the User-Agent. *
* * @param {String} key a key defining a thing which has a version.
* You can use one of following keys:
*
Mobile, Build, Version, VendorID, iPad, iPhone, iPod, Kindle, Chrome, Coast, * Dolfin, Firefox, Fennec, Edge, IE, NetFront, NokiaBrowser, Opera, Opera Mini, * Opera Mobi, UC Browser, MQQBrowser, MicroMessenger, baiduboxapp, baidubrowser, * Iron, Safari, Skyfire, Tizen, Webkit, PaleMoon, Gecko, Trident, Presto, Goanna, * iOS, Android, BlackBerry, BREW, Java, Windows Phone OS, Windows Phone, Windows * CE, Windows NT, Symbian, webOS
* * @returns {String} the "raw" version as String or null if User-Agent doesn't contain this version. * * @function MobileDetect#versionStr */ versionStr: function (key) { return impl.getVersionStr(key, this.ua); }, /** * Global test key against userAgent, os, phone, tablet and some other properties of userAgent string. * * @param {String} key the key (case-insensitive) of a userAgent, an operating system, phone or * tablet family.
* For a complete list of possible values, see {@link MobileDetect#userAgent}, * {@link MobileDetect#os}, {@link MobileDetect#phone}, {@link MobileDetect#tablet}.
* Additionally you have following keys:
*
Bot, MobileBot, DesktopMode, TV, WebKit, Console, Watch
* * @returns {boolean} true when the given key is one of the defined keys of userAgent, os, phone, * tablet or one of the listed additional keys, otherwise false * @function MobileDetect#is */ is: function (key) { return containsIC(this.userAgents(), key) || equalIC(key, this.os()) || equalIC(key, this.phone()) || equalIC(key, this.tablet()) || containsIC(impl.findMatches(impl.mobileDetectRules.utils, this.ua), key); }, /** * Do a quick test against navigator::userAgent. * * @param {String|RegExp} pattern the pattern, either as String or RegExp * (a string will be converted to a case-insensitive RegExp). * @returns {boolean} true when the pattern matches, otherwise false * @function MobileDetect#match */ match: function (pattern) { if (!(pattern instanceof RegExp)) { pattern = new RegExp(pattern, 'i'); } return pattern.test(this.ua); }, /** * Checks whether the mobile device can be considered as phone regarding screen.width. *
* Obviously this method makes sense in browser environments only (not for Node.js)! * @param {number} [maxPhoneWidth] the maximum logical pixels (aka. CSS-pixels) to be considered as phone.
* The argument is optional and if not present or falsy, the value of the constructor is taken. * @returns {boolean|undefined} undefined if screen size wasn't detectable, else true * when screen.width is less or equal to maxPhoneWidth, otherwise false.
* Will always return undefined server-side. */ isPhoneSized: function (maxPhoneWidth) { return MobileDetect.isPhoneSized(maxPhoneWidth || this.maxPhoneWidth); }, /** * Returns the mobile grade ('A', 'B', 'C'). * * @returns {String} one of the mobile grades ('A', 'B', 'C'). * @function MobileDetect#mobileGrade */ mobileGrade: function () { if (this._cache.grade === undefined) { this._cache.grade = impl.mobileGrade(this); } return this._cache.grade; } }; // environment-dependent if (typeof window !== 'undefined' && window.screen) { MobileDetect.isPhoneSized = function (maxPhoneWidth) { return maxPhoneWidth < 0 ? undefined : impl.getDeviceSmallerSide() <= maxPhoneWidth; }; } else { MobileDetect.isPhoneSized = function () {}; } // should not be replaced by a completely new object - just overwrite existing methods MobileDetect._impl = impl; MobileDetect.version = '1.3.3 2016-07-31'; return MobileDetect;} : () => { (userAgent: any, maxPhoneWidth: any): void; isPhoneSized(maxPhoneWidth: any): any; _impl: {}; version: string; } > : ^^^^^^^^^ ^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 'use strict'; @@ -37,7 +37,7 @@ define(function () { > : ^^ impl.mobileDetectRules = { ->impl.mobileDetectRules = { "phones": { "iPhone": "\\biPhone\\b|\\biPod\\b", "BlackBerry": "BlackBerry|\\bBB10\\b|rim[0-9]+", "HTC": "HTC|HTC.*(Sensation|Evo|Vision|Explorer|6800|8100|8900|A7272|S510e|C110e|Legend|Desire|T8282)|APX515CKT|Qtek9090|APA9292KT|HD_mini|Sensation.*Z710e|PG86100|Z715e|Desire.*(A8181|HD)|ADR6200|ADR6400L|ADR6425|001HT|Inspire 4G|Android.*\\bEVO\\b|T-Mobile G1|Z520m", "Nexus": "Nexus One|Nexus S|Galaxy.*Nexus|Android.*Nexus.*Mobile|Nexus 4|Nexus 5|Nexus 6", "Dell": "Dell.*Streak|Dell.*Aero|Dell.*Venue|DELL.*Venue Pro|Dell Flash|Dell Smoke|Dell Mini 3iX|XCD28|XCD35|\\b001DL\\b|\\b101DL\\b|\\bGS01\\b", "Motorola": "Motorola|DROIDX|DROID BIONIC|\\bDroid\\b.*Build|Android.*Xoom|HRI39|MOT-|A1260|A1680|A555|A853|A855|A953|A955|A956|Motorola.*ELECTRIFY|Motorola.*i1|i867|i940|MB200|MB300|MB501|MB502|MB508|MB511|MB520|MB525|MB526|MB611|MB612|MB632|MB810|MB855|MB860|MB861|MB865|MB870|ME501|ME502|ME511|ME525|ME600|ME632|ME722|ME811|ME860|ME863|ME865|MT620|MT710|MT716|MT720|MT810|MT870|MT917|Motorola.*TITANIUM|WX435|WX445|XT300|XT301|XT311|XT316|XT317|XT319|XT320|XT390|XT502|XT530|XT531|XT532|XT535|XT603|XT610|XT611|XT615|XT681|XT701|XT702|XT711|XT720|XT800|XT806|XT860|XT862|XT875|XT882|XT883|XT894|XT901|XT907|XT909|XT910|XT912|XT928|XT926|XT915|XT919|XT925|XT1021|\\bMoto E\\b", "Samsung": "Samsung|SM-G9250|GT-19300|SGH-I337|BGT-S5230|GT-B2100|GT-B2700|GT-B2710|GT-B3210|GT-B3310|GT-B3410|GT-B3730|GT-B3740|GT-B5510|GT-B5512|GT-B5722|GT-B6520|GT-B7300|GT-B7320|GT-B7330|GT-B7350|GT-B7510|GT-B7722|GT-B7800|GT-C3010|GT-C3011|GT-C3060|GT-C3200|GT-C3212|GT-C3212I|GT-C3262|GT-C3222|GT-C3300|GT-C3300K|GT-C3303|GT-C3303K|GT-C3310|GT-C3322|GT-C3330|GT-C3350|GT-C3500|GT-C3510|GT-C3530|GT-C3630|GT-C3780|GT-C5010|GT-C5212|GT-C6620|GT-C6625|GT-C6712|GT-E1050|GT-E1070|GT-E1075|GT-E1080|GT-E1081|GT-E1085|GT-E1087|GT-E1100|GT-E1107|GT-E1110|GT-E1120|GT-E1125|GT-E1130|GT-E1160|GT-E1170|GT-E1175|GT-E1180|GT-E1182|GT-E1200|GT-E1210|GT-E1225|GT-E1230|GT-E1390|GT-E2100|GT-E2120|GT-E2121|GT-E2152|GT-E2220|GT-E2222|GT-E2230|GT-E2232|GT-E2250|GT-E2370|GT-E2550|GT-E2652|GT-E3210|GT-E3213|GT-I5500|GT-I5503|GT-I5700|GT-I5800|GT-I5801|GT-I6410|GT-I6420|GT-I7110|GT-I7410|GT-I7500|GT-I8000|GT-I8150|GT-I8160|GT-I8190|GT-I8320|GT-I8330|GT-I8350|GT-I8530|GT-I8700|GT-I8703|GT-I8910|GT-I9000|GT-I9001|GT-I9003|GT-I9010|GT-I9020|GT-I9023|GT-I9070|GT-I9082|GT-I9100|GT-I9103|GT-I9220|GT-I9250|GT-I9300|GT-I9305|GT-I9500|GT-I9505|GT-M3510|GT-M5650|GT-M7500|GT-M7600|GT-M7603|GT-M8800|GT-M8910|GT-N7000|GT-S3110|GT-S3310|GT-S3350|GT-S3353|GT-S3370|GT-S3650|GT-S3653|GT-S3770|GT-S3850|GT-S5210|GT-S5220|GT-S5229|GT-S5230|GT-S5233|GT-S5250|GT-S5253|GT-S5260|GT-S5263|GT-S5270|GT-S5300|GT-S5330|GT-S5350|GT-S5360|GT-S5363|GT-S5369|GT-S5380|GT-S5380D|GT-S5560|GT-S5570|GT-S5600|GT-S5603|GT-S5610|GT-S5620|GT-S5660|GT-S5670|GT-S5690|GT-S5750|GT-S5780|GT-S5830|GT-S5839|GT-S6102|GT-S6500|GT-S7070|GT-S7200|GT-S7220|GT-S7230|GT-S7233|GT-S7250|GT-S7500|GT-S7530|GT-S7550|GT-S7562|GT-S7710|GT-S8000|GT-S8003|GT-S8500|GT-S8530|GT-S8600|SCH-A310|SCH-A530|SCH-A570|SCH-A610|SCH-A630|SCH-A650|SCH-A790|SCH-A795|SCH-A850|SCH-A870|SCH-A890|SCH-A930|SCH-A950|SCH-A970|SCH-A990|SCH-I100|SCH-I110|SCH-I400|SCH-I405|SCH-I500|SCH-I510|SCH-I515|SCH-I600|SCH-I730|SCH-I760|SCH-I770|SCH-I830|SCH-I910|SCH-I920|SCH-I959|SCH-LC11|SCH-N150|SCH-N300|SCH-R100|SCH-R300|SCH-R351|SCH-R400|SCH-R410|SCH-T300|SCH-U310|SCH-U320|SCH-U350|SCH-U360|SCH-U365|SCH-U370|SCH-U380|SCH-U410|SCH-U430|SCH-U450|SCH-U460|SCH-U470|SCH-U490|SCH-U540|SCH-U550|SCH-U620|SCH-U640|SCH-U650|SCH-U660|SCH-U700|SCH-U740|SCH-U750|SCH-U810|SCH-U820|SCH-U900|SCH-U940|SCH-U960|SCS-26UC|SGH-A107|SGH-A117|SGH-A127|SGH-A137|SGH-A157|SGH-A167|SGH-A177|SGH-A187|SGH-A197|SGH-A227|SGH-A237|SGH-A257|SGH-A437|SGH-A517|SGH-A597|SGH-A637|SGH-A657|SGH-A667|SGH-A687|SGH-A697|SGH-A707|SGH-A717|SGH-A727|SGH-A737|SGH-A747|SGH-A767|SGH-A777|SGH-A797|SGH-A817|SGH-A827|SGH-A837|SGH-A847|SGH-A867|SGH-A877|SGH-A887|SGH-A897|SGH-A927|SGH-B100|SGH-B130|SGH-B200|SGH-B220|SGH-C100|SGH-C110|SGH-C120|SGH-C130|SGH-C140|SGH-C160|SGH-C170|SGH-C180|SGH-C200|SGH-C207|SGH-C210|SGH-C225|SGH-C230|SGH-C417|SGH-C450|SGH-D307|SGH-D347|SGH-D357|SGH-D407|SGH-D415|SGH-D780|SGH-D807|SGH-D980|SGH-E105|SGH-E200|SGH-E315|SGH-E316|SGH-E317|SGH-E335|SGH-E590|SGH-E635|SGH-E715|SGH-E890|SGH-F300|SGH-F480|SGH-I200|SGH-I300|SGH-I320|SGH-I550|SGH-I577|SGH-I600|SGH-I607|SGH-I617|SGH-I627|SGH-I637|SGH-I677|SGH-I700|SGH-I717|SGH-I727|SGH-i747M|SGH-I777|SGH-I780|SGH-I827|SGH-I847|SGH-I857|SGH-I896|SGH-I897|SGH-I900|SGH-I907|SGH-I917|SGH-I927|SGH-I937|SGH-I997|SGH-J150|SGH-J200|SGH-L170|SGH-L700|SGH-M110|SGH-M150|SGH-M200|SGH-N105|SGH-N500|SGH-N600|SGH-N620|SGH-N625|SGH-N700|SGH-N710|SGH-P107|SGH-P207|SGH-P300|SGH-P310|SGH-P520|SGH-P735|SGH-P777|SGH-Q105|SGH-R210|SGH-R220|SGH-R225|SGH-S105|SGH-S307|SGH-T109|SGH-T119|SGH-T139|SGH-T209|SGH-T219|SGH-T229|SGH-T239|SGH-T249|SGH-T259|SGH-T309|SGH-T319|SGH-T329|SGH-T339|SGH-T349|SGH-T359|SGH-T369|SGH-T379|SGH-T409|SGH-T429|SGH-T439|SGH-T459|SGH-T469|SGH-T479|SGH-T499|SGH-T509|SGH-T519|SGH-T539|SGH-T559|SGH-T589|SGH-T609|SGH-T619|SGH-T629|SGH-T639|SGH-T659|SGH-T669|SGH-T679|SGH-T709|SGH-T719|SGH-T729|SGH-T739|SGH-T746|SGH-T749|SGH-T759|SGH-T769|SGH-T809|SGH-T819|SGH-T839|SGH-T919|SGH-T929|SGH-T939|SGH-T959|SGH-T989|SGH-U100|SGH-U200|SGH-U800|SGH-V205|SGH-V206|SGH-X100|SGH-X105|SGH-X120|SGH-X140|SGH-X426|SGH-X427|SGH-X475|SGH-X495|SGH-X497|SGH-X507|SGH-X600|SGH-X610|SGH-X620|SGH-X630|SGH-X700|SGH-X820|SGH-X890|SGH-Z130|SGH-Z150|SGH-Z170|SGH-ZX10|SGH-ZX20|SHW-M110|SPH-A120|SPH-A400|SPH-A420|SPH-A460|SPH-A500|SPH-A560|SPH-A600|SPH-A620|SPH-A660|SPH-A700|SPH-A740|SPH-A760|SPH-A790|SPH-A800|SPH-A820|SPH-A840|SPH-A880|SPH-A900|SPH-A940|SPH-A960|SPH-D600|SPH-D700|SPH-D710|SPH-D720|SPH-I300|SPH-I325|SPH-I330|SPH-I350|SPH-I500|SPH-I600|SPH-I700|SPH-L700|SPH-M100|SPH-M220|SPH-M240|SPH-M300|SPH-M305|SPH-M320|SPH-M330|SPH-M350|SPH-M360|SPH-M370|SPH-M380|SPH-M510|SPH-M540|SPH-M550|SPH-M560|SPH-M570|SPH-M580|SPH-M610|SPH-M620|SPH-M630|SPH-M800|SPH-M810|SPH-M850|SPH-M900|SPH-M910|SPH-M920|SPH-M930|SPH-N100|SPH-N200|SPH-N240|SPH-N300|SPH-N400|SPH-Z400|SWC-E100|SCH-i909|GT-N7100|GT-N7105|SCH-I535|SM-N900A|SGH-I317|SGH-T999L|GT-S5360B|GT-I8262|GT-S6802|GT-S6312|GT-S6310|GT-S5312|GT-S5310|GT-I9105|GT-I8510|GT-S6790N|SM-G7105|SM-N9005|GT-S5301|GT-I9295|GT-I9195|SM-C101|GT-S7392|GT-S7560|GT-B7610|GT-I5510|GT-S7582|GT-S7530E|GT-I8750|SM-G9006V|SM-G9008V|SM-G9009D|SM-G900A|SM-G900D|SM-G900F|SM-G900H|SM-G900I|SM-G900J|SM-G900K|SM-G900L|SM-G900M|SM-G900P|SM-G900R4|SM-G900S|SM-G900T|SM-G900V|SM-G900W8|SHV-E160K|SCH-P709|SCH-P729|SM-T2558|GT-I9205|SM-G9350|SM-J120F", "LG": "\\bLG\\b;|LG[- ]?(C800|C900|E400|E610|E900|E-900|F160|F180K|F180L|F180S|730|855|L160|LS740|LS840|LS970|LU6200|MS690|MS695|MS770|MS840|MS870|MS910|P500|P700|P705|VM696|AS680|AS695|AX840|C729|E970|GS505|272|C395|E739BK|E960|L55C|L75C|LS696|LS860|P769BK|P350|P500|P509|P870|UN272|US730|VS840|VS950|LN272|LN510|LS670|LS855|LW690|MN270|MN510|P509|P769|P930|UN200|UN270|UN510|UN610|US670|US740|US760|UX265|UX840|VN271|VN530|VS660|VS700|VS740|VS750|VS910|VS920|VS930|VX9200|VX11000|AX840A|LW770|P506|P925|P999|E612|D955|D802|MS323)", "Sony": "SonyST|SonyLT|SonyEricsson|SonyEricssonLT15iv|LT18i|E10i|LT28h|LT26w|SonyEricssonMT27i|C5303|C6902|C6903|C6906|C6943|D2533", "Asus": "Asus.*Galaxy|PadFone.*Mobile", "NokiaLumia": "Lumia [0-9]{3,4}", "Micromax": "Micromax.*\\b(A210|A92|A88|A72|A111|A110Q|A115|A116|A110|A90S|A26|A51|A35|A54|A25|A27|A89|A68|A65|A57|A90)\\b", "Palm": "PalmSource|Palm", "Vertu": "Vertu|Vertu.*Ltd|Vertu.*Ascent|Vertu.*Ayxta|Vertu.*Constellation(F|Quest)?|Vertu.*Monika|Vertu.*Signature", "Pantech": "PANTECH|IM-A850S|IM-A840S|IM-A830L|IM-A830K|IM-A830S|IM-A820L|IM-A810K|IM-A810S|IM-A800S|IM-T100K|IM-A725L|IM-A780L|IM-A775C|IM-A770K|IM-A760S|IM-A750K|IM-A740S|IM-A730S|IM-A720L|IM-A710K|IM-A690L|IM-A690S|IM-A650S|IM-A630K|IM-A600S|VEGA PTL21|PT003|P8010|ADR910L|P6030|P6020|P9070|P4100|P9060|P5000|CDM8992|TXT8045|ADR8995|IS11PT|P2030|P6010|P8000|PT002|IS06|CDM8999|P9050|PT001|TXT8040|P2020|P9020|P2000|P7040|P7000|C790", "Fly": "IQ230|IQ444|IQ450|IQ440|IQ442|IQ441|IQ245|IQ256|IQ236|IQ255|IQ235|IQ245|IQ275|IQ240|IQ285|IQ280|IQ270|IQ260|IQ250", "Wiko": "KITE 4G|HIGHWAY|GETAWAY|STAIRWAY|DARKSIDE|DARKFULL|DARKNIGHT|DARKMOON|SLIDE|WAX 4G|RAINBOW|BLOOM|SUNSET|GOA(?!nna)|LENNY|BARRY|IGGY|OZZY|CINK FIVE|CINK PEAX|CINK PEAX 2|CINK SLIM|CINK SLIM 2|CINK +|CINK KING|CINK PEAX|CINK SLIM|SUBLIM", "iMobile": "i-mobile (IQ|i-STYLE|idea|ZAA|Hitz)", "SimValley": "\\b(SP-80|XT-930|SX-340|XT-930|SX-310|SP-360|SP60|SPT-800|SP-120|SPT-800|SP-140|SPX-5|SPX-8|SP-100|SPX-8|SPX-12)\\b", "Wolfgang": "AT-B24D|AT-AS50HD|AT-AS40W|AT-AS55HD|AT-AS45q2|AT-B26D|AT-AS50Q", "Alcatel": "Alcatel", "Nintendo": "Nintendo 3DS", "Amoi": "Amoi", "INQ": "INQ", "GenericPhone": "Tapatalk|PDA;|SAGEM|\\bmmp\\b|pocket|\\bpsp\\b|symbian|Smartphone|smartfon|treo|up.browser|up.link|vodafone|\\bwap\\b|nokia|Series40|Series60|S60|SonyEricsson|N900|MAUI.*WAP.*Browser" }, "tablets": { "iPad": "iPad|iPad.*Mobile", "NexusTablet": "Android.*Nexus[\\s]+(7|9|10)", "SamsungTablet": "SAMSUNG.*Tablet|Galaxy.*Tab|SC-01C|GT-P1000|GT-P1003|GT-P1010|GT-P3105|GT-P6210|GT-P6800|GT-P6810|GT-P7100|GT-P7300|GT-P7310|GT-P7500|GT-P7510|SCH-I800|SCH-I815|SCH-I905|SGH-I957|SGH-I987|SGH-T849|SGH-T859|SGH-T869|SPH-P100|GT-P3100|GT-P3108|GT-P3110|GT-P5100|GT-P5110|GT-P6200|GT-P7320|GT-P7511|GT-N8000|GT-P8510|SGH-I497|SPH-P500|SGH-T779|SCH-I705|SCH-I915|GT-N8013|GT-P3113|GT-P5113|GT-P8110|GT-N8010|GT-N8005|GT-N8020|GT-P1013|GT-P6201|GT-P7501|GT-N5100|GT-N5105|GT-N5110|SHV-E140K|SHV-E140L|SHV-E140S|SHV-E150S|SHV-E230K|SHV-E230L|SHV-E230S|SHW-M180K|SHW-M180L|SHW-M180S|SHW-M180W|SHW-M300W|SHW-M305W|SHW-M380K|SHW-M380S|SHW-M380W|SHW-M430W|SHW-M480K|SHW-M480S|SHW-M480W|SHW-M485W|SHW-M486W|SHW-M500W|GT-I9228|SCH-P739|SCH-I925|GT-I9200|GT-P5200|GT-P5210|GT-P5210X|SM-T311|SM-T310|SM-T310X|SM-T210|SM-T210R|SM-T211|SM-P600|SM-P601|SM-P605|SM-P900|SM-P901|SM-T217|SM-T217A|SM-T217S|SM-P6000|SM-T3100|SGH-I467|XE500|SM-T110|GT-P5220|GT-I9200X|GT-N5110X|GT-N5120|SM-P905|SM-T111|SM-T2105|SM-T315|SM-T320|SM-T320X|SM-T321|SM-T520|SM-T525|SM-T530NU|SM-T230NU|SM-T330NU|SM-T900|XE500T1C|SM-P605V|SM-P905V|SM-T337V|SM-T537V|SM-T707V|SM-T807V|SM-P600X|SM-P900X|SM-T210X|SM-T230|SM-T230X|SM-T325|GT-P7503|SM-T531|SM-T330|SM-T530|SM-T705|SM-T705C|SM-T535|SM-T331|SM-T800|SM-T700|SM-T537|SM-T807|SM-P907A|SM-T337A|SM-T537A|SM-T707A|SM-T807A|SM-T237|SM-T807P|SM-P607T|SM-T217T|SM-T337T|SM-T807T|SM-T116NQ|SM-P550|SM-T350|SM-T550|SM-T9000|SM-P9000|SM-T705Y|SM-T805|GT-P3113|SM-T710|SM-T810|SM-T815|SM-T360|SM-T533|SM-T113|SM-T335|SM-T715|SM-T560|SM-T670|SM-T677|SM-T377|SM-T567|SM-T357T|SM-T555|SM-T561", "Kindle": "Kindle|Silk.*Accelerated|Android.*\\b(KFOT|KFTT|KFJWI|KFJWA|KFOTE|KFSOWI|KFTHWI|KFTHWA|KFAPWI|KFAPWA|WFJWAE|KFSAWA|KFSAWI|KFASWI|KFARWI)\\b", "SurfaceTablet": "Windows NT [0-9.]+; ARM;.*(Tablet|ARMBJS)", "HPTablet": "HP Slate (7|8|10)|HP ElitePad 900|hp-tablet|EliteBook.*Touch|HP 8|Slate 21|HP SlateBook 10", "AsusTablet": "^.*PadFone((?!Mobile).)*$|Transformer|TF101|TF101G|TF300T|TF300TG|TF300TL|TF700T|TF700KL|TF701T|TF810C|ME171|ME301T|ME302C|ME371MG|ME370T|ME372MG|ME172V|ME173X|ME400C|Slider SL101|\\bK00F\\b|\\bK00C\\b|\\bK00E\\b|\\bK00L\\b|TX201LA|ME176C|ME102A|\\bM80TA\\b|ME372CL|ME560CG|ME372CG|ME302KL| K010 | K017 |ME572C|ME103K|ME170C|ME171C|\\bME70C\\b|ME581C|ME581CL|ME8510C|ME181C|P01Y|PO1MA", "BlackBerryTablet": "PlayBook|RIM Tablet", "HTCtablet": "HTC_Flyer_P512|HTC Flyer|HTC Jetstream|HTC-P715a|HTC EVO View 4G|PG41200|PG09410", "MotorolaTablet": "xoom|sholest|MZ615|MZ605|MZ505|MZ601|MZ602|MZ603|MZ604|MZ606|MZ607|MZ608|MZ609|MZ615|MZ616|MZ617", "NookTablet": "Android.*Nook|NookColor|nook browser|BNRV200|BNRV200A|BNTV250|BNTV250A|BNTV400|BNTV600|LogicPD Zoom2", "AcerTablet": "Android.*; \\b(A100|A101|A110|A200|A210|A211|A500|A501|A510|A511|A700|A701|W500|W500P|W501|W501P|W510|W511|W700|G100|G100W|B1-A71|B1-710|B1-711|A1-810|A1-811|A1-830)\\b|W3-810|\\bA3-A10\\b|\\bA3-A11\\b|\\bA3-A20", "ToshibaTablet": "Android.*(AT100|AT105|AT200|AT205|AT270|AT275|AT300|AT305|AT1S5|AT500|AT570|AT700|AT830)|TOSHIBA.*FOLIO", "LGTablet": "\\bL-06C|LG-V909|LG-V900|LG-V700|LG-V510|LG-V500|LG-V410|LG-V400|LG-VK810\\b", "FujitsuTablet": "Android.*\\b(F-01D|F-02F|F-05E|F-10D|M532|Q572)\\b", "PrestigioTablet": "PMP3170B|PMP3270B|PMP3470B|PMP7170B|PMP3370B|PMP3570C|PMP5870C|PMP3670B|PMP5570C|PMP5770D|PMP3970B|PMP3870C|PMP5580C|PMP5880D|PMP5780D|PMP5588C|PMP7280C|PMP7280C3G|PMP7280|PMP7880D|PMP5597D|PMP5597|PMP7100D|PER3464|PER3274|PER3574|PER3884|PER5274|PER5474|PMP5097CPRO|PMP5097|PMP7380D|PMP5297C|PMP5297C_QUAD|PMP812E|PMP812E3G|PMP812F|PMP810E|PMP880TD|PMT3017|PMT3037|PMT3047|PMT3057|PMT7008|PMT5887|PMT5001|PMT5002", "LenovoTablet": "Lenovo TAB|Idea(Tab|Pad)( A1|A10| K1|)|ThinkPad([ ]+)?Tablet|YT3-X90L|YT3-X90F|YT3-X90X|Lenovo.*(S2109|S2110|S5000|S6000|K3011|A3000|A3500|A1000|A2107|A2109|A1107|A5500|A7600|B6000|B8000|B8080)(-|)(FL|F|HV|H|)", "DellTablet": "Venue 11|Venue 8|Venue 7|Dell Streak 10|Dell Streak 7", "YarvikTablet": "Android.*\\b(TAB210|TAB211|TAB224|TAB250|TAB260|TAB264|TAB310|TAB360|TAB364|TAB410|TAB411|TAB420|TAB424|TAB450|TAB460|TAB461|TAB464|TAB465|TAB467|TAB468|TAB07-100|TAB07-101|TAB07-150|TAB07-151|TAB07-152|TAB07-200|TAB07-201-3G|TAB07-210|TAB07-211|TAB07-212|TAB07-214|TAB07-220|TAB07-400|TAB07-485|TAB08-150|TAB08-200|TAB08-201-3G|TAB08-201-30|TAB09-100|TAB09-211|TAB09-410|TAB10-150|TAB10-201|TAB10-211|TAB10-400|TAB10-410|TAB13-201|TAB274EUK|TAB275EUK|TAB374EUK|TAB462EUK|TAB474EUK|TAB9-200)\\b", "MedionTablet": "Android.*\\bOYO\\b|LIFE.*(P9212|P9514|P9516|S9512)|LIFETAB", "ArnovaTablet": "AN10G2|AN7bG3|AN7fG3|AN8G3|AN8cG3|AN7G3|AN9G3|AN7dG3|AN7dG3ST|AN7dG3ChildPad|AN10bG3|AN10bG3DT|AN9G2", "IntensoTablet": "INM8002KP|INM1010FP|INM805ND|Intenso Tab|TAB1004", "IRUTablet": "M702pro", "MegafonTablet": "MegaFon V9|\\bZTE V9\\b|Android.*\\bMT7A\\b", "EbodaTablet": "E-Boda (Supreme|Impresspeed|Izzycomm|Essential)", "AllViewTablet": "Allview.*(Viva|Alldro|City|Speed|All TV|Frenzy|Quasar|Shine|TX1|AX1|AX2)", "ArchosTablet": "\\b(101G9|80G9|A101IT)\\b|Qilive 97R|Archos5|\\bARCHOS (70|79|80|90|97|101|FAMILYPAD|)(b|)(G10| Cobalt| TITANIUM(HD|)| Xenon| Neon|XSK| 2| XS 2| PLATINUM| CARBON|GAMEPAD)\\b", "AinolTablet": "NOVO7|NOVO8|NOVO10|Novo7Aurora|Novo7Basic|NOVO7PALADIN|novo9-Spark", "NokiaLumiaTablet": "Lumia 2520", "SonyTablet": "Sony.*Tablet|Xperia Tablet|Sony Tablet S|SO-03E|SGPT12|SGPT13|SGPT114|SGPT121|SGPT122|SGPT123|SGPT111|SGPT112|SGPT113|SGPT131|SGPT132|SGPT133|SGPT211|SGPT212|SGPT213|SGP311|SGP312|SGP321|EBRD1101|EBRD1102|EBRD1201|SGP351|SGP341|SGP511|SGP512|SGP521|SGP541|SGP551|SGP621|SGP612|SOT31", "PhilipsTablet": "\\b(PI2010|PI3000|PI3100|PI3105|PI3110|PI3205|PI3210|PI3900|PI4010|PI7000|PI7100)\\b", "CubeTablet": "Android.*(K8GT|U9GT|U10GT|U16GT|U17GT|U18GT|U19GT|U20GT|U23GT|U30GT)|CUBE U8GT", "CobyTablet": "MID1042|MID1045|MID1125|MID1126|MID7012|MID7014|MID7015|MID7034|MID7035|MID7036|MID7042|MID7048|MID7127|MID8042|MID8048|MID8127|MID9042|MID9740|MID9742|MID7022|MID7010", "MIDTablet": "M9701|M9000|M9100|M806|M1052|M806|T703|MID701|MID713|MID710|MID727|MID760|MID830|MID728|MID933|MID125|MID810|MID732|MID120|MID930|MID800|MID731|MID900|MID100|MID820|MID735|MID980|MID130|MID833|MID737|MID960|MID135|MID860|MID736|MID140|MID930|MID835|MID733|MID4X10", "MSITablet": "MSI \\b(Primo 73K|Primo 73L|Primo 81L|Primo 77|Primo 93|Primo 75|Primo 76|Primo 73|Primo 81|Primo 91|Primo 90|Enjoy 71|Enjoy 7|Enjoy 10)\\b", "SMiTTablet": "Android.*(\\bMID\\b|MID-560|MTV-T1200|MTV-PND531|MTV-P1101|MTV-PND530)", "RockChipTablet": "Android.*(RK2818|RK2808A|RK2918|RK3066)|RK2738|RK2808A", "FlyTablet": "IQ310|Fly Vision", "bqTablet": "Android.*(bq)?.*(Elcano|Curie|Edison|Maxwell|Kepler|Pascal|Tesla|Hypatia|Platon|Newton|Livingstone|Cervantes|Avant|Aquaris E10)|Maxwell.*Lite|Maxwell.*Plus", "HuaweiTablet": "MediaPad|MediaPad 7 Youth|IDEOS S7|S7-201c|S7-202u|S7-101|S7-103|S7-104|S7-105|S7-106|S7-201|S7-Slim", "NecTablet": "\\bN-06D|\\bN-08D", "PantechTablet": "Pantech.*P4100", "BronchoTablet": "Broncho.*(N701|N708|N802|a710)", "VersusTablet": "TOUCHPAD.*[78910]|\\bTOUCHTAB\\b", "ZyncTablet": "z1000|Z99 2G|z99|z930|z999|z990|z909|Z919|z900", "PositivoTablet": "TB07STA|TB10STA|TB07FTA|TB10FTA", "NabiTablet": "Android.*\\bNabi", "KoboTablet": "Kobo Touch|\\bK080\\b|\\bVox\\b Build|\\bArc\\b Build", "DanewTablet": "DSlide.*\\b(700|701R|702|703R|704|802|970|971|972|973|974|1010|1012)\\b", "TexetTablet": "NaviPad|TB-772A|TM-7045|TM-7055|TM-9750|TM-7016|TM-7024|TM-7026|TM-7041|TM-7043|TM-7047|TM-8041|TM-9741|TM-9747|TM-9748|TM-9751|TM-7022|TM-7021|TM-7020|TM-7011|TM-7010|TM-7023|TM-7025|TM-7037W|TM-7038W|TM-7027W|TM-9720|TM-9725|TM-9737W|TM-1020|TM-9738W|TM-9740|TM-9743W|TB-807A|TB-771A|TB-727A|TB-725A|TB-719A|TB-823A|TB-805A|TB-723A|TB-715A|TB-707A|TB-705A|TB-709A|TB-711A|TB-890HD|TB-880HD|TB-790HD|TB-780HD|TB-770HD|TB-721HD|TB-710HD|TB-434HD|TB-860HD|TB-840HD|TB-760HD|TB-750HD|TB-740HD|TB-730HD|TB-722HD|TB-720HD|TB-700HD|TB-500HD|TB-470HD|TB-431HD|TB-430HD|TB-506|TB-504|TB-446|TB-436|TB-416|TB-146SE|TB-126SE", "PlaystationTablet": "Playstation.*(Portable|Vita)", "TrekstorTablet": "ST10416-1|VT10416-1|ST70408-1|ST702xx-1|ST702xx-2|ST80208|ST97216|ST70104-2|VT10416-2|ST10216-2A|SurfTab", "PyleAudioTablet": "\\b(PTBL10CEU|PTBL10C|PTBL72BC|PTBL72BCEU|PTBL7CEU|PTBL7C|PTBL92BC|PTBL92BCEU|PTBL9CEU|PTBL9CUK|PTBL9C)\\b", "AdvanTablet": "Android.* \\b(E3A|T3X|T5C|T5B|T3E|T3C|T3B|T1J|T1F|T2A|T1H|T1i|E1C|T1-E|T5-A|T4|E1-B|T2Ci|T1-B|T1-D|O1-A|E1-A|T1-A|T3A|T4i)\\b ", "DanyTechTablet": "Genius Tab G3|Genius Tab S2|Genius Tab Q3|Genius Tab G4|Genius Tab Q4|Genius Tab G-II|Genius TAB GII|Genius TAB GIII|Genius Tab S1", "GalapadTablet": "Android.*\\bG1\\b", "MicromaxTablet": "Funbook|Micromax.*\\b(P250|P560|P360|P362|P600|P300|P350|P500|P275)\\b", "KarbonnTablet": "Android.*\\b(A39|A37|A34|ST8|ST10|ST7|Smart Tab3|Smart Tab2)\\b", "AllFineTablet": "Fine7 Genius|Fine7 Shine|Fine7 Air|Fine8 Style|Fine9 More|Fine10 Joy|Fine11 Wide", "PROSCANTablet": "\\b(PEM63|PLT1023G|PLT1041|PLT1044|PLT1044G|PLT1091|PLT4311|PLT4311PL|PLT4315|PLT7030|PLT7033|PLT7033D|PLT7035|PLT7035D|PLT7044K|PLT7045K|PLT7045KB|PLT7071KG|PLT7072|PLT7223G|PLT7225G|PLT7777G|PLT7810K|PLT7849G|PLT7851G|PLT7852G|PLT8015|PLT8031|PLT8034|PLT8036|PLT8080K|PLT8082|PLT8088|PLT8223G|PLT8234G|PLT8235G|PLT8816K|PLT9011|PLT9045K|PLT9233G|PLT9735|PLT9760G|PLT9770G)\\b", "YONESTablet": "BQ1078|BC1003|BC1077|RK9702|BC9730|BC9001|IT9001|BC7008|BC7010|BC708|BC728|BC7012|BC7030|BC7027|BC7026", "ChangJiaTablet": "TPC7102|TPC7103|TPC7105|TPC7106|TPC7107|TPC7201|TPC7203|TPC7205|TPC7210|TPC7708|TPC7709|TPC7712|TPC7110|TPC8101|TPC8103|TPC8105|TPC8106|TPC8203|TPC8205|TPC8503|TPC9106|TPC9701|TPC97101|TPC97103|TPC97105|TPC97106|TPC97111|TPC97113|TPC97203|TPC97603|TPC97809|TPC97205|TPC10101|TPC10103|TPC10106|TPC10111|TPC10203|TPC10205|TPC10503", "GUTablet": "TX-A1301|TX-M9002|Q702|kf026", "PointOfViewTablet": "TAB-P506|TAB-navi-7-3G-M|TAB-P517|TAB-P-527|TAB-P701|TAB-P703|TAB-P721|TAB-P731N|TAB-P741|TAB-P825|TAB-P905|TAB-P925|TAB-PR945|TAB-PL1015|TAB-P1025|TAB-PI1045|TAB-P1325|TAB-PROTAB[0-9]+|TAB-PROTAB25|TAB-PROTAB26|TAB-PROTAB27|TAB-PROTAB26XL|TAB-PROTAB2-IPS9|TAB-PROTAB30-IPS9|TAB-PROTAB25XXL|TAB-PROTAB26-IPS10|TAB-PROTAB30-IPS10", "OvermaxTablet": "OV-(SteelCore|NewBase|Basecore|Baseone|Exellen|Quattor|EduTab|Solution|ACTION|BasicTab|TeddyTab|MagicTab|Stream|TB-08|TB-09)", "HCLTablet": "HCL.*Tablet|Connect-3G-2.0|Connect-2G-2.0|ME Tablet U1|ME Tablet U2|ME Tablet G1|ME Tablet X1|ME Tablet Y2|ME Tablet Sync", "DPSTablet": "DPS Dream 9|DPS Dual 7", "VistureTablet": "V97 HD|i75 3G|Visture V4( HD)?|Visture V5( HD)?|Visture V10", "CrestaTablet": "CTP(-)?810|CTP(-)?818|CTP(-)?828|CTP(-)?838|CTP(-)?888|CTP(-)?978|CTP(-)?980|CTP(-)?987|CTP(-)?988|CTP(-)?989", "MediatekTablet": "\\bMT8125|MT8389|MT8135|MT8377\\b", "ConcordeTablet": "Concorde([ ]+)?Tab|ConCorde ReadMan", "GoCleverTablet": "GOCLEVER TAB|A7GOCLEVER|M1042|M7841|M742|R1042BK|R1041|TAB A975|TAB A7842|TAB A741|TAB A741L|TAB M723G|TAB M721|TAB A1021|TAB I921|TAB R721|TAB I720|TAB T76|TAB R70|TAB R76.2|TAB R106|TAB R83.2|TAB M813G|TAB I721|GCTA722|TAB I70|TAB I71|TAB S73|TAB R73|TAB R74|TAB R93|TAB R75|TAB R76.1|TAB A73|TAB A93|TAB A93.2|TAB T72|TAB R83|TAB R974|TAB R973|TAB A101|TAB A103|TAB A104|TAB A104.2|R105BK|M713G|A972BK|TAB A971|TAB R974.2|TAB R104|TAB R83.3|TAB A1042", "ModecomTablet": "FreeTAB 9000|FreeTAB 7.4|FreeTAB 7004|FreeTAB 7800|FreeTAB 2096|FreeTAB 7.5|FreeTAB 1014|FreeTAB 1001 |FreeTAB 8001|FreeTAB 9706|FreeTAB 9702|FreeTAB 7003|FreeTAB 7002|FreeTAB 1002|FreeTAB 7801|FreeTAB 1331|FreeTAB 1004|FreeTAB 8002|FreeTAB 8014|FreeTAB 9704|FreeTAB 1003", "VoninoTablet": "\\b(Argus[ _]?S|Diamond[ _]?79HD|Emerald[ _]?78E|Luna[ _]?70C|Onyx[ _]?S|Onyx[ _]?Z|Orin[ _]?HD|Orin[ _]?S|Otis[ _]?S|SpeedStar[ _]?S|Magnet[ _]?M9|Primus[ _]?94[ _]?3G|Primus[ _]?94HD|Primus[ _]?QS|Android.*\\bQ8\\b|Sirius[ _]?EVO[ _]?QS|Sirius[ _]?QS|Spirit[ _]?S)\\b", "ECSTablet": "V07OT2|TM105A|S10OT1|TR10CS1", "StorexTablet": "eZee[_']?(Tab|Go)[0-9]+|TabLC7|Looney Tunes Tab", "VodafoneTablet": "SmartTab([ ]+)?[0-9]+|SmartTabII10|SmartTabII7|VF-1497", "EssentielBTablet": "Smart[ ']?TAB[ ]+?[0-9]+|Family[ ']?TAB2", "RossMoorTablet": "RM-790|RM-997|RMD-878G|RMD-974R|RMT-705A|RMT-701|RME-601|RMT-501|RMT-711", "iMobileTablet": "i-mobile i-note", "TolinoTablet": "tolino tab [0-9.]+|tolino shine", "AudioSonicTablet": "\\bC-22Q|T7-QC|T-17B|T-17P\\b", "AMPETablet": "Android.* A78 ", "SkkTablet": "Android.* (SKYPAD|PHOENIX|CYCLOPS)", "TecnoTablet": "TECNO P9", "JXDTablet": "Android.* \\b(F3000|A3300|JXD5000|JXD3000|JXD2000|JXD300B|JXD300|S5800|S7800|S602b|S5110b|S7300|S5300|S602|S603|S5100|S5110|S601|S7100a|P3000F|P3000s|P101|P200s|P1000m|P200m|P9100|P1000s|S6600b|S908|P1000|P300|S18|S6600|S9100)\\b", "iJoyTablet": "Tablet (Spirit 7|Essentia|Galatea|Fusion|Onix 7|Landa|Titan|Scooby|Deox|Stella|Themis|Argon|Unique 7|Sygnus|Hexen|Finity 7|Cream|Cream X2|Jade|Neon 7|Neron 7|Kandy|Scape|Saphyr 7|Rebel|Biox|Rebel|Rebel 8GB|Myst|Draco 7|Myst|Tab7-004|Myst|Tadeo Jones|Tablet Boing|Arrow|Draco Dual Cam|Aurix|Mint|Amity|Revolution|Finity 9|Neon 9|T9w|Amity 4GB Dual Cam|Stone 4GB|Stone 8GB|Andromeda|Silken|X2|Andromeda II|Halley|Flame|Saphyr 9,7|Touch 8|Planet|Triton|Unique 10|Hexen 10|Memphis 4GB|Memphis 8GB|Onix 10)", "FX2Tablet": "FX2 PAD7|FX2 PAD10", "XoroTablet": "KidsPAD 701|PAD[ ]?712|PAD[ ]?714|PAD[ ]?716|PAD[ ]?717|PAD[ ]?718|PAD[ ]?720|PAD[ ]?721|PAD[ ]?722|PAD[ ]?790|PAD[ ]?792|PAD[ ]?900|PAD[ ]?9715D|PAD[ ]?9716DR|PAD[ ]?9718DR|PAD[ ]?9719QR|PAD[ ]?9720QR|TelePAD1030|Telepad1032|TelePAD730|TelePAD731|TelePAD732|TelePAD735Q|TelePAD830|TelePAD9730|TelePAD795|MegaPAD 1331|MegaPAD 1851|MegaPAD 2151", "ViewsonicTablet": "ViewPad 10pi|ViewPad 10e|ViewPad 10s|ViewPad E72|ViewPad7|ViewPad E100|ViewPad 7e|ViewSonic VB733|VB100a", "OdysTablet": "LOOX|XENO10|ODYS[ -](Space|EVO|Xpress|NOON)|\\bXELIO\\b|Xelio10Pro|XELIO7PHONETAB|XELIO10EXTREME|XELIOPT2|NEO_QUAD10", "CaptivaTablet": "CAPTIVA PAD", "IconbitTablet": "NetTAB|NT-3702|NT-3702S|NT-3702S|NT-3603P|NT-3603P|NT-0704S|NT-0704S|NT-3805C|NT-3805C|NT-0806C|NT-0806C|NT-0909T|NT-0909T|NT-0907S|NT-0907S|NT-0902S|NT-0902S", "TeclastTablet": "T98 4G|\\bP80\\b|\\bX90HD\\b|X98 Air|X98 Air 3G|\\bX89\\b|P80 3G|\\bX80h\\b|P98 Air|\\bX89HD\\b|P98 3G|\\bP90HD\\b|P89 3G|X98 3G|\\bP70h\\b|P79HD 3G|G18d 3G|\\bP79HD\\b|\\bP89s\\b|\\bA88\\b|\\bP10HD\\b|\\bP19HD\\b|G18 3G|\\bP78HD\\b|\\bA78\\b|\\bP75\\b|G17s 3G|G17h 3G|\\bP85t\\b|\\bP90\\b|\\bP11\\b|\\bP98t\\b|\\bP98HD\\b|\\bG18d\\b|\\bP85s\\b|\\bP11HD\\b|\\bP88s\\b|\\bA80HD\\b|\\bA80se\\b|\\bA10h\\b|\\bP89\\b|\\bP78s\\b|\\bG18\\b|\\bP85\\b|\\bA70h\\b|\\bA70\\b|\\bG17\\b|\\bP18\\b|\\bA80s\\b|\\bA11s\\b|\\bP88HD\\b|\\bA80h\\b|\\bP76s\\b|\\bP76h\\b|\\bP98\\b|\\bA10HD\\b|\\bP78\\b|\\bP88\\b|\\bA11\\b|\\bA10t\\b|\\bP76a\\b|\\bP76t\\b|\\bP76e\\b|\\bP85HD\\b|\\bP85a\\b|\\bP86\\b|\\bP75HD\\b|\\bP76v\\b|\\bA12\\b|\\bP75a\\b|\\bA15\\b|\\bP76Ti\\b|\\bP81HD\\b|\\bA10\\b|\\bT760VE\\b|\\bT720HD\\b|\\bP76\\b|\\bP73\\b|\\bP71\\b|\\bP72\\b|\\bT720SE\\b|\\bC520Ti\\b|\\bT760\\b|\\bT720VE\\b|T720-3GE|T720-WiFi", "OndaTablet": "\\b(V975i|Vi30|VX530|V701|Vi60|V701s|Vi50|V801s|V719|Vx610w|VX610W|V819i|Vi10|VX580W|Vi10|V711s|V813|V811|V820w|V820|Vi20|V711|VI30W|V712|V891w|V972|V819w|V820w|Vi60|V820w|V711|V813s|V801|V819|V975s|V801|V819|V819|V818|V811|V712|V975m|V101w|V961w|V812|V818|V971|V971s|V919|V989|V116w|V102w|V973|Vi40)\\b[\\s]+", "JaytechTablet": "TPC-PA762", "BlaupunktTablet": "Endeavour 800NG|Endeavour 1010", "DigmaTablet": "\\b(iDx10|iDx9|iDx8|iDx7|iDxD7|iDxD8|iDsQ8|iDsQ7|iDsQ8|iDsD10|iDnD7|3TS804H|iDsQ11|iDj7|iDs10)\\b", "EvolioTablet": "ARIA_Mini_wifi|Aria[ _]Mini|Evolio X10|Evolio X7|Evolio X8|\\bEvotab\\b|\\bNeura\\b", "LavaTablet": "QPAD E704|\\bIvoryS\\b|E-TAB IVORY|\\bE-TAB\\b", "AocTablet": "MW0811|MW0812|MW0922|MTK8382|MW1031|MW0831|MW0821|MW0931|MW0712", "MpmanTablet": "MP11 OCTA|MP10 OCTA|MPQC1114|MPQC1004|MPQC994|MPQC974|MPQC973|MPQC804|MPQC784|MPQC780|\\bMPG7\\b|MPDCG75|MPDCG71|MPDC1006|MP101DC|MPDC9000|MPDC905|MPDC706HD|MPDC706|MPDC705|MPDC110|MPDC100|MPDC99|MPDC97|MPDC88|MPDC8|MPDC77|MP709|MID701|MID711|MID170|MPDC703|MPQC1010", "CelkonTablet": "CT695|CT888|CT[\\s]?910|CT7 Tab|CT9 Tab|CT3 Tab|CT2 Tab|CT1 Tab|C820|C720|\\bCT-1\\b", "WolderTablet": "miTab \\b(DIAMOND|SPACE|BROOKLYN|NEO|FLY|MANHATTAN|FUNK|EVOLUTION|SKY|GOCAR|IRON|GENIUS|POP|MINT|EPSILON|BROADWAY|JUMP|HOP|LEGEND|NEW AGE|LINE|ADVANCE|FEEL|FOLLOW|LIKE|LINK|LIVE|THINK|FREEDOM|CHICAGO|CLEVELAND|BALTIMORE-GH|IOWA|BOSTON|SEATTLE|PHOENIX|DALLAS|IN 101|MasterChef)\\b", "MiTablet": "\\bMI PAD\\b|\\bHM NOTE 1W\\b", "NibiruTablet": "Nibiru M1|Nibiru Jupiter One", "NexoTablet": "NEXO NOVA|NEXO 10|NEXO AVIO|NEXO FREE|NEXO GO|NEXO EVO|NEXO 3G|NEXO SMART|NEXO KIDDO|NEXO MOBI", "LeaderTablet": "TBLT10Q|TBLT10I|TBL-10WDKB|TBL-10WDKBO2013|TBL-W230V2|TBL-W450|TBL-W500|SV572|TBLT7I|TBA-AC7-8G|TBLT79|TBL-8W16|TBL-10W32|TBL-10WKB|TBL-W100", "UbislateTablet": "UbiSlate[\\s]?7C", "PocketBookTablet": "Pocketbook", "KocasoTablet": "\\b(TB-1207)\\b", "Hudl": "Hudl HT7S3|Hudl 2", "TelstraTablet": "T-Hub2", "GenericTablet": "Android.*\\b97D\\b|Tablet(?!.*PC)|BNTV250A|MID-WCDMA|LogicPD Zoom2|\\bA7EB\\b|CatNova8|A1_07|CT704|CT1002|\\bM721\\b|rk30sdk|\\bEVOTAB\\b|M758A|ET904|ALUMIUM10|Smartfren Tab|Endeavour 1010|Tablet-PC-4|Tagi Tab|\\bM6pro\\b|CT1020W|arc 10HD|\\bJolla\\b|\\bTP750\\b" }, "oss": { "AndroidOS": "Android", "BlackBerryOS": "blackberry|\\bBB10\\b|rim tablet os", "PalmOS": "PalmOS|avantgo|blazer|elaine|hiptop|palm|plucker|xiino", "SymbianOS": "Symbian|SymbOS|Series60|Series40|SYB-[0-9]+|\\bS60\\b", "WindowsMobileOS": "Windows CE.*(PPC|Smartphone|Mobile|[0-9]{3}x[0-9]{3})|Window Mobile|Windows Phone [0-9.]+|WCE;", "WindowsPhoneOS": "Windows Phone 10.0|Windows Phone 8.1|Windows Phone 8.0|Windows Phone OS|XBLWP7|ZuneWP7|Windows NT 6.[23]; ARM;", "iOS": "\\biPhone.*Mobile|\\biPod|\\biPad", "MeeGoOS": "MeeGo", "MaemoOS": "Maemo", "JavaOS": "J2ME\/|\\bMIDP\\b|\\bCLDC\\b", "webOS": "webOS|hpwOS", "badaOS": "\\bBada\\b", "BREWOS": "BREW" }, "uas": { "Vivaldi": "Vivaldi", "Chrome": "\\bCrMo\\b|CriOS|Android.*Chrome\/[.0-9]* (Mobile)?", "Dolfin": "\\bDolfin\\b", "Opera": "Opera.*Mini|Opera.*Mobi|Android.*Opera|Mobile.*OPR\/[0-9.]+|Coast\/[0-9.]+", "Skyfire": "Skyfire", "Edge": "Mobile Safari\/[.0-9]* Edge", "IE": "IEMobile|MSIEMobile", "Firefox": "fennec|firefox.*maemo|(Mobile|Tablet).*Firefox|Firefox.*Mobile", "Bolt": "bolt", "TeaShark": "teashark", "Blazer": "Blazer", "Safari": "Version.*Mobile.*Safari|Safari.*Mobile|MobileSafari", "Tizen": "Tizen", "UCBrowser": "UC.*Browser|UCWEB", "baiduboxapp": "baiduboxapp", "baidubrowser": "baidubrowser", "DiigoBrowser": "DiigoBrowser", "Puffin": "Puffin", "Mercury": "\\bMercury\\b", "ObigoBrowser": "Obigo", "NetFront": "NF-Browser", "GenericBrowser": "NokiaBrowser|OviBrowser|OneBrowser|TwonkyBeamBrowser|SEMC.*Browser|FlyFlow|Minimo|NetFront|Novarra-Vision|MQQBrowser|MicroMessenger", "PaleMoon": "Android.*PaleMoon|Mobile.*PaleMoon" }, "props": { "Mobile": "Mobile\/[VER]", "Build": "Build\/[VER]", "Version": "Version\/[VER]", "VendorID": "VendorID\/[VER]", "iPad": "iPad.*CPU[a-z ]+[VER]", "iPhone": "iPhone.*CPU[a-z ]+[VER]", "iPod": "iPod.*CPU[a-z ]+[VER]", "Kindle": "Kindle\/[VER]", "Chrome": [ "Chrome\/[VER]", "CriOS\/[VER]", "CrMo\/[VER]" ], "Coast": [ "Coast\/[VER]" ], "Dolfin": "Dolfin\/[VER]", "Firefox": "Firefox\/[VER]", "Fennec": "Fennec\/[VER]", "Edge": "Edge\/[VER]", "IE": [ "IEMobile\/[VER];", "IEMobile [VER]", "MSIE [VER];", "Trident\/[0-9.]+;.*rv:[VER]" ], "NetFront": "NetFront\/[VER]", "NokiaBrowser": "NokiaBrowser\/[VER]", "Opera": [ " OPR\/[VER]", "Opera Mini\/[VER]", "Version\/[VER]" ], "Opera Mini": "Opera Mini\/[VER]", "Opera Mobi": "Version\/[VER]", "UC Browser": "UC Browser[VER]", "MQQBrowser": "MQQBrowser\/[VER]", "MicroMessenger": "MicroMessenger\/[VER]", "baiduboxapp": "baiduboxapp\/[VER]", "baidubrowser": "baidubrowser\/[VER]", "Iron": "Iron\/[VER]", "Safari": [ "Version\/[VER]", "Safari\/[VER]" ], "Skyfire": "Skyfire\/[VER]", "Tizen": "Tizen\/[VER]", "Webkit": "webkit[ \/][VER]", "PaleMoon": "PaleMoon\/[VER]", "Gecko": "Gecko\/[VER]", "Trident": "Trident\/[VER]", "Presto": "Presto\/[VER]", "Goanna": "Goanna\/[VER]", "iOS": " \\bi?OS\\b [VER][ ;]{1}", "Android": "Android [VER]", "BlackBerry": [ "BlackBerry[\\w]+\/[VER]", "BlackBerry.*Version\/[VER]", "Version\/[VER]" ], "BREW": "BREW [VER]", "Java": "Java\/[VER]", "Windows Phone OS": [ "Windows Phone OS [VER]", "Windows Phone [VER]" ], "Windows Phone": "Windows Phone [VER]", "Windows CE": "Windows CE\/[VER]", "Windows NT": "Windows NT [VER]", "Symbian": [ "SymbianOS\/[VER]", "Symbian\/[VER]" ], "webOS": [ "webOS\/[VER]", "hpwOS\/[VER];" ] }, "utils": { "Bot": "Googlebot|facebookexternalhit|AdsBot-Google|Google Keyword Suggestion|Facebot|YandexBot|bingbot|ia_archiver|AhrefsBot|Ezooms|GSLFbot|WBSearchBot|Twitterbot|TweetmemeBot|Twikle|PaperLiBot|Wotbox|UnwindFetchor|Exabot|MJ12bot|YandexImages|TurnitinBot|Pingdom", "MobileBot": "Googlebot-Mobile|AdsBot-Google-Mobile|YahooSeeker\/M1A1-R2D2", "DesktopMode": "WPDesktop", "TV": "SonyDTV|HbbTV", "WebKit": "(webkit)[ \/]([\\w.]+)", "Console": "\\b(Nintendo|Nintendo WiiU|Nintendo 3DS|PLAYSTATION|Xbox)\\b", "Watch": "SM-V700" }} : { phones: { iPhone: string; BlackBerry: string; HTC: string; Nexus: string; Dell: string; Motorola: string; Samsung: string; LG: string; Sony: string; Asus: string; NokiaLumia: string; Micromax: string; Palm: string; Vertu: string; Pantech: string; Fly: string; Wiko: string; iMobile: string; SimValley: string; Wolfgang: string; Alcatel: string; Nintendo: string; Amoi: string; INQ: string; GenericPhone: string; }; tablets: { iPad: string; NexusTablet: string; SamsungTablet: string; Kindle: string; SurfaceTablet: string; HPTablet: string; AsusTablet: string; BlackBerryTablet: string; HTCtablet: string; MotorolaTablet: string; NookTablet: string; AcerTablet: string; ToshibaTablet: string; LGTablet: string; FujitsuTablet: string; PrestigioTablet: string; LenovoTablet: string; DellTablet: string; YarvikTablet: string; MedionTablet: string; ArnovaTablet: string; IntensoTablet: string; IRUTablet: string; MegafonTablet: string; EbodaTablet: string; AllViewTablet: string; ArchosTablet: string; AinolTablet: string; NokiaLumiaTablet: string; SonyTablet: string; PhilipsTablet: string; CubeTablet: string; CobyTablet: string; MIDTablet: string; MSITablet: string; SMiTTablet: string; RockChipTablet: string; FlyTablet: string; bqTablet: string; HuaweiTablet: string; NecTablet: string; PantechTablet: string; BronchoTablet: string; VersusTablet: string; ZyncTablet: string; PositivoTablet: string; NabiTablet: string; KoboTablet: string; DanewTablet: string; TexetTablet: string; PlaystationTablet: string; TrekstorTablet: string; PyleAudioTablet: string; AdvanTablet: string; DanyTechTablet: string; GalapadTablet: string; MicromaxTablet: string; KarbonnTablet: string; AllFineTablet: string; PROSCANTablet: string; YONESTablet: string; ChangJiaTablet: string; GUTablet: string; PointOfViewTablet: string; OvermaxTablet: string; HCLTablet: string; DPSTablet: string; VistureTablet: string; CrestaTablet: string; MediatekTablet: string; ConcordeTablet: string; GoCleverTablet: string; ModecomTablet: string; VoninoTablet: string; ECSTablet: string; StorexTablet: string; VodafoneTablet: string; EssentielBTablet: string; RossMoorTablet: string; iMobileTablet: string; TolinoTablet: string; AudioSonicTablet: string; AMPETablet: string; SkkTablet: string; TecnoTablet: string; JXDTablet: string; iJoyTablet: string; FX2Tablet: string; XoroTablet: string; ViewsonicTablet: string; OdysTablet: string; CaptivaTablet: string; IconbitTablet: string; TeclastTablet: string; OndaTablet: string; JaytechTablet: string; BlaupunktTablet: string; DigmaTablet: string; EvolioTablet: string; LavaTablet: string; AocTablet: string; MpmanTablet: string; CelkonTablet: string; WolderTablet: string; MiTablet: string; NibiruTablet: string; NexoTablet: string; LeaderTablet: string; UbislateTablet: string; PocketBookTablet: string; KocasoTablet: string; Hudl: string; TelstraTablet: string; GenericTablet: string; }; oss: { AndroidOS: string; BlackBerryOS: string; PalmOS: string; SymbianOS: string; WindowsMobileOS: string; WindowsPhoneOS: string; iOS: string; MeeGoOS: string; MaemoOS: string; JavaOS: string; webOS: string; badaOS: string; BREWOS: string; }; uas: { Vivaldi: string; Chrome: string; Dolfin: string; Opera: string; Skyfire: string; Edge: string; IE: string; Firefox: string; Bolt: string; TeaShark: string; Blazer: string; Safari: string; Tizen: string; UCBrowser: string; baiduboxapp: string; baidubrowser: string; DiigoBrowser: string; Puffin: string; Mercury: string; ObigoBrowser: string; NetFront: string; GenericBrowser: string; PaleMoon: string; }; props: { Mobile: string; Build: string; Version: string; VendorID: string; iPad: string; iPhone: string; iPod: string; Kindle: string; Chrome: string[]; Coast: string[]; Dolfin: string; Firefox: string; Fennec: string; Edge: string; IE: string[]; NetFront: string; NokiaBrowser: string; Opera: string[]; "Opera Mini": string; "Opera Mobi": string; "UC Browser": string; MQQBrowser: string; MicroMessenger: string; baiduboxapp: string; baidubrowser: string; Iron: string; Safari: string[]; Skyfire: string; Tizen: string; Webkit: string; PaleMoon: string; Gecko: string; Trident: string; Presto: string; Goanna: string; iOS: string; Android: string; BlackBerry: string[]; BREW: string; Java: string; "Windows Phone OS": string[]; "Windows Phone": string; "Windows CE": string; "Windows NT": string; Symbian: string[]; webOS: string[]; }; utils: { Bot: string; MobileBot: string; DesktopMode: string; TV: string; WebKit: string; Console: string; Watch: string; }; } +>impl.mobileDetectRules = { "phones": { "iPhone": "\\biPhone\\b|\\biPod\\b", "BlackBerry": "BlackBerry|\\bBB10\\b|rim[0-9]+", "HTC": "HTC|HTC.*(Sensation|Evo|Vision|Explorer|6800|8100|8900|A7272|S510e|C110e|Legend|Desire|T8282)|APX515CKT|Qtek9090|APA9292KT|HD_mini|Sensation.*Z710e|PG86100|Z715e|Desire.*(A8181|HD)|ADR6200|ADR6400L|ADR6425|001HT|Inspire 4G|Android.*\\bEVO\\b|T-Mobile G1|Z520m", "Nexus": "Nexus One|Nexus S|Galaxy.*Nexus|Android.*Nexus.*Mobile|Nexus 4|Nexus 5|Nexus 6", "Dell": "Dell.*Streak|Dell.*Aero|Dell.*Venue|DELL.*Venue Pro|Dell Flash|Dell Smoke|Dell Mini 3iX|XCD28|XCD35|\\b001DL\\b|\\b101DL\\b|\\bGS01\\b", "Motorola": "Motorola|DROIDX|DROID BIONIC|\\bDroid\\b.*Build|Android.*Xoom|HRI39|MOT-|A1260|A1680|A555|A853|A855|A953|A955|A956|Motorola.*ELECTRIFY|Motorola.*i1|i867|i940|MB200|MB300|MB501|MB502|MB508|MB511|MB520|MB525|MB526|MB611|MB612|MB632|MB810|MB855|MB860|MB861|MB865|MB870|ME501|ME502|ME511|ME525|ME600|ME632|ME722|ME811|ME860|ME863|ME865|MT620|MT710|MT716|MT720|MT810|MT870|MT917|Motorola.*TITANIUM|WX435|WX445|XT300|XT301|XT311|XT316|XT317|XT319|XT320|XT390|XT502|XT530|XT531|XT532|XT535|XT603|XT610|XT611|XT615|XT681|XT701|XT702|XT711|XT720|XT800|XT806|XT860|XT862|XT875|XT882|XT883|XT894|XT901|XT907|XT909|XT910|XT912|XT928|XT926|XT915|XT919|XT925|XT1021|\\bMoto E\\b", "Samsung": "Samsung|SM-G9250|GT-19300|SGH-I337|BGT-S5230|GT-B2100|GT-B2700|GT-B2710|GT-B3210|GT-B3310|GT-B3410|GT-B3730|GT-B3740|GT-B5510|GT-B5512|GT-B5722|GT-B6520|GT-B7300|GT-B7320|GT-B7330|GT-B7350|GT-B7510|GT-B7722|GT-B7800|GT-C3010|GT-C3011|GT-C3060|GT-C3200|GT-C3212|GT-C3212I|GT-C3262|GT-C3222|GT-C3300|GT-C3300K|GT-C3303|GT-C3303K|GT-C3310|GT-C3322|GT-C3330|GT-C3350|GT-C3500|GT-C3510|GT-C3530|GT-C3630|GT-C3780|GT-C5010|GT-C5212|GT-C6620|GT-C6625|GT-C6712|GT-E1050|GT-E1070|GT-E1075|GT-E1080|GT-E1081|GT-E1085|GT-E1087|GT-E1100|GT-E1107|GT-E1110|GT-E1120|GT-E1125|GT-E1130|GT-E1160|GT-E1170|GT-E1175|GT-E1180|GT-E1182|GT-E1200|GT-E1210|GT-E1225|GT-E1230|GT-E1390|GT-E2100|GT-E2120|GT-E2121|GT-E2152|GT-E2220|GT-E2222|GT-E2230|GT-E2232|GT-E2250|GT-E2370|GT-E2550|GT-E2652|GT-E3210|GT-E3213|GT-I5500|GT-I5503|GT-I5700|GT-I5800|GT-I5801|GT-I6410|GT-I6420|GT-I7110|GT-I7410|GT-I7500|GT-I8000|GT-I8150|GT-I8160|GT-I8190|GT-I8320|GT-I8330|GT-I8350|GT-I8530|GT-I8700|GT-I8703|GT-I8910|GT-I9000|GT-I9001|GT-I9003|GT-I9010|GT-I9020|GT-I9023|GT-I9070|GT-I9082|GT-I9100|GT-I9103|GT-I9220|GT-I9250|GT-I9300|GT-I9305|GT-I9500|GT-I9505|GT-M3510|GT-M5650|GT-M7500|GT-M7600|GT-M7603|GT-M8800|GT-M8910|GT-N7000|GT-S3110|GT-S3310|GT-S3350|GT-S3353|GT-S3370|GT-S3650|GT-S3653|GT-S3770|GT-S3850|GT-S5210|GT-S5220|GT-S5229|GT-S5230|GT-S5233|GT-S5250|GT-S5253|GT-S5260|GT-S5263|GT-S5270|GT-S5300|GT-S5330|GT-S5350|GT-S5360|GT-S5363|GT-S5369|GT-S5380|GT-S5380D|GT-S5560|GT-S5570|GT-S5600|GT-S5603|GT-S5610|GT-S5620|GT-S5660|GT-S5670|GT-S5690|GT-S5750|GT-S5780|GT-S5830|GT-S5839|GT-S6102|GT-S6500|GT-S7070|GT-S7200|GT-S7220|GT-S7230|GT-S7233|GT-S7250|GT-S7500|GT-S7530|GT-S7550|GT-S7562|GT-S7710|GT-S8000|GT-S8003|GT-S8500|GT-S8530|GT-S8600|SCH-A310|SCH-A530|SCH-A570|SCH-A610|SCH-A630|SCH-A650|SCH-A790|SCH-A795|SCH-A850|SCH-A870|SCH-A890|SCH-A930|SCH-A950|SCH-A970|SCH-A990|SCH-I100|SCH-I110|SCH-I400|SCH-I405|SCH-I500|SCH-I510|SCH-I515|SCH-I600|SCH-I730|SCH-I760|SCH-I770|SCH-I830|SCH-I910|SCH-I920|SCH-I959|SCH-LC11|SCH-N150|SCH-N300|SCH-R100|SCH-R300|SCH-R351|SCH-R400|SCH-R410|SCH-T300|SCH-U310|SCH-U320|SCH-U350|SCH-U360|SCH-U365|SCH-U370|SCH-U380|SCH-U410|SCH-U430|SCH-U450|SCH-U460|SCH-U470|SCH-U490|SCH-U540|SCH-U550|SCH-U620|SCH-U640|SCH-U650|SCH-U660|SCH-U700|SCH-U740|SCH-U750|SCH-U810|SCH-U820|SCH-U900|SCH-U940|SCH-U960|SCS-26UC|SGH-A107|SGH-A117|SGH-A127|SGH-A137|SGH-A157|SGH-A167|SGH-A177|SGH-A187|SGH-A197|SGH-A227|SGH-A237|SGH-A257|SGH-A437|SGH-A517|SGH-A597|SGH-A637|SGH-A657|SGH-A667|SGH-A687|SGH-A697|SGH-A707|SGH-A717|SGH-A727|SGH-A737|SGH-A747|SGH-A767|SGH-A777|SGH-A797|SGH-A817|SGH-A827|SGH-A837|SGH-A847|SGH-A867|SGH-A877|SGH-A887|SGH-A897|SGH-A927|SGH-B100|SGH-B130|SGH-B200|SGH-B220|SGH-C100|SGH-C110|SGH-C120|SGH-C130|SGH-C140|SGH-C160|SGH-C170|SGH-C180|SGH-C200|SGH-C207|SGH-C210|SGH-C225|SGH-C230|SGH-C417|SGH-C450|SGH-D307|SGH-D347|SGH-D357|SGH-D407|SGH-D415|SGH-D780|SGH-D807|SGH-D980|SGH-E105|SGH-E200|SGH-E315|SGH-E316|SGH-E317|SGH-E335|SGH-E590|SGH-E635|SGH-E715|SGH-E890|SGH-F300|SGH-F480|SGH-I200|SGH-I300|SGH-I320|SGH-I550|SGH-I577|SGH-I600|SGH-I607|SGH-I617|SGH-I627|SGH-I637|SGH-I677|SGH-I700|SGH-I717|SGH-I727|SGH-i747M|SGH-I777|SGH-I780|SGH-I827|SGH-I847|SGH-I857|SGH-I896|SGH-I897|SGH-I900|SGH-I907|SGH-I917|SGH-I927|SGH-I937|SGH-I997|SGH-J150|SGH-J200|SGH-L170|SGH-L700|SGH-M110|SGH-M150|SGH-M200|SGH-N105|SGH-N500|SGH-N600|SGH-N620|SGH-N625|SGH-N700|SGH-N710|SGH-P107|SGH-P207|SGH-P300|SGH-P310|SGH-P520|SGH-P735|SGH-P777|SGH-Q105|SGH-R210|SGH-R220|SGH-R225|SGH-S105|SGH-S307|SGH-T109|SGH-T119|SGH-T139|SGH-T209|SGH-T219|SGH-T229|SGH-T239|SGH-T249|SGH-T259|SGH-T309|SGH-T319|SGH-T329|SGH-T339|SGH-T349|SGH-T359|SGH-T369|SGH-T379|SGH-T409|SGH-T429|SGH-T439|SGH-T459|SGH-T469|SGH-T479|SGH-T499|SGH-T509|SGH-T519|SGH-T539|SGH-T559|SGH-T589|SGH-T609|SGH-T619|SGH-T629|SGH-T639|SGH-T659|SGH-T669|SGH-T679|SGH-T709|SGH-T719|SGH-T729|SGH-T739|SGH-T746|SGH-T749|SGH-T759|SGH-T769|SGH-T809|SGH-T819|SGH-T839|SGH-T919|SGH-T929|SGH-T939|SGH-T959|SGH-T989|SGH-U100|SGH-U200|SGH-U800|SGH-V205|SGH-V206|SGH-X100|SGH-X105|SGH-X120|SGH-X140|SGH-X426|SGH-X427|SGH-X475|SGH-X495|SGH-X497|SGH-X507|SGH-X600|SGH-X610|SGH-X620|SGH-X630|SGH-X700|SGH-X820|SGH-X890|SGH-Z130|SGH-Z150|SGH-Z170|SGH-ZX10|SGH-ZX20|SHW-M110|SPH-A120|SPH-A400|SPH-A420|SPH-A460|SPH-A500|SPH-A560|SPH-A600|SPH-A620|SPH-A660|SPH-A700|SPH-A740|SPH-A760|SPH-A790|SPH-A800|SPH-A820|SPH-A840|SPH-A880|SPH-A900|SPH-A940|SPH-A960|SPH-D600|SPH-D700|SPH-D710|SPH-D720|SPH-I300|SPH-I325|SPH-I330|SPH-I350|SPH-I500|SPH-I600|SPH-I700|SPH-L700|SPH-M100|SPH-M220|SPH-M240|SPH-M300|SPH-M305|SPH-M320|SPH-M330|SPH-M350|SPH-M360|SPH-M370|SPH-M380|SPH-M510|SPH-M540|SPH-M550|SPH-M560|SPH-M570|SPH-M580|SPH-M610|SPH-M620|SPH-M630|SPH-M800|SPH-M810|SPH-M850|SPH-M900|SPH-M910|SPH-M920|SPH-M930|SPH-N100|SPH-N200|SPH-N240|SPH-N300|SPH-N400|SPH-Z400|SWC-E100|SCH-i909|GT-N7100|GT-N7105|SCH-I535|SM-N900A|SGH-I317|SGH-T999L|GT-S5360B|GT-I8262|GT-S6802|GT-S6312|GT-S6310|GT-S5312|GT-S5310|GT-I9105|GT-I8510|GT-S6790N|SM-G7105|SM-N9005|GT-S5301|GT-I9295|GT-I9195|SM-C101|GT-S7392|GT-S7560|GT-B7610|GT-I5510|GT-S7582|GT-S7530E|GT-I8750|SM-G9006V|SM-G9008V|SM-G9009D|SM-G900A|SM-G900D|SM-G900F|SM-G900H|SM-G900I|SM-G900J|SM-G900K|SM-G900L|SM-G900M|SM-G900P|SM-G900R4|SM-G900S|SM-G900T|SM-G900V|SM-G900W8|SHV-E160K|SCH-P709|SCH-P729|SM-T2558|GT-I9205|SM-G9350|SM-J120F", "LG": "\\bLG\\b;|LG[- ]?(C800|C900|E400|E610|E900|E-900|F160|F180K|F180L|F180S|730|855|L160|LS740|LS840|LS970|LU6200|MS690|MS695|MS770|MS840|MS870|MS910|P500|P700|P705|VM696|AS680|AS695|AX840|C729|E970|GS505|272|C395|E739BK|E960|L55C|L75C|LS696|LS860|P769BK|P350|P500|P509|P870|UN272|US730|VS840|VS950|LN272|LN510|LS670|LS855|LW690|MN270|MN510|P509|P769|P930|UN200|UN270|UN510|UN610|US670|US740|US760|UX265|UX840|VN271|VN530|VS660|VS700|VS740|VS750|VS910|VS920|VS930|VX9200|VX11000|AX840A|LW770|P506|P925|P999|E612|D955|D802|MS323)", "Sony": "SonyST|SonyLT|SonyEricsson|SonyEricssonLT15iv|LT18i|E10i|LT28h|LT26w|SonyEricssonMT27i|C5303|C6902|C6903|C6906|C6943|D2533", "Asus": "Asus.*Galaxy|PadFone.*Mobile", "NokiaLumia": "Lumia [0-9]{3,4}", "Micromax": "Micromax.*\\b(A210|A92|A88|A72|A111|A110Q|A115|A116|A110|A90S|A26|A51|A35|A54|A25|A27|A89|A68|A65|A57|A90)\\b", "Palm": "PalmSource|Palm", "Vertu": "Vertu|Vertu.*Ltd|Vertu.*Ascent|Vertu.*Ayxta|Vertu.*Constellation(F|Quest)?|Vertu.*Monika|Vertu.*Signature", "Pantech": "PANTECH|IM-A850S|IM-A840S|IM-A830L|IM-A830K|IM-A830S|IM-A820L|IM-A810K|IM-A810S|IM-A800S|IM-T100K|IM-A725L|IM-A780L|IM-A775C|IM-A770K|IM-A760S|IM-A750K|IM-A740S|IM-A730S|IM-A720L|IM-A710K|IM-A690L|IM-A690S|IM-A650S|IM-A630K|IM-A600S|VEGA PTL21|PT003|P8010|ADR910L|P6030|P6020|P9070|P4100|P9060|P5000|CDM8992|TXT8045|ADR8995|IS11PT|P2030|P6010|P8000|PT002|IS06|CDM8999|P9050|PT001|TXT8040|P2020|P9020|P2000|P7040|P7000|C790", "Fly": "IQ230|IQ444|IQ450|IQ440|IQ442|IQ441|IQ245|IQ256|IQ236|IQ255|IQ235|IQ245|IQ275|IQ240|IQ285|IQ280|IQ270|IQ260|IQ250", "Wiko": "KITE 4G|HIGHWAY|GETAWAY|STAIRWAY|DARKSIDE|DARKFULL|DARKNIGHT|DARKMOON|SLIDE|WAX 4G|RAINBOW|BLOOM|SUNSET|GOA(?!nna)|LENNY|BARRY|IGGY|OZZY|CINK FIVE|CINK PEAX|CINK PEAX 2|CINK SLIM|CINK SLIM 2|CINK +|CINK KING|CINK PEAX|CINK SLIM|SUBLIM", "iMobile": "i-mobile (IQ|i-STYLE|idea|ZAA|Hitz)", "SimValley": "\\b(SP-80|XT-930|SX-340|XT-930|SX-310|SP-360|SP60|SPT-800|SP-120|SPT-800|SP-140|SPX-5|SPX-8|SP-100|SPX-8|SPX-12)\\b", "Wolfgang": "AT-B24D|AT-AS50HD|AT-AS40W|AT-AS55HD|AT-AS45q2|AT-B26D|AT-AS50Q", "Alcatel": "Alcatel", "Nintendo": "Nintendo 3DS", "Amoi": "Amoi", "INQ": "INQ", "GenericPhone": "Tapatalk|PDA;|SAGEM|\\bmmp\\b|pocket|\\bpsp\\b|symbian|Smartphone|smartfon|treo|up.browser|up.link|vodafone|\\bwap\\b|nokia|Series40|Series60|S60|SonyEricsson|N900|MAUI.*WAP.*Browser" }, "tablets": { "iPad": "iPad|iPad.*Mobile", "NexusTablet": "Android.*Nexus[\\s]+(7|9|10)", "SamsungTablet": "SAMSUNG.*Tablet|Galaxy.*Tab|SC-01C|GT-P1000|GT-P1003|GT-P1010|GT-P3105|GT-P6210|GT-P6800|GT-P6810|GT-P7100|GT-P7300|GT-P7310|GT-P7500|GT-P7510|SCH-I800|SCH-I815|SCH-I905|SGH-I957|SGH-I987|SGH-T849|SGH-T859|SGH-T869|SPH-P100|GT-P3100|GT-P3108|GT-P3110|GT-P5100|GT-P5110|GT-P6200|GT-P7320|GT-P7511|GT-N8000|GT-P8510|SGH-I497|SPH-P500|SGH-T779|SCH-I705|SCH-I915|GT-N8013|GT-P3113|GT-P5113|GT-P8110|GT-N8010|GT-N8005|GT-N8020|GT-P1013|GT-P6201|GT-P7501|GT-N5100|GT-N5105|GT-N5110|SHV-E140K|SHV-E140L|SHV-E140S|SHV-E150S|SHV-E230K|SHV-E230L|SHV-E230S|SHW-M180K|SHW-M180L|SHW-M180S|SHW-M180W|SHW-M300W|SHW-M305W|SHW-M380K|SHW-M380S|SHW-M380W|SHW-M430W|SHW-M480K|SHW-M480S|SHW-M480W|SHW-M485W|SHW-M486W|SHW-M500W|GT-I9228|SCH-P739|SCH-I925|GT-I9200|GT-P5200|GT-P5210|GT-P5210X|SM-T311|SM-T310|SM-T310X|SM-T210|SM-T210R|SM-T211|SM-P600|SM-P601|SM-P605|SM-P900|SM-P901|SM-T217|SM-T217A|SM-T217S|SM-P6000|SM-T3100|SGH-I467|XE500|SM-T110|GT-P5220|GT-I9200X|GT-N5110X|GT-N5120|SM-P905|SM-T111|SM-T2105|SM-T315|SM-T320|SM-T320X|SM-T321|SM-T520|SM-T525|SM-T530NU|SM-T230NU|SM-T330NU|SM-T900|XE500T1C|SM-P605V|SM-P905V|SM-T337V|SM-T537V|SM-T707V|SM-T807V|SM-P600X|SM-P900X|SM-T210X|SM-T230|SM-T230X|SM-T325|GT-P7503|SM-T531|SM-T330|SM-T530|SM-T705|SM-T705C|SM-T535|SM-T331|SM-T800|SM-T700|SM-T537|SM-T807|SM-P907A|SM-T337A|SM-T537A|SM-T707A|SM-T807A|SM-T237|SM-T807P|SM-P607T|SM-T217T|SM-T337T|SM-T807T|SM-T116NQ|SM-P550|SM-T350|SM-T550|SM-T9000|SM-P9000|SM-T705Y|SM-T805|GT-P3113|SM-T710|SM-T810|SM-T815|SM-T360|SM-T533|SM-T113|SM-T335|SM-T715|SM-T560|SM-T670|SM-T677|SM-T377|SM-T567|SM-T357T|SM-T555|SM-T561", "Kindle": "Kindle|Silk.*Accelerated|Android.*\\b(KFOT|KFTT|KFJWI|KFJWA|KFOTE|KFSOWI|KFTHWI|KFTHWA|KFAPWI|KFAPWA|WFJWAE|KFSAWA|KFSAWI|KFASWI|KFARWI)\\b", "SurfaceTablet": "Windows NT [0-9.]+; ARM;.*(Tablet|ARMBJS)", "HPTablet": "HP Slate (7|8|10)|HP ElitePad 900|hp-tablet|EliteBook.*Touch|HP 8|Slate 21|HP SlateBook 10", "AsusTablet": "^.*PadFone((?!Mobile).)*$|Transformer|TF101|TF101G|TF300T|TF300TG|TF300TL|TF700T|TF700KL|TF701T|TF810C|ME171|ME301T|ME302C|ME371MG|ME370T|ME372MG|ME172V|ME173X|ME400C|Slider SL101|\\bK00F\\b|\\bK00C\\b|\\bK00E\\b|\\bK00L\\b|TX201LA|ME176C|ME102A|\\bM80TA\\b|ME372CL|ME560CG|ME372CG|ME302KL| K010 | K017 |ME572C|ME103K|ME170C|ME171C|\\bME70C\\b|ME581C|ME581CL|ME8510C|ME181C|P01Y|PO1MA", "BlackBerryTablet": "PlayBook|RIM Tablet", "HTCtablet": "HTC_Flyer_P512|HTC Flyer|HTC Jetstream|HTC-P715a|HTC EVO View 4G|PG41200|PG09410", "MotorolaTablet": "xoom|sholest|MZ615|MZ605|MZ505|MZ601|MZ602|MZ603|MZ604|MZ606|MZ607|MZ608|MZ609|MZ615|MZ616|MZ617", "NookTablet": "Android.*Nook|NookColor|nook browser|BNRV200|BNRV200A|BNTV250|BNTV250A|BNTV400|BNTV600|LogicPD Zoom2", "AcerTablet": "Android.*; \\b(A100|A101|A110|A200|A210|A211|A500|A501|A510|A511|A700|A701|W500|W500P|W501|W501P|W510|W511|W700|G100|G100W|B1-A71|B1-710|B1-711|A1-810|A1-811|A1-830)\\b|W3-810|\\bA3-A10\\b|\\bA3-A11\\b|\\bA3-A20", "ToshibaTablet": "Android.*(AT100|AT105|AT200|AT205|AT270|AT275|AT300|AT305|AT1S5|AT500|AT570|AT700|AT830)|TOSHIBA.*FOLIO", "LGTablet": "\\bL-06C|LG-V909|LG-V900|LG-V700|LG-V510|LG-V500|LG-V410|LG-V400|LG-VK810\\b", "FujitsuTablet": "Android.*\\b(F-01D|F-02F|F-05E|F-10D|M532|Q572)\\b", "PrestigioTablet": "PMP3170B|PMP3270B|PMP3470B|PMP7170B|PMP3370B|PMP3570C|PMP5870C|PMP3670B|PMP5570C|PMP5770D|PMP3970B|PMP3870C|PMP5580C|PMP5880D|PMP5780D|PMP5588C|PMP7280C|PMP7280C3G|PMP7280|PMP7880D|PMP5597D|PMP5597|PMP7100D|PER3464|PER3274|PER3574|PER3884|PER5274|PER5474|PMP5097CPRO|PMP5097|PMP7380D|PMP5297C|PMP5297C_QUAD|PMP812E|PMP812E3G|PMP812F|PMP810E|PMP880TD|PMT3017|PMT3037|PMT3047|PMT3057|PMT7008|PMT5887|PMT5001|PMT5002", "LenovoTablet": "Lenovo TAB|Idea(Tab|Pad)( A1|A10| K1|)|ThinkPad([ ]+)?Tablet|YT3-X90L|YT3-X90F|YT3-X90X|Lenovo.*(S2109|S2110|S5000|S6000|K3011|A3000|A3500|A1000|A2107|A2109|A1107|A5500|A7600|B6000|B8000|B8080)(-|)(FL|F|HV|H|)", "DellTablet": "Venue 11|Venue 8|Venue 7|Dell Streak 10|Dell Streak 7", "YarvikTablet": "Android.*\\b(TAB210|TAB211|TAB224|TAB250|TAB260|TAB264|TAB310|TAB360|TAB364|TAB410|TAB411|TAB420|TAB424|TAB450|TAB460|TAB461|TAB464|TAB465|TAB467|TAB468|TAB07-100|TAB07-101|TAB07-150|TAB07-151|TAB07-152|TAB07-200|TAB07-201-3G|TAB07-210|TAB07-211|TAB07-212|TAB07-214|TAB07-220|TAB07-400|TAB07-485|TAB08-150|TAB08-200|TAB08-201-3G|TAB08-201-30|TAB09-100|TAB09-211|TAB09-410|TAB10-150|TAB10-201|TAB10-211|TAB10-400|TAB10-410|TAB13-201|TAB274EUK|TAB275EUK|TAB374EUK|TAB462EUK|TAB474EUK|TAB9-200)\\b", "MedionTablet": "Android.*\\bOYO\\b|LIFE.*(P9212|P9514|P9516|S9512)|LIFETAB", "ArnovaTablet": "AN10G2|AN7bG3|AN7fG3|AN8G3|AN8cG3|AN7G3|AN9G3|AN7dG3|AN7dG3ST|AN7dG3ChildPad|AN10bG3|AN10bG3DT|AN9G2", "IntensoTablet": "INM8002KP|INM1010FP|INM805ND|Intenso Tab|TAB1004", "IRUTablet": "M702pro", "MegafonTablet": "MegaFon V9|\\bZTE V9\\b|Android.*\\bMT7A\\b", "EbodaTablet": "E-Boda (Supreme|Impresspeed|Izzycomm|Essential)", "AllViewTablet": "Allview.*(Viva|Alldro|City|Speed|All TV|Frenzy|Quasar|Shine|TX1|AX1|AX2)", "ArchosTablet": "\\b(101G9|80G9|A101IT)\\b|Qilive 97R|Archos5|\\bARCHOS (70|79|80|90|97|101|FAMILYPAD|)(b|)(G10| Cobalt| TITANIUM(HD|)| Xenon| Neon|XSK| 2| XS 2| PLATINUM| CARBON|GAMEPAD)\\b", "AinolTablet": "NOVO7|NOVO8|NOVO10|Novo7Aurora|Novo7Basic|NOVO7PALADIN|novo9-Spark", "NokiaLumiaTablet": "Lumia 2520", "SonyTablet": "Sony.*Tablet|Xperia Tablet|Sony Tablet S|SO-03E|SGPT12|SGPT13|SGPT114|SGPT121|SGPT122|SGPT123|SGPT111|SGPT112|SGPT113|SGPT131|SGPT132|SGPT133|SGPT211|SGPT212|SGPT213|SGP311|SGP312|SGP321|EBRD1101|EBRD1102|EBRD1201|SGP351|SGP341|SGP511|SGP512|SGP521|SGP541|SGP551|SGP621|SGP612|SOT31", "PhilipsTablet": "\\b(PI2010|PI3000|PI3100|PI3105|PI3110|PI3205|PI3210|PI3900|PI4010|PI7000|PI7100)\\b", "CubeTablet": "Android.*(K8GT|U9GT|U10GT|U16GT|U17GT|U18GT|U19GT|U20GT|U23GT|U30GT)|CUBE U8GT", "CobyTablet": "MID1042|MID1045|MID1125|MID1126|MID7012|MID7014|MID7015|MID7034|MID7035|MID7036|MID7042|MID7048|MID7127|MID8042|MID8048|MID8127|MID9042|MID9740|MID9742|MID7022|MID7010", "MIDTablet": "M9701|M9000|M9100|M806|M1052|M806|T703|MID701|MID713|MID710|MID727|MID760|MID830|MID728|MID933|MID125|MID810|MID732|MID120|MID930|MID800|MID731|MID900|MID100|MID820|MID735|MID980|MID130|MID833|MID737|MID960|MID135|MID860|MID736|MID140|MID930|MID835|MID733|MID4X10", "MSITablet": "MSI \\b(Primo 73K|Primo 73L|Primo 81L|Primo 77|Primo 93|Primo 75|Primo 76|Primo 73|Primo 81|Primo 91|Primo 90|Enjoy 71|Enjoy 7|Enjoy 10)\\b", "SMiTTablet": "Android.*(\\bMID\\b|MID-560|MTV-T1200|MTV-PND531|MTV-P1101|MTV-PND530)", "RockChipTablet": "Android.*(RK2818|RK2808A|RK2918|RK3066)|RK2738|RK2808A", "FlyTablet": "IQ310|Fly Vision", "bqTablet": "Android.*(bq)?.*(Elcano|Curie|Edison|Maxwell|Kepler|Pascal|Tesla|Hypatia|Platon|Newton|Livingstone|Cervantes|Avant|Aquaris E10)|Maxwell.*Lite|Maxwell.*Plus", "HuaweiTablet": "MediaPad|MediaPad 7 Youth|IDEOS S7|S7-201c|S7-202u|S7-101|S7-103|S7-104|S7-105|S7-106|S7-201|S7-Slim", "NecTablet": "\\bN-06D|\\bN-08D", "PantechTablet": "Pantech.*P4100", "BronchoTablet": "Broncho.*(N701|N708|N802|a710)", "VersusTablet": "TOUCHPAD.*[78910]|\\bTOUCHTAB\\b", "ZyncTablet": "z1000|Z99 2G|z99|z930|z999|z990|z909|Z919|z900", "PositivoTablet": "TB07STA|TB10STA|TB07FTA|TB10FTA", "NabiTablet": "Android.*\\bNabi", "KoboTablet": "Kobo Touch|\\bK080\\b|\\bVox\\b Build|\\bArc\\b Build", "DanewTablet": "DSlide.*\\b(700|701R|702|703R|704|802|970|971|972|973|974|1010|1012)\\b", "TexetTablet": "NaviPad|TB-772A|TM-7045|TM-7055|TM-9750|TM-7016|TM-7024|TM-7026|TM-7041|TM-7043|TM-7047|TM-8041|TM-9741|TM-9747|TM-9748|TM-9751|TM-7022|TM-7021|TM-7020|TM-7011|TM-7010|TM-7023|TM-7025|TM-7037W|TM-7038W|TM-7027W|TM-9720|TM-9725|TM-9737W|TM-1020|TM-9738W|TM-9740|TM-9743W|TB-807A|TB-771A|TB-727A|TB-725A|TB-719A|TB-823A|TB-805A|TB-723A|TB-715A|TB-707A|TB-705A|TB-709A|TB-711A|TB-890HD|TB-880HD|TB-790HD|TB-780HD|TB-770HD|TB-721HD|TB-710HD|TB-434HD|TB-860HD|TB-840HD|TB-760HD|TB-750HD|TB-740HD|TB-730HD|TB-722HD|TB-720HD|TB-700HD|TB-500HD|TB-470HD|TB-431HD|TB-430HD|TB-506|TB-504|TB-446|TB-436|TB-416|TB-146SE|TB-126SE", "PlaystationTablet": "Playstation.*(Portable|Vita)", "TrekstorTablet": "ST10416-1|VT10416-1|ST70408-1|ST702xx-1|ST702xx-2|ST80208|ST97216|ST70104-2|VT10416-2|ST10216-2A|SurfTab", "PyleAudioTablet": "\\b(PTBL10CEU|PTBL10C|PTBL72BC|PTBL72BCEU|PTBL7CEU|PTBL7C|PTBL92BC|PTBL92BCEU|PTBL9CEU|PTBL9CUK|PTBL9C)\\b", "AdvanTablet": "Android.* \\b(E3A|T3X|T5C|T5B|T3E|T3C|T3B|T1J|T1F|T2A|T1H|T1i|E1C|T1-E|T5-A|T4|E1-B|T2Ci|T1-B|T1-D|O1-A|E1-A|T1-A|T3A|T4i)\\b ", "DanyTechTablet": "Genius Tab G3|Genius Tab S2|Genius Tab Q3|Genius Tab G4|Genius Tab Q4|Genius Tab G-II|Genius TAB GII|Genius TAB GIII|Genius Tab S1", "GalapadTablet": "Android.*\\bG1\\b", "MicromaxTablet": "Funbook|Micromax.*\\b(P250|P560|P360|P362|P600|P300|P350|P500|P275)\\b", "KarbonnTablet": "Android.*\\b(A39|A37|A34|ST8|ST10|ST7|Smart Tab3|Smart Tab2)\\b", "AllFineTablet": "Fine7 Genius|Fine7 Shine|Fine7 Air|Fine8 Style|Fine9 More|Fine10 Joy|Fine11 Wide", "PROSCANTablet": "\\b(PEM63|PLT1023G|PLT1041|PLT1044|PLT1044G|PLT1091|PLT4311|PLT4311PL|PLT4315|PLT7030|PLT7033|PLT7033D|PLT7035|PLT7035D|PLT7044K|PLT7045K|PLT7045KB|PLT7071KG|PLT7072|PLT7223G|PLT7225G|PLT7777G|PLT7810K|PLT7849G|PLT7851G|PLT7852G|PLT8015|PLT8031|PLT8034|PLT8036|PLT8080K|PLT8082|PLT8088|PLT8223G|PLT8234G|PLT8235G|PLT8816K|PLT9011|PLT9045K|PLT9233G|PLT9735|PLT9760G|PLT9770G)\\b", "YONESTablet": "BQ1078|BC1003|BC1077|RK9702|BC9730|BC9001|IT9001|BC7008|BC7010|BC708|BC728|BC7012|BC7030|BC7027|BC7026", "ChangJiaTablet": "TPC7102|TPC7103|TPC7105|TPC7106|TPC7107|TPC7201|TPC7203|TPC7205|TPC7210|TPC7708|TPC7709|TPC7712|TPC7110|TPC8101|TPC8103|TPC8105|TPC8106|TPC8203|TPC8205|TPC8503|TPC9106|TPC9701|TPC97101|TPC97103|TPC97105|TPC97106|TPC97111|TPC97113|TPC97203|TPC97603|TPC97809|TPC97205|TPC10101|TPC10103|TPC10106|TPC10111|TPC10203|TPC10205|TPC10503", "GUTablet": "TX-A1301|TX-M9002|Q702|kf026", "PointOfViewTablet": "TAB-P506|TAB-navi-7-3G-M|TAB-P517|TAB-P-527|TAB-P701|TAB-P703|TAB-P721|TAB-P731N|TAB-P741|TAB-P825|TAB-P905|TAB-P925|TAB-PR945|TAB-PL1015|TAB-P1025|TAB-PI1045|TAB-P1325|TAB-PROTAB[0-9]+|TAB-PROTAB25|TAB-PROTAB26|TAB-PROTAB27|TAB-PROTAB26XL|TAB-PROTAB2-IPS9|TAB-PROTAB30-IPS9|TAB-PROTAB25XXL|TAB-PROTAB26-IPS10|TAB-PROTAB30-IPS10", "OvermaxTablet": "OV-(SteelCore|NewBase|Basecore|Baseone|Exellen|Quattor|EduTab|Solution|ACTION|BasicTab|TeddyTab|MagicTab|Stream|TB-08|TB-09)", "HCLTablet": "HCL.*Tablet|Connect-3G-2.0|Connect-2G-2.0|ME Tablet U1|ME Tablet U2|ME Tablet G1|ME Tablet X1|ME Tablet Y2|ME Tablet Sync", "DPSTablet": "DPS Dream 9|DPS Dual 7", "VistureTablet": "V97 HD|i75 3G|Visture V4( HD)?|Visture V5( HD)?|Visture V10", "CrestaTablet": "CTP(-)?810|CTP(-)?818|CTP(-)?828|CTP(-)?838|CTP(-)?888|CTP(-)?978|CTP(-)?980|CTP(-)?987|CTP(-)?988|CTP(-)?989", "MediatekTablet": "\\bMT8125|MT8389|MT8135|MT8377\\b", "ConcordeTablet": "Concorde([ ]+)?Tab|ConCorde ReadMan", "GoCleverTablet": "GOCLEVER TAB|A7GOCLEVER|M1042|M7841|M742|R1042BK|R1041|TAB A975|TAB A7842|TAB A741|TAB A741L|TAB M723G|TAB M721|TAB A1021|TAB I921|TAB R721|TAB I720|TAB T76|TAB R70|TAB R76.2|TAB R106|TAB R83.2|TAB M813G|TAB I721|GCTA722|TAB I70|TAB I71|TAB S73|TAB R73|TAB R74|TAB R93|TAB R75|TAB R76.1|TAB A73|TAB A93|TAB A93.2|TAB T72|TAB R83|TAB R974|TAB R973|TAB A101|TAB A103|TAB A104|TAB A104.2|R105BK|M713G|A972BK|TAB A971|TAB R974.2|TAB R104|TAB R83.3|TAB A1042", "ModecomTablet": "FreeTAB 9000|FreeTAB 7.4|FreeTAB 7004|FreeTAB 7800|FreeTAB 2096|FreeTAB 7.5|FreeTAB 1014|FreeTAB 1001 |FreeTAB 8001|FreeTAB 9706|FreeTAB 9702|FreeTAB 7003|FreeTAB 7002|FreeTAB 1002|FreeTAB 7801|FreeTAB 1331|FreeTAB 1004|FreeTAB 8002|FreeTAB 8014|FreeTAB 9704|FreeTAB 1003", "VoninoTablet": "\\b(Argus[ _]?S|Diamond[ _]?79HD|Emerald[ _]?78E|Luna[ _]?70C|Onyx[ _]?S|Onyx[ _]?Z|Orin[ _]?HD|Orin[ _]?S|Otis[ _]?S|SpeedStar[ _]?S|Magnet[ _]?M9|Primus[ _]?94[ _]?3G|Primus[ _]?94HD|Primus[ _]?QS|Android.*\\bQ8\\b|Sirius[ _]?EVO[ _]?QS|Sirius[ _]?QS|Spirit[ _]?S)\\b", "ECSTablet": "V07OT2|TM105A|S10OT1|TR10CS1", "StorexTablet": "eZee[_']?(Tab|Go)[0-9]+|TabLC7|Looney Tunes Tab", "VodafoneTablet": "SmartTab([ ]+)?[0-9]+|SmartTabII10|SmartTabII7|VF-1497", "EssentielBTablet": "Smart[ ']?TAB[ ]+?[0-9]+|Family[ ']?TAB2", "RossMoorTablet": "RM-790|RM-997|RMD-878G|RMD-974R|RMT-705A|RMT-701|RME-601|RMT-501|RMT-711", "iMobileTablet": "i-mobile i-note", "TolinoTablet": "tolino tab [0-9.]+|tolino shine", "AudioSonicTablet": "\\bC-22Q|T7-QC|T-17B|T-17P\\b", "AMPETablet": "Android.* A78 ", "SkkTablet": "Android.* (SKYPAD|PHOENIX|CYCLOPS)", "TecnoTablet": "TECNO P9", "JXDTablet": "Android.* \\b(F3000|A3300|JXD5000|JXD3000|JXD2000|JXD300B|JXD300|S5800|S7800|S602b|S5110b|S7300|S5300|S602|S603|S5100|S5110|S601|S7100a|P3000F|P3000s|P101|P200s|P1000m|P200m|P9100|P1000s|S6600b|S908|P1000|P300|S18|S6600|S9100)\\b", "iJoyTablet": "Tablet (Spirit 7|Essentia|Galatea|Fusion|Onix 7|Landa|Titan|Scooby|Deox|Stella|Themis|Argon|Unique 7|Sygnus|Hexen|Finity 7|Cream|Cream X2|Jade|Neon 7|Neron 7|Kandy|Scape|Saphyr 7|Rebel|Biox|Rebel|Rebel 8GB|Myst|Draco 7|Myst|Tab7-004|Myst|Tadeo Jones|Tablet Boing|Arrow|Draco Dual Cam|Aurix|Mint|Amity|Revolution|Finity 9|Neon 9|T9w|Amity 4GB Dual Cam|Stone 4GB|Stone 8GB|Andromeda|Silken|X2|Andromeda II|Halley|Flame|Saphyr 9,7|Touch 8|Planet|Triton|Unique 10|Hexen 10|Memphis 4GB|Memphis 8GB|Onix 10)", "FX2Tablet": "FX2 PAD7|FX2 PAD10", "XoroTablet": "KidsPAD 701|PAD[ ]?712|PAD[ ]?714|PAD[ ]?716|PAD[ ]?717|PAD[ ]?718|PAD[ ]?720|PAD[ ]?721|PAD[ ]?722|PAD[ ]?790|PAD[ ]?792|PAD[ ]?900|PAD[ ]?9715D|PAD[ ]?9716DR|PAD[ ]?9718DR|PAD[ ]?9719QR|PAD[ ]?9720QR|TelePAD1030|Telepad1032|TelePAD730|TelePAD731|TelePAD732|TelePAD735Q|TelePAD830|TelePAD9730|TelePAD795|MegaPAD 1331|MegaPAD 1851|MegaPAD 2151", "ViewsonicTablet": "ViewPad 10pi|ViewPad 10e|ViewPad 10s|ViewPad E72|ViewPad7|ViewPad E100|ViewPad 7e|ViewSonic VB733|VB100a", "OdysTablet": "LOOX|XENO10|ODYS[ -](Space|EVO|Xpress|NOON)|\\bXELIO\\b|Xelio10Pro|XELIO7PHONETAB|XELIO10EXTREME|XELIOPT2|NEO_QUAD10", "CaptivaTablet": "CAPTIVA PAD", "IconbitTablet": "NetTAB|NT-3702|NT-3702S|NT-3702S|NT-3603P|NT-3603P|NT-0704S|NT-0704S|NT-3805C|NT-3805C|NT-0806C|NT-0806C|NT-0909T|NT-0909T|NT-0907S|NT-0907S|NT-0902S|NT-0902S", "TeclastTablet": "T98 4G|\\bP80\\b|\\bX90HD\\b|X98 Air|X98 Air 3G|\\bX89\\b|P80 3G|\\bX80h\\b|P98 Air|\\bX89HD\\b|P98 3G|\\bP90HD\\b|P89 3G|X98 3G|\\bP70h\\b|P79HD 3G|G18d 3G|\\bP79HD\\b|\\bP89s\\b|\\bA88\\b|\\bP10HD\\b|\\bP19HD\\b|G18 3G|\\bP78HD\\b|\\bA78\\b|\\bP75\\b|G17s 3G|G17h 3G|\\bP85t\\b|\\bP90\\b|\\bP11\\b|\\bP98t\\b|\\bP98HD\\b|\\bG18d\\b|\\bP85s\\b|\\bP11HD\\b|\\bP88s\\b|\\bA80HD\\b|\\bA80se\\b|\\bA10h\\b|\\bP89\\b|\\bP78s\\b|\\bG18\\b|\\bP85\\b|\\bA70h\\b|\\bA70\\b|\\bG17\\b|\\bP18\\b|\\bA80s\\b|\\bA11s\\b|\\bP88HD\\b|\\bA80h\\b|\\bP76s\\b|\\bP76h\\b|\\bP98\\b|\\bA10HD\\b|\\bP78\\b|\\bP88\\b|\\bA11\\b|\\bA10t\\b|\\bP76a\\b|\\bP76t\\b|\\bP76e\\b|\\bP85HD\\b|\\bP85a\\b|\\bP86\\b|\\bP75HD\\b|\\bP76v\\b|\\bA12\\b|\\bP75a\\b|\\bA15\\b|\\bP76Ti\\b|\\bP81HD\\b|\\bA10\\b|\\bT760VE\\b|\\bT720HD\\b|\\bP76\\b|\\bP73\\b|\\bP71\\b|\\bP72\\b|\\bT720SE\\b|\\bC520Ti\\b|\\bT760\\b|\\bT720VE\\b|T720-3GE|T720-WiFi", "OndaTablet": "\\b(V975i|Vi30|VX530|V701|Vi60|V701s|Vi50|V801s|V719|Vx610w|VX610W|V819i|Vi10|VX580W|Vi10|V711s|V813|V811|V820w|V820|Vi20|V711|VI30W|V712|V891w|V972|V819w|V820w|Vi60|V820w|V711|V813s|V801|V819|V975s|V801|V819|V819|V818|V811|V712|V975m|V101w|V961w|V812|V818|V971|V971s|V919|V989|V116w|V102w|V973|Vi40)\\b[\\s]+", "JaytechTablet": "TPC-PA762", "BlaupunktTablet": "Endeavour 800NG|Endeavour 1010", "DigmaTablet": "\\b(iDx10|iDx9|iDx8|iDx7|iDxD7|iDxD8|iDsQ8|iDsQ7|iDsQ8|iDsD10|iDnD7|3TS804H|iDsQ11|iDj7|iDs10)\\b", "EvolioTablet": "ARIA_Mini_wifi|Aria[ _]Mini|Evolio X10|Evolio X7|Evolio X8|\\bEvotab\\b|\\bNeura\\b", "LavaTablet": "QPAD E704|\\bIvoryS\\b|E-TAB IVORY|\\bE-TAB\\b", "AocTablet": "MW0811|MW0812|MW0922|MTK8382|MW1031|MW0831|MW0821|MW0931|MW0712", "MpmanTablet": "MP11 OCTA|MP10 OCTA|MPQC1114|MPQC1004|MPQC994|MPQC974|MPQC973|MPQC804|MPQC784|MPQC780|\\bMPG7\\b|MPDCG75|MPDCG71|MPDC1006|MP101DC|MPDC9000|MPDC905|MPDC706HD|MPDC706|MPDC705|MPDC110|MPDC100|MPDC99|MPDC97|MPDC88|MPDC8|MPDC77|MP709|MID701|MID711|MID170|MPDC703|MPQC1010", "CelkonTablet": "CT695|CT888|CT[\\s]?910|CT7 Tab|CT9 Tab|CT3 Tab|CT2 Tab|CT1 Tab|C820|C720|\\bCT-1\\b", "WolderTablet": "miTab \\b(DIAMOND|SPACE|BROOKLYN|NEO|FLY|MANHATTAN|FUNK|EVOLUTION|SKY|GOCAR|IRON|GENIUS|POP|MINT|EPSILON|BROADWAY|JUMP|HOP|LEGEND|NEW AGE|LINE|ADVANCE|FEEL|FOLLOW|LIKE|LINK|LIVE|THINK|FREEDOM|CHICAGO|CLEVELAND|BALTIMORE-GH|IOWA|BOSTON|SEATTLE|PHOENIX|DALLAS|IN 101|MasterChef)\\b", "MiTablet": "\\bMI PAD\\b|\\bHM NOTE 1W\\b", "NibiruTablet": "Nibiru M1|Nibiru Jupiter One", "NexoTablet": "NEXO NOVA|NEXO 10|NEXO AVIO|NEXO FREE|NEXO GO|NEXO EVO|NEXO 3G|NEXO SMART|NEXO KIDDO|NEXO MOBI", "LeaderTablet": "TBLT10Q|TBLT10I|TBL-10WDKB|TBL-10WDKBO2013|TBL-W230V2|TBL-W450|TBL-W500|SV572|TBLT7I|TBA-AC7-8G|TBLT79|TBL-8W16|TBL-10W32|TBL-10WKB|TBL-W100", "UbislateTablet": "UbiSlate[\\s]?7C", "PocketBookTablet": "Pocketbook", "KocasoTablet": "\\b(TB-1207)\\b", "Hudl": "Hudl HT7S3|Hudl 2", "TelstraTablet": "T-Hub2", "GenericTablet": "Android.*\\b97D\\b|Tablet(?!.*PC)|BNTV250A|MID-WCDMA|LogicPD Zoom2|\\bA7EB\\b|CatNova8|A1_07|CT704|CT1002|\\bM721\\b|rk30sdk|\\bEVOTAB\\b|M758A|ET904|ALUMIUM10|Smartfren Tab|Endeavour 1010|Tablet-PC-4|Tagi Tab|\\bM6pro\\b|CT1020W|arc 10HD|\\bJolla\\b|\\bTP750\\b" }, "oss": { "androids": "Android", "BlackBerryOS": "blackberry|\\bBB10\\b|rim tablet os", "PalmOS": "PalmOS|avantgo|blazer|elaine|hiptop|palm|plucker|xiino", "SymbianOS": "Symbian|symbols|Series60|Series40|SYB-[0-9]+|\\bS60\\b", "WindowsMobileOS": "Windows CE.*(PPC|Smartphone|Mobile|[0-9]{3}x[0-9]{3})|Window Mobile|Windows Phone [0-9.]+|WCE;", "WindowsPhoneOS": "Windows Phone 10.0|Windows Phone 8.1|Windows Phone 8.0|Windows Phone OS|XBLWP7|ZuneWP7|Windows NT 6.[23]; ARM;", "iOS": "\\biPhone.*Mobile|\\biPod|\\biPad", "MeeGoOS": "MeeGo", "MaemoOS": "Maemo", "JavaOS": "J2ME\/|\\bMIDP\\b|\\bCLDC\\b", "webOS": "webOS|hpwOS", "badaOS": "\\bBada\\b", "BREWOS": "BREW" }, "uas": { "Vivaldi": "Vivaldi", "Chrome": "\\bCrMo\\b|CriOS|Android.*Chrome\/[.0-9]* (Mobile)?", "Dolfin": "\\bDolfin\\b", "Opera": "Opera.*Mini|Opera.*Mobi|Android.*Opera|Mobile.*OPR\/[0-9.]+|Coast\/[0-9.]+", "Skyfire": "Skyfire", "Edge": "Mobile Safari\/[.0-9]* Edge", "IE": "IEMobile|MSIEMobile", "Firefox": "fennec|firefox.*maemo|(Mobile|Tablet).*Firefox|Firefox.*Mobile", "Bolt": "bolt", "TeaShark": "teashark", "Blazer": "Blazer", "Safari": "Version.*Mobile.*Safari|Safari.*Mobile|MobileSafari", "Tizen": "Tizen", "UCBrowser": "UC.*Browser|UCWEB", "baiduboxapp": "baiduboxapp", "baidubrowser": "baidubrowser", "DiigoBrowser": "DiigoBrowser", "Puffin": "Puffin", "Mercury": "\\bMercury\\b", "ObigoBrowser": "Obigo", "NetFront": "NF-Browser", "GenericBrowser": "NokiaBrowser|OviBrowser|OneBrowser|TwonkyBeamBrowser|SEMC.*Browser|FlyFlow|Minimo|NetFront|Novarra-Vision|MQQBrowser|MicroMessenger", "PaleMoon": "Android.*PaleMoon|Mobile.*PaleMoon" }, "props": { "Mobile": "Mobile\/[VER]", "Build": "Build\/[VER]", "Version": "Version\/[VER]", "VendorID": "VendorID\/[VER]", "iPad": "iPad.*CPU[a-z ]+[VER]", "iPhone": "iPhone.*CPU[a-z ]+[VER]", "iPod": "iPod.*CPU[a-z ]+[VER]", "Kindle": "Kindle\/[VER]", "Chrome": [ "Chrome\/[VER]", "CriOS\/[VER]", "CrMo\/[VER]" ], "Coast": [ "Coast\/[VER]" ], "Dolfin": "Dolfin\/[VER]", "Firefox": "Firefox\/[VER]", "Fennec": "Fennec\/[VER]", "Edge": "Edge\/[VER]", "IE": [ "IEMobile\/[VER];", "IEMobile [VER]", "MSIE [VER];", "Trident\/[0-9.]+;.*rv:[VER]" ], "NetFront": "NetFront\/[VER]", "NokiaBrowser": "NokiaBrowser\/[VER]", "Opera": [ " OPR\/[VER]", "Opera Mini\/[VER]", "Version\/[VER]" ], "Opera Mini": "Opera Mini\/[VER]", "Opera Mobi": "Version\/[VER]", "UC Browser": "UC Browser[VER]", "MQQBrowser": "MQQBrowser\/[VER]", "MicroMessenger": "MicroMessenger\/[VER]", "baiduboxapp": "baiduboxapp\/[VER]", "baidubrowser": "baidubrowser\/[VER]", "Iron": "Iron\/[VER]", "Safari": [ "Version\/[VER]", "Safari\/[VER]" ], "Skyfire": "Skyfire\/[VER]", "Tizen": "Tizen\/[VER]", "Webkit": "webkit[ \/][VER]", "PaleMoon": "PaleMoon\/[VER]", "Gecko": "Gecko\/[VER]", "Trident": "Trident\/[VER]", "Presto": "Presto\/[VER]", "Goanna": "Goanna\/[VER]", "iOS": " \\bi?OS\\b [VER][ ;]{1}", "Android": "Android [VER]", "BlackBerry": [ "BlackBerry[\\w]+\/[VER]", "BlackBerry.*Version\/[VER]", "Version\/[VER]" ], "BREW": "BREW [VER]", "Java": "Java\/[VER]", "Windows Phone OS": [ "Windows Phone OS [VER]", "Windows Phone [VER]" ], "Windows Phone": "Windows Phone [VER]", "Windows CE": "Windows CE\/[VER]", "Windows NT": "Windows NT [VER]", "Symbian": [ "SymbianOS\/[VER]", "Symbian\/[VER]" ], "webOS": [ "webOS\/[VER]", "hpwOS\/[VER];" ] }, "utils": { "Bot": "Googlebot|facebookexternalhit|AdsBot-Google|Google Keyword Suggestion|Facebot|YandexBot|bingbot|ia_archiver|AhrefsBot|Ezooms|GSLFbot|WBSearchBot|Twitterbot|TweetmemeBot|Twikle|PaperLiBot|Wotbox|UnwindFetchor|Exabot|MJ12bot|YandexImages|TurnitinBot|Pingdom", "MobileBot": "Googlebot-Mobile|AdsBot-Google-Mobile|YahooSeeker\/M1A1-R2D2", "DesktopMode": "WPDesktop", "TV": "SonyDTV|HbbTV", "WebKit": "(webkit)[ \/]([\\w.]+)", "Console": "\\b(Nintendo|Nintendo WiiU|Nintendo 3DS|PLAYSTATION|Xbox)\\b", "Watch": "SM-V700" }} : { phones: { iPhone: string; BlackBerry: string; HTC: string; Nexus: string; Dell: string; Motorola: string; Samsung: string; LG: string; Sony: string; Asus: string; NokiaLumia: string; Micromax: string; Palm: string; Vertu: string; Pantech: string; Fly: string; Wiko: string; iMobile: string; SimValley: string; Wolfgang: string; Alcatel: string; Nintendo: string; Amoi: string; INQ: string; GenericPhone: string; }; tablets: { iPad: string; NexusTablet: string; SamsungTablet: string; Kindle: string; SurfaceTablet: string; HPTablet: string; AsusTablet: string; BlackBerryTablet: string; HTCtablet: string; MotorolaTablet: string; NookTablet: string; AcerTablet: string; ToshibaTablet: string; LGTablet: string; FujitsuTablet: string; PrestigioTablet: string; LenovoTablet: string; DellTablet: string; YarvikTablet: string; MedionTablet: string; ArnovaTablet: string; IntensoTablet: string; IRUTablet: string; MegafonTablet: string; EbodaTablet: string; AllViewTablet: string; ArchosTablet: string; AinolTablet: string; NokiaLumiaTablet: string; SonyTablet: string; PhilipsTablet: string; CubeTablet: string; CobyTablet: string; MIDTablet: string; MSITablet: string; SMiTTablet: string; RockChipTablet: string; FlyTablet: string; bqTablet: string; HuaweiTablet: string; NecTablet: string; PantechTablet: string; BronchoTablet: string; VersusTablet: string; ZyncTablet: string; PositivoTablet: string; NabiTablet: string; KoboTablet: string; DanewTablet: string; TexetTablet: string; PlaystationTablet: string; TrekstorTablet: string; PyleAudioTablet: string; AdvanTablet: string; DanyTechTablet: string; GalapadTablet: string; MicromaxTablet: string; KarbonnTablet: string; AllFineTablet: string; PROSCANTablet: string; YONESTablet: string; ChangJiaTablet: string; GUTablet: string; PointOfViewTablet: string; OvermaxTablet: string; HCLTablet: string; DPSTablet: string; VistureTablet: string; CrestaTablet: string; MediatekTablet: string; ConcordeTablet: string; GoCleverTablet: string; ModecomTablet: string; VoninoTablet: string; ECSTablet: string; StorexTablet: string; VodafoneTablet: string; EssentielBTablet: string; RossMoorTablet: string; iMobileTablet: string; TolinoTablet: string; AudioSonicTablet: string; AMPETablet: string; SkkTablet: string; TecnoTablet: string; JXDTablet: string; iJoyTablet: string; FX2Tablet: string; XoroTablet: string; ViewsonicTablet: string; OdysTablet: string; CaptivaTablet: string; IconbitTablet: string; TeclastTablet: string; OndaTablet: string; JaytechTablet: string; BlaupunktTablet: string; DigmaTablet: string; EvolioTablet: string; LavaTablet: string; AocTablet: string; MpmanTablet: string; CelkonTablet: string; WolderTablet: string; MiTablet: string; NibiruTablet: string; NexoTablet: string; LeaderTablet: string; UbislateTablet: string; PocketBookTablet: string; KocasoTablet: string; Hudl: string; TelstraTablet: string; GenericTablet: string; }; oss: { androids: string; BlackBerryOS: string; PalmOS: string; SymbianOS: string; WindowsMobileOS: string; WindowsPhoneOS: string; iOS: string; MeeGoOS: string; MaemoOS: string; JavaOS: string; webOS: string; badaOS: string; BREWOS: string; }; uas: { Vivaldi: string; Chrome: string; Dolfin: string; Opera: string; Skyfire: string; Edge: string; IE: string; Firefox: string; Bolt: string; TeaShark: string; Blazer: string; Safari: string; Tizen: string; UCBrowser: string; baiduboxapp: string; baidubrowser: string; DiigoBrowser: string; Puffin: string; Mercury: string; ObigoBrowser: string; NetFront: string; GenericBrowser: string; PaleMoon: string; }; props: { Mobile: string; Build: string; Version: string; VendorID: string; iPad: string; iPhone: string; iPod: string; Kindle: string; Chrome: string[]; Coast: string[]; Dolfin: string; Firefox: string; Fennec: string; Edge: string; IE: string[]; NetFront: string; NokiaBrowser: string; Opera: string[]; "Opera Mini": string; "Opera Mobi": string; "UC Browser": string; MQQBrowser: string; MicroMessenger: string; baiduboxapp: string; baidubrowser: string; Iron: string; Safari: string[]; Skyfire: string; Tizen: string; Webkit: string; PaleMoon: string; Gecko: string; Trident: string; Presto: string; Goanna: string; iOS: string; Android: string; BlackBerry: string[]; BREW: string; Java: string; "Windows Phone OS": string[]; "Windows Phone": string; "Windows CE": string; "Windows NT": string; Symbian: string[]; webOS: string[]; }; utils: { Bot: string; MobileBot: string; DesktopMode: string; TV: string; WebKit: string; Console: string; Watch: string; }; } > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ >impl.mobileDetectRules : any > : ^^^ @@ -45,7 +45,7 @@ define(function () { > : ^^ >mobileDetectRules : any > : ^^^ ->{ "phones": { "iPhone": "\\biPhone\\b|\\biPod\\b", "BlackBerry": "BlackBerry|\\bBB10\\b|rim[0-9]+", "HTC": "HTC|HTC.*(Sensation|Evo|Vision|Explorer|6800|8100|8900|A7272|S510e|C110e|Legend|Desire|T8282)|APX515CKT|Qtek9090|APA9292KT|HD_mini|Sensation.*Z710e|PG86100|Z715e|Desire.*(A8181|HD)|ADR6200|ADR6400L|ADR6425|001HT|Inspire 4G|Android.*\\bEVO\\b|T-Mobile G1|Z520m", "Nexus": "Nexus One|Nexus S|Galaxy.*Nexus|Android.*Nexus.*Mobile|Nexus 4|Nexus 5|Nexus 6", "Dell": "Dell.*Streak|Dell.*Aero|Dell.*Venue|DELL.*Venue Pro|Dell Flash|Dell Smoke|Dell Mini 3iX|XCD28|XCD35|\\b001DL\\b|\\b101DL\\b|\\bGS01\\b", "Motorola": "Motorola|DROIDX|DROID BIONIC|\\bDroid\\b.*Build|Android.*Xoom|HRI39|MOT-|A1260|A1680|A555|A853|A855|A953|A955|A956|Motorola.*ELECTRIFY|Motorola.*i1|i867|i940|MB200|MB300|MB501|MB502|MB508|MB511|MB520|MB525|MB526|MB611|MB612|MB632|MB810|MB855|MB860|MB861|MB865|MB870|ME501|ME502|ME511|ME525|ME600|ME632|ME722|ME811|ME860|ME863|ME865|MT620|MT710|MT716|MT720|MT810|MT870|MT917|Motorola.*TITANIUM|WX435|WX445|XT300|XT301|XT311|XT316|XT317|XT319|XT320|XT390|XT502|XT530|XT531|XT532|XT535|XT603|XT610|XT611|XT615|XT681|XT701|XT702|XT711|XT720|XT800|XT806|XT860|XT862|XT875|XT882|XT883|XT894|XT901|XT907|XT909|XT910|XT912|XT928|XT926|XT915|XT919|XT925|XT1021|\\bMoto E\\b", "Samsung": "Samsung|SM-G9250|GT-19300|SGH-I337|BGT-S5230|GT-B2100|GT-B2700|GT-B2710|GT-B3210|GT-B3310|GT-B3410|GT-B3730|GT-B3740|GT-B5510|GT-B5512|GT-B5722|GT-B6520|GT-B7300|GT-B7320|GT-B7330|GT-B7350|GT-B7510|GT-B7722|GT-B7800|GT-C3010|GT-C3011|GT-C3060|GT-C3200|GT-C3212|GT-C3212I|GT-C3262|GT-C3222|GT-C3300|GT-C3300K|GT-C3303|GT-C3303K|GT-C3310|GT-C3322|GT-C3330|GT-C3350|GT-C3500|GT-C3510|GT-C3530|GT-C3630|GT-C3780|GT-C5010|GT-C5212|GT-C6620|GT-C6625|GT-C6712|GT-E1050|GT-E1070|GT-E1075|GT-E1080|GT-E1081|GT-E1085|GT-E1087|GT-E1100|GT-E1107|GT-E1110|GT-E1120|GT-E1125|GT-E1130|GT-E1160|GT-E1170|GT-E1175|GT-E1180|GT-E1182|GT-E1200|GT-E1210|GT-E1225|GT-E1230|GT-E1390|GT-E2100|GT-E2120|GT-E2121|GT-E2152|GT-E2220|GT-E2222|GT-E2230|GT-E2232|GT-E2250|GT-E2370|GT-E2550|GT-E2652|GT-E3210|GT-E3213|GT-I5500|GT-I5503|GT-I5700|GT-I5800|GT-I5801|GT-I6410|GT-I6420|GT-I7110|GT-I7410|GT-I7500|GT-I8000|GT-I8150|GT-I8160|GT-I8190|GT-I8320|GT-I8330|GT-I8350|GT-I8530|GT-I8700|GT-I8703|GT-I8910|GT-I9000|GT-I9001|GT-I9003|GT-I9010|GT-I9020|GT-I9023|GT-I9070|GT-I9082|GT-I9100|GT-I9103|GT-I9220|GT-I9250|GT-I9300|GT-I9305|GT-I9500|GT-I9505|GT-M3510|GT-M5650|GT-M7500|GT-M7600|GT-M7603|GT-M8800|GT-M8910|GT-N7000|GT-S3110|GT-S3310|GT-S3350|GT-S3353|GT-S3370|GT-S3650|GT-S3653|GT-S3770|GT-S3850|GT-S5210|GT-S5220|GT-S5229|GT-S5230|GT-S5233|GT-S5250|GT-S5253|GT-S5260|GT-S5263|GT-S5270|GT-S5300|GT-S5330|GT-S5350|GT-S5360|GT-S5363|GT-S5369|GT-S5380|GT-S5380D|GT-S5560|GT-S5570|GT-S5600|GT-S5603|GT-S5610|GT-S5620|GT-S5660|GT-S5670|GT-S5690|GT-S5750|GT-S5780|GT-S5830|GT-S5839|GT-S6102|GT-S6500|GT-S7070|GT-S7200|GT-S7220|GT-S7230|GT-S7233|GT-S7250|GT-S7500|GT-S7530|GT-S7550|GT-S7562|GT-S7710|GT-S8000|GT-S8003|GT-S8500|GT-S8530|GT-S8600|SCH-A310|SCH-A530|SCH-A570|SCH-A610|SCH-A630|SCH-A650|SCH-A790|SCH-A795|SCH-A850|SCH-A870|SCH-A890|SCH-A930|SCH-A950|SCH-A970|SCH-A990|SCH-I100|SCH-I110|SCH-I400|SCH-I405|SCH-I500|SCH-I510|SCH-I515|SCH-I600|SCH-I730|SCH-I760|SCH-I770|SCH-I830|SCH-I910|SCH-I920|SCH-I959|SCH-LC11|SCH-N150|SCH-N300|SCH-R100|SCH-R300|SCH-R351|SCH-R400|SCH-R410|SCH-T300|SCH-U310|SCH-U320|SCH-U350|SCH-U360|SCH-U365|SCH-U370|SCH-U380|SCH-U410|SCH-U430|SCH-U450|SCH-U460|SCH-U470|SCH-U490|SCH-U540|SCH-U550|SCH-U620|SCH-U640|SCH-U650|SCH-U660|SCH-U700|SCH-U740|SCH-U750|SCH-U810|SCH-U820|SCH-U900|SCH-U940|SCH-U960|SCS-26UC|SGH-A107|SGH-A117|SGH-A127|SGH-A137|SGH-A157|SGH-A167|SGH-A177|SGH-A187|SGH-A197|SGH-A227|SGH-A237|SGH-A257|SGH-A437|SGH-A517|SGH-A597|SGH-A637|SGH-A657|SGH-A667|SGH-A687|SGH-A697|SGH-A707|SGH-A717|SGH-A727|SGH-A737|SGH-A747|SGH-A767|SGH-A777|SGH-A797|SGH-A817|SGH-A827|SGH-A837|SGH-A847|SGH-A867|SGH-A877|SGH-A887|SGH-A897|SGH-A927|SGH-B100|SGH-B130|SGH-B200|SGH-B220|SGH-C100|SGH-C110|SGH-C120|SGH-C130|SGH-C140|SGH-C160|SGH-C170|SGH-C180|SGH-C200|SGH-C207|SGH-C210|SGH-C225|SGH-C230|SGH-C417|SGH-C450|SGH-D307|SGH-D347|SGH-D357|SGH-D407|SGH-D415|SGH-D780|SGH-D807|SGH-D980|SGH-E105|SGH-E200|SGH-E315|SGH-E316|SGH-E317|SGH-E335|SGH-E590|SGH-E635|SGH-E715|SGH-E890|SGH-F300|SGH-F480|SGH-I200|SGH-I300|SGH-I320|SGH-I550|SGH-I577|SGH-I600|SGH-I607|SGH-I617|SGH-I627|SGH-I637|SGH-I677|SGH-I700|SGH-I717|SGH-I727|SGH-i747M|SGH-I777|SGH-I780|SGH-I827|SGH-I847|SGH-I857|SGH-I896|SGH-I897|SGH-I900|SGH-I907|SGH-I917|SGH-I927|SGH-I937|SGH-I997|SGH-J150|SGH-J200|SGH-L170|SGH-L700|SGH-M110|SGH-M150|SGH-M200|SGH-N105|SGH-N500|SGH-N600|SGH-N620|SGH-N625|SGH-N700|SGH-N710|SGH-P107|SGH-P207|SGH-P300|SGH-P310|SGH-P520|SGH-P735|SGH-P777|SGH-Q105|SGH-R210|SGH-R220|SGH-R225|SGH-S105|SGH-S307|SGH-T109|SGH-T119|SGH-T139|SGH-T209|SGH-T219|SGH-T229|SGH-T239|SGH-T249|SGH-T259|SGH-T309|SGH-T319|SGH-T329|SGH-T339|SGH-T349|SGH-T359|SGH-T369|SGH-T379|SGH-T409|SGH-T429|SGH-T439|SGH-T459|SGH-T469|SGH-T479|SGH-T499|SGH-T509|SGH-T519|SGH-T539|SGH-T559|SGH-T589|SGH-T609|SGH-T619|SGH-T629|SGH-T639|SGH-T659|SGH-T669|SGH-T679|SGH-T709|SGH-T719|SGH-T729|SGH-T739|SGH-T746|SGH-T749|SGH-T759|SGH-T769|SGH-T809|SGH-T819|SGH-T839|SGH-T919|SGH-T929|SGH-T939|SGH-T959|SGH-T989|SGH-U100|SGH-U200|SGH-U800|SGH-V205|SGH-V206|SGH-X100|SGH-X105|SGH-X120|SGH-X140|SGH-X426|SGH-X427|SGH-X475|SGH-X495|SGH-X497|SGH-X507|SGH-X600|SGH-X610|SGH-X620|SGH-X630|SGH-X700|SGH-X820|SGH-X890|SGH-Z130|SGH-Z150|SGH-Z170|SGH-ZX10|SGH-ZX20|SHW-M110|SPH-A120|SPH-A400|SPH-A420|SPH-A460|SPH-A500|SPH-A560|SPH-A600|SPH-A620|SPH-A660|SPH-A700|SPH-A740|SPH-A760|SPH-A790|SPH-A800|SPH-A820|SPH-A840|SPH-A880|SPH-A900|SPH-A940|SPH-A960|SPH-D600|SPH-D700|SPH-D710|SPH-D720|SPH-I300|SPH-I325|SPH-I330|SPH-I350|SPH-I500|SPH-I600|SPH-I700|SPH-L700|SPH-M100|SPH-M220|SPH-M240|SPH-M300|SPH-M305|SPH-M320|SPH-M330|SPH-M350|SPH-M360|SPH-M370|SPH-M380|SPH-M510|SPH-M540|SPH-M550|SPH-M560|SPH-M570|SPH-M580|SPH-M610|SPH-M620|SPH-M630|SPH-M800|SPH-M810|SPH-M850|SPH-M900|SPH-M910|SPH-M920|SPH-M930|SPH-N100|SPH-N200|SPH-N240|SPH-N300|SPH-N400|SPH-Z400|SWC-E100|SCH-i909|GT-N7100|GT-N7105|SCH-I535|SM-N900A|SGH-I317|SGH-T999L|GT-S5360B|GT-I8262|GT-S6802|GT-S6312|GT-S6310|GT-S5312|GT-S5310|GT-I9105|GT-I8510|GT-S6790N|SM-G7105|SM-N9005|GT-S5301|GT-I9295|GT-I9195|SM-C101|GT-S7392|GT-S7560|GT-B7610|GT-I5510|GT-S7582|GT-S7530E|GT-I8750|SM-G9006V|SM-G9008V|SM-G9009D|SM-G900A|SM-G900D|SM-G900F|SM-G900H|SM-G900I|SM-G900J|SM-G900K|SM-G900L|SM-G900M|SM-G900P|SM-G900R4|SM-G900S|SM-G900T|SM-G900V|SM-G900W8|SHV-E160K|SCH-P709|SCH-P729|SM-T2558|GT-I9205|SM-G9350|SM-J120F", "LG": "\\bLG\\b;|LG[- ]?(C800|C900|E400|E610|E900|E-900|F160|F180K|F180L|F180S|730|855|L160|LS740|LS840|LS970|LU6200|MS690|MS695|MS770|MS840|MS870|MS910|P500|P700|P705|VM696|AS680|AS695|AX840|C729|E970|GS505|272|C395|E739BK|E960|L55C|L75C|LS696|LS860|P769BK|P350|P500|P509|P870|UN272|US730|VS840|VS950|LN272|LN510|LS670|LS855|LW690|MN270|MN510|P509|P769|P930|UN200|UN270|UN510|UN610|US670|US740|US760|UX265|UX840|VN271|VN530|VS660|VS700|VS740|VS750|VS910|VS920|VS930|VX9200|VX11000|AX840A|LW770|P506|P925|P999|E612|D955|D802|MS323)", "Sony": "SonyST|SonyLT|SonyEricsson|SonyEricssonLT15iv|LT18i|E10i|LT28h|LT26w|SonyEricssonMT27i|C5303|C6902|C6903|C6906|C6943|D2533", "Asus": "Asus.*Galaxy|PadFone.*Mobile", "NokiaLumia": "Lumia [0-9]{3,4}", "Micromax": "Micromax.*\\b(A210|A92|A88|A72|A111|A110Q|A115|A116|A110|A90S|A26|A51|A35|A54|A25|A27|A89|A68|A65|A57|A90)\\b", "Palm": "PalmSource|Palm", "Vertu": "Vertu|Vertu.*Ltd|Vertu.*Ascent|Vertu.*Ayxta|Vertu.*Constellation(F|Quest)?|Vertu.*Monika|Vertu.*Signature", "Pantech": "PANTECH|IM-A850S|IM-A840S|IM-A830L|IM-A830K|IM-A830S|IM-A820L|IM-A810K|IM-A810S|IM-A800S|IM-T100K|IM-A725L|IM-A780L|IM-A775C|IM-A770K|IM-A760S|IM-A750K|IM-A740S|IM-A730S|IM-A720L|IM-A710K|IM-A690L|IM-A690S|IM-A650S|IM-A630K|IM-A600S|VEGA PTL21|PT003|P8010|ADR910L|P6030|P6020|P9070|P4100|P9060|P5000|CDM8992|TXT8045|ADR8995|IS11PT|P2030|P6010|P8000|PT002|IS06|CDM8999|P9050|PT001|TXT8040|P2020|P9020|P2000|P7040|P7000|C790", "Fly": "IQ230|IQ444|IQ450|IQ440|IQ442|IQ441|IQ245|IQ256|IQ236|IQ255|IQ235|IQ245|IQ275|IQ240|IQ285|IQ280|IQ270|IQ260|IQ250", "Wiko": "KITE 4G|HIGHWAY|GETAWAY|STAIRWAY|DARKSIDE|DARKFULL|DARKNIGHT|DARKMOON|SLIDE|WAX 4G|RAINBOW|BLOOM|SUNSET|GOA(?!nna)|LENNY|BARRY|IGGY|OZZY|CINK FIVE|CINK PEAX|CINK PEAX 2|CINK SLIM|CINK SLIM 2|CINK +|CINK KING|CINK PEAX|CINK SLIM|SUBLIM", "iMobile": "i-mobile (IQ|i-STYLE|idea|ZAA|Hitz)", "SimValley": "\\b(SP-80|XT-930|SX-340|XT-930|SX-310|SP-360|SP60|SPT-800|SP-120|SPT-800|SP-140|SPX-5|SPX-8|SP-100|SPX-8|SPX-12)\\b", "Wolfgang": "AT-B24D|AT-AS50HD|AT-AS40W|AT-AS55HD|AT-AS45q2|AT-B26D|AT-AS50Q", "Alcatel": "Alcatel", "Nintendo": "Nintendo 3DS", "Amoi": "Amoi", "INQ": "INQ", "GenericPhone": "Tapatalk|PDA;|SAGEM|\\bmmp\\b|pocket|\\bpsp\\b|symbian|Smartphone|smartfon|treo|up.browser|up.link|vodafone|\\bwap\\b|nokia|Series40|Series60|S60|SonyEricsson|N900|MAUI.*WAP.*Browser" }, "tablets": { "iPad": "iPad|iPad.*Mobile", "NexusTablet": "Android.*Nexus[\\s]+(7|9|10)", "SamsungTablet": "SAMSUNG.*Tablet|Galaxy.*Tab|SC-01C|GT-P1000|GT-P1003|GT-P1010|GT-P3105|GT-P6210|GT-P6800|GT-P6810|GT-P7100|GT-P7300|GT-P7310|GT-P7500|GT-P7510|SCH-I800|SCH-I815|SCH-I905|SGH-I957|SGH-I987|SGH-T849|SGH-T859|SGH-T869|SPH-P100|GT-P3100|GT-P3108|GT-P3110|GT-P5100|GT-P5110|GT-P6200|GT-P7320|GT-P7511|GT-N8000|GT-P8510|SGH-I497|SPH-P500|SGH-T779|SCH-I705|SCH-I915|GT-N8013|GT-P3113|GT-P5113|GT-P8110|GT-N8010|GT-N8005|GT-N8020|GT-P1013|GT-P6201|GT-P7501|GT-N5100|GT-N5105|GT-N5110|SHV-E140K|SHV-E140L|SHV-E140S|SHV-E150S|SHV-E230K|SHV-E230L|SHV-E230S|SHW-M180K|SHW-M180L|SHW-M180S|SHW-M180W|SHW-M300W|SHW-M305W|SHW-M380K|SHW-M380S|SHW-M380W|SHW-M430W|SHW-M480K|SHW-M480S|SHW-M480W|SHW-M485W|SHW-M486W|SHW-M500W|GT-I9228|SCH-P739|SCH-I925|GT-I9200|GT-P5200|GT-P5210|GT-P5210X|SM-T311|SM-T310|SM-T310X|SM-T210|SM-T210R|SM-T211|SM-P600|SM-P601|SM-P605|SM-P900|SM-P901|SM-T217|SM-T217A|SM-T217S|SM-P6000|SM-T3100|SGH-I467|XE500|SM-T110|GT-P5220|GT-I9200X|GT-N5110X|GT-N5120|SM-P905|SM-T111|SM-T2105|SM-T315|SM-T320|SM-T320X|SM-T321|SM-T520|SM-T525|SM-T530NU|SM-T230NU|SM-T330NU|SM-T900|XE500T1C|SM-P605V|SM-P905V|SM-T337V|SM-T537V|SM-T707V|SM-T807V|SM-P600X|SM-P900X|SM-T210X|SM-T230|SM-T230X|SM-T325|GT-P7503|SM-T531|SM-T330|SM-T530|SM-T705|SM-T705C|SM-T535|SM-T331|SM-T800|SM-T700|SM-T537|SM-T807|SM-P907A|SM-T337A|SM-T537A|SM-T707A|SM-T807A|SM-T237|SM-T807P|SM-P607T|SM-T217T|SM-T337T|SM-T807T|SM-T116NQ|SM-P550|SM-T350|SM-T550|SM-T9000|SM-P9000|SM-T705Y|SM-T805|GT-P3113|SM-T710|SM-T810|SM-T815|SM-T360|SM-T533|SM-T113|SM-T335|SM-T715|SM-T560|SM-T670|SM-T677|SM-T377|SM-T567|SM-T357T|SM-T555|SM-T561", "Kindle": "Kindle|Silk.*Accelerated|Android.*\\b(KFOT|KFTT|KFJWI|KFJWA|KFOTE|KFSOWI|KFTHWI|KFTHWA|KFAPWI|KFAPWA|WFJWAE|KFSAWA|KFSAWI|KFASWI|KFARWI)\\b", "SurfaceTablet": "Windows NT [0-9.]+; ARM;.*(Tablet|ARMBJS)", "HPTablet": "HP Slate (7|8|10)|HP ElitePad 900|hp-tablet|EliteBook.*Touch|HP 8|Slate 21|HP SlateBook 10", "AsusTablet": "^.*PadFone((?!Mobile).)*$|Transformer|TF101|TF101G|TF300T|TF300TG|TF300TL|TF700T|TF700KL|TF701T|TF810C|ME171|ME301T|ME302C|ME371MG|ME370T|ME372MG|ME172V|ME173X|ME400C|Slider SL101|\\bK00F\\b|\\bK00C\\b|\\bK00E\\b|\\bK00L\\b|TX201LA|ME176C|ME102A|\\bM80TA\\b|ME372CL|ME560CG|ME372CG|ME302KL| K010 | K017 |ME572C|ME103K|ME170C|ME171C|\\bME70C\\b|ME581C|ME581CL|ME8510C|ME181C|P01Y|PO1MA", "BlackBerryTablet": "PlayBook|RIM Tablet", "HTCtablet": "HTC_Flyer_P512|HTC Flyer|HTC Jetstream|HTC-P715a|HTC EVO View 4G|PG41200|PG09410", "MotorolaTablet": "xoom|sholest|MZ615|MZ605|MZ505|MZ601|MZ602|MZ603|MZ604|MZ606|MZ607|MZ608|MZ609|MZ615|MZ616|MZ617", "NookTablet": "Android.*Nook|NookColor|nook browser|BNRV200|BNRV200A|BNTV250|BNTV250A|BNTV400|BNTV600|LogicPD Zoom2", "AcerTablet": "Android.*; \\b(A100|A101|A110|A200|A210|A211|A500|A501|A510|A511|A700|A701|W500|W500P|W501|W501P|W510|W511|W700|G100|G100W|B1-A71|B1-710|B1-711|A1-810|A1-811|A1-830)\\b|W3-810|\\bA3-A10\\b|\\bA3-A11\\b|\\bA3-A20", "ToshibaTablet": "Android.*(AT100|AT105|AT200|AT205|AT270|AT275|AT300|AT305|AT1S5|AT500|AT570|AT700|AT830)|TOSHIBA.*FOLIO", "LGTablet": "\\bL-06C|LG-V909|LG-V900|LG-V700|LG-V510|LG-V500|LG-V410|LG-V400|LG-VK810\\b", "FujitsuTablet": "Android.*\\b(F-01D|F-02F|F-05E|F-10D|M532|Q572)\\b", "PrestigioTablet": "PMP3170B|PMP3270B|PMP3470B|PMP7170B|PMP3370B|PMP3570C|PMP5870C|PMP3670B|PMP5570C|PMP5770D|PMP3970B|PMP3870C|PMP5580C|PMP5880D|PMP5780D|PMP5588C|PMP7280C|PMP7280C3G|PMP7280|PMP7880D|PMP5597D|PMP5597|PMP7100D|PER3464|PER3274|PER3574|PER3884|PER5274|PER5474|PMP5097CPRO|PMP5097|PMP7380D|PMP5297C|PMP5297C_QUAD|PMP812E|PMP812E3G|PMP812F|PMP810E|PMP880TD|PMT3017|PMT3037|PMT3047|PMT3057|PMT7008|PMT5887|PMT5001|PMT5002", "LenovoTablet": "Lenovo TAB|Idea(Tab|Pad)( A1|A10| K1|)|ThinkPad([ ]+)?Tablet|YT3-X90L|YT3-X90F|YT3-X90X|Lenovo.*(S2109|S2110|S5000|S6000|K3011|A3000|A3500|A1000|A2107|A2109|A1107|A5500|A7600|B6000|B8000|B8080)(-|)(FL|F|HV|H|)", "DellTablet": "Venue 11|Venue 8|Venue 7|Dell Streak 10|Dell Streak 7", "YarvikTablet": "Android.*\\b(TAB210|TAB211|TAB224|TAB250|TAB260|TAB264|TAB310|TAB360|TAB364|TAB410|TAB411|TAB420|TAB424|TAB450|TAB460|TAB461|TAB464|TAB465|TAB467|TAB468|TAB07-100|TAB07-101|TAB07-150|TAB07-151|TAB07-152|TAB07-200|TAB07-201-3G|TAB07-210|TAB07-211|TAB07-212|TAB07-214|TAB07-220|TAB07-400|TAB07-485|TAB08-150|TAB08-200|TAB08-201-3G|TAB08-201-30|TAB09-100|TAB09-211|TAB09-410|TAB10-150|TAB10-201|TAB10-211|TAB10-400|TAB10-410|TAB13-201|TAB274EUK|TAB275EUK|TAB374EUK|TAB462EUK|TAB474EUK|TAB9-200)\\b", "MedionTablet": "Android.*\\bOYO\\b|LIFE.*(P9212|P9514|P9516|S9512)|LIFETAB", "ArnovaTablet": "AN10G2|AN7bG3|AN7fG3|AN8G3|AN8cG3|AN7G3|AN9G3|AN7dG3|AN7dG3ST|AN7dG3ChildPad|AN10bG3|AN10bG3DT|AN9G2", "IntensoTablet": "INM8002KP|INM1010FP|INM805ND|Intenso Tab|TAB1004", "IRUTablet": "M702pro", "MegafonTablet": "MegaFon V9|\\bZTE V9\\b|Android.*\\bMT7A\\b", "EbodaTablet": "E-Boda (Supreme|Impresspeed|Izzycomm|Essential)", "AllViewTablet": "Allview.*(Viva|Alldro|City|Speed|All TV|Frenzy|Quasar|Shine|TX1|AX1|AX2)", "ArchosTablet": "\\b(101G9|80G9|A101IT)\\b|Qilive 97R|Archos5|\\bARCHOS (70|79|80|90|97|101|FAMILYPAD|)(b|)(G10| Cobalt| TITANIUM(HD|)| Xenon| Neon|XSK| 2| XS 2| PLATINUM| CARBON|GAMEPAD)\\b", "AinolTablet": "NOVO7|NOVO8|NOVO10|Novo7Aurora|Novo7Basic|NOVO7PALADIN|novo9-Spark", "NokiaLumiaTablet": "Lumia 2520", "SonyTablet": "Sony.*Tablet|Xperia Tablet|Sony Tablet S|SO-03E|SGPT12|SGPT13|SGPT114|SGPT121|SGPT122|SGPT123|SGPT111|SGPT112|SGPT113|SGPT131|SGPT132|SGPT133|SGPT211|SGPT212|SGPT213|SGP311|SGP312|SGP321|EBRD1101|EBRD1102|EBRD1201|SGP351|SGP341|SGP511|SGP512|SGP521|SGP541|SGP551|SGP621|SGP612|SOT31", "PhilipsTablet": "\\b(PI2010|PI3000|PI3100|PI3105|PI3110|PI3205|PI3210|PI3900|PI4010|PI7000|PI7100)\\b", "CubeTablet": "Android.*(K8GT|U9GT|U10GT|U16GT|U17GT|U18GT|U19GT|U20GT|U23GT|U30GT)|CUBE U8GT", "CobyTablet": "MID1042|MID1045|MID1125|MID1126|MID7012|MID7014|MID7015|MID7034|MID7035|MID7036|MID7042|MID7048|MID7127|MID8042|MID8048|MID8127|MID9042|MID9740|MID9742|MID7022|MID7010", "MIDTablet": "M9701|M9000|M9100|M806|M1052|M806|T703|MID701|MID713|MID710|MID727|MID760|MID830|MID728|MID933|MID125|MID810|MID732|MID120|MID930|MID800|MID731|MID900|MID100|MID820|MID735|MID980|MID130|MID833|MID737|MID960|MID135|MID860|MID736|MID140|MID930|MID835|MID733|MID4X10", "MSITablet": "MSI \\b(Primo 73K|Primo 73L|Primo 81L|Primo 77|Primo 93|Primo 75|Primo 76|Primo 73|Primo 81|Primo 91|Primo 90|Enjoy 71|Enjoy 7|Enjoy 10)\\b", "SMiTTablet": "Android.*(\\bMID\\b|MID-560|MTV-T1200|MTV-PND531|MTV-P1101|MTV-PND530)", "RockChipTablet": "Android.*(RK2818|RK2808A|RK2918|RK3066)|RK2738|RK2808A", "FlyTablet": "IQ310|Fly Vision", "bqTablet": "Android.*(bq)?.*(Elcano|Curie|Edison|Maxwell|Kepler|Pascal|Tesla|Hypatia|Platon|Newton|Livingstone|Cervantes|Avant|Aquaris E10)|Maxwell.*Lite|Maxwell.*Plus", "HuaweiTablet": "MediaPad|MediaPad 7 Youth|IDEOS S7|S7-201c|S7-202u|S7-101|S7-103|S7-104|S7-105|S7-106|S7-201|S7-Slim", "NecTablet": "\\bN-06D|\\bN-08D", "PantechTablet": "Pantech.*P4100", "BronchoTablet": "Broncho.*(N701|N708|N802|a710)", "VersusTablet": "TOUCHPAD.*[78910]|\\bTOUCHTAB\\b", "ZyncTablet": "z1000|Z99 2G|z99|z930|z999|z990|z909|Z919|z900", "PositivoTablet": "TB07STA|TB10STA|TB07FTA|TB10FTA", "NabiTablet": "Android.*\\bNabi", "KoboTablet": "Kobo Touch|\\bK080\\b|\\bVox\\b Build|\\bArc\\b Build", "DanewTablet": "DSlide.*\\b(700|701R|702|703R|704|802|970|971|972|973|974|1010|1012)\\b", "TexetTablet": "NaviPad|TB-772A|TM-7045|TM-7055|TM-9750|TM-7016|TM-7024|TM-7026|TM-7041|TM-7043|TM-7047|TM-8041|TM-9741|TM-9747|TM-9748|TM-9751|TM-7022|TM-7021|TM-7020|TM-7011|TM-7010|TM-7023|TM-7025|TM-7037W|TM-7038W|TM-7027W|TM-9720|TM-9725|TM-9737W|TM-1020|TM-9738W|TM-9740|TM-9743W|TB-807A|TB-771A|TB-727A|TB-725A|TB-719A|TB-823A|TB-805A|TB-723A|TB-715A|TB-707A|TB-705A|TB-709A|TB-711A|TB-890HD|TB-880HD|TB-790HD|TB-780HD|TB-770HD|TB-721HD|TB-710HD|TB-434HD|TB-860HD|TB-840HD|TB-760HD|TB-750HD|TB-740HD|TB-730HD|TB-722HD|TB-720HD|TB-700HD|TB-500HD|TB-470HD|TB-431HD|TB-430HD|TB-506|TB-504|TB-446|TB-436|TB-416|TB-146SE|TB-126SE", "PlaystationTablet": "Playstation.*(Portable|Vita)", "TrekstorTablet": "ST10416-1|VT10416-1|ST70408-1|ST702xx-1|ST702xx-2|ST80208|ST97216|ST70104-2|VT10416-2|ST10216-2A|SurfTab", "PyleAudioTablet": "\\b(PTBL10CEU|PTBL10C|PTBL72BC|PTBL72BCEU|PTBL7CEU|PTBL7C|PTBL92BC|PTBL92BCEU|PTBL9CEU|PTBL9CUK|PTBL9C)\\b", "AdvanTablet": "Android.* \\b(E3A|T3X|T5C|T5B|T3E|T3C|T3B|T1J|T1F|T2A|T1H|T1i|E1C|T1-E|T5-A|T4|E1-B|T2Ci|T1-B|T1-D|O1-A|E1-A|T1-A|T3A|T4i)\\b ", "DanyTechTablet": "Genius Tab G3|Genius Tab S2|Genius Tab Q3|Genius Tab G4|Genius Tab Q4|Genius Tab G-II|Genius TAB GII|Genius TAB GIII|Genius Tab S1", "GalapadTablet": "Android.*\\bG1\\b", "MicromaxTablet": "Funbook|Micromax.*\\b(P250|P560|P360|P362|P600|P300|P350|P500|P275)\\b", "KarbonnTablet": "Android.*\\b(A39|A37|A34|ST8|ST10|ST7|Smart Tab3|Smart Tab2)\\b", "AllFineTablet": "Fine7 Genius|Fine7 Shine|Fine7 Air|Fine8 Style|Fine9 More|Fine10 Joy|Fine11 Wide", "PROSCANTablet": "\\b(PEM63|PLT1023G|PLT1041|PLT1044|PLT1044G|PLT1091|PLT4311|PLT4311PL|PLT4315|PLT7030|PLT7033|PLT7033D|PLT7035|PLT7035D|PLT7044K|PLT7045K|PLT7045KB|PLT7071KG|PLT7072|PLT7223G|PLT7225G|PLT7777G|PLT7810K|PLT7849G|PLT7851G|PLT7852G|PLT8015|PLT8031|PLT8034|PLT8036|PLT8080K|PLT8082|PLT8088|PLT8223G|PLT8234G|PLT8235G|PLT8816K|PLT9011|PLT9045K|PLT9233G|PLT9735|PLT9760G|PLT9770G)\\b", "YONESTablet": "BQ1078|BC1003|BC1077|RK9702|BC9730|BC9001|IT9001|BC7008|BC7010|BC708|BC728|BC7012|BC7030|BC7027|BC7026", "ChangJiaTablet": "TPC7102|TPC7103|TPC7105|TPC7106|TPC7107|TPC7201|TPC7203|TPC7205|TPC7210|TPC7708|TPC7709|TPC7712|TPC7110|TPC8101|TPC8103|TPC8105|TPC8106|TPC8203|TPC8205|TPC8503|TPC9106|TPC9701|TPC97101|TPC97103|TPC97105|TPC97106|TPC97111|TPC97113|TPC97203|TPC97603|TPC97809|TPC97205|TPC10101|TPC10103|TPC10106|TPC10111|TPC10203|TPC10205|TPC10503", "GUTablet": "TX-A1301|TX-M9002|Q702|kf026", "PointOfViewTablet": "TAB-P506|TAB-navi-7-3G-M|TAB-P517|TAB-P-527|TAB-P701|TAB-P703|TAB-P721|TAB-P731N|TAB-P741|TAB-P825|TAB-P905|TAB-P925|TAB-PR945|TAB-PL1015|TAB-P1025|TAB-PI1045|TAB-P1325|TAB-PROTAB[0-9]+|TAB-PROTAB25|TAB-PROTAB26|TAB-PROTAB27|TAB-PROTAB26XL|TAB-PROTAB2-IPS9|TAB-PROTAB30-IPS9|TAB-PROTAB25XXL|TAB-PROTAB26-IPS10|TAB-PROTAB30-IPS10", "OvermaxTablet": "OV-(SteelCore|NewBase|Basecore|Baseone|Exellen|Quattor|EduTab|Solution|ACTION|BasicTab|TeddyTab|MagicTab|Stream|TB-08|TB-09)", "HCLTablet": "HCL.*Tablet|Connect-3G-2.0|Connect-2G-2.0|ME Tablet U1|ME Tablet U2|ME Tablet G1|ME Tablet X1|ME Tablet Y2|ME Tablet Sync", "DPSTablet": "DPS Dream 9|DPS Dual 7", "VistureTablet": "V97 HD|i75 3G|Visture V4( HD)?|Visture V5( HD)?|Visture V10", "CrestaTablet": "CTP(-)?810|CTP(-)?818|CTP(-)?828|CTP(-)?838|CTP(-)?888|CTP(-)?978|CTP(-)?980|CTP(-)?987|CTP(-)?988|CTP(-)?989", "MediatekTablet": "\\bMT8125|MT8389|MT8135|MT8377\\b", "ConcordeTablet": "Concorde([ ]+)?Tab|ConCorde ReadMan", "GoCleverTablet": "GOCLEVER TAB|A7GOCLEVER|M1042|M7841|M742|R1042BK|R1041|TAB A975|TAB A7842|TAB A741|TAB A741L|TAB M723G|TAB M721|TAB A1021|TAB I921|TAB R721|TAB I720|TAB T76|TAB R70|TAB R76.2|TAB R106|TAB R83.2|TAB M813G|TAB I721|GCTA722|TAB I70|TAB I71|TAB S73|TAB R73|TAB R74|TAB R93|TAB R75|TAB R76.1|TAB A73|TAB A93|TAB A93.2|TAB T72|TAB R83|TAB R974|TAB R973|TAB A101|TAB A103|TAB A104|TAB A104.2|R105BK|M713G|A972BK|TAB A971|TAB R974.2|TAB R104|TAB R83.3|TAB A1042", "ModecomTablet": "FreeTAB 9000|FreeTAB 7.4|FreeTAB 7004|FreeTAB 7800|FreeTAB 2096|FreeTAB 7.5|FreeTAB 1014|FreeTAB 1001 |FreeTAB 8001|FreeTAB 9706|FreeTAB 9702|FreeTAB 7003|FreeTAB 7002|FreeTAB 1002|FreeTAB 7801|FreeTAB 1331|FreeTAB 1004|FreeTAB 8002|FreeTAB 8014|FreeTAB 9704|FreeTAB 1003", "VoninoTablet": "\\b(Argus[ _]?S|Diamond[ _]?79HD|Emerald[ _]?78E|Luna[ _]?70C|Onyx[ _]?S|Onyx[ _]?Z|Orin[ _]?HD|Orin[ _]?S|Otis[ _]?S|SpeedStar[ _]?S|Magnet[ _]?M9|Primus[ _]?94[ _]?3G|Primus[ _]?94HD|Primus[ _]?QS|Android.*\\bQ8\\b|Sirius[ _]?EVO[ _]?QS|Sirius[ _]?QS|Spirit[ _]?S)\\b", "ECSTablet": "V07OT2|TM105A|S10OT1|TR10CS1", "StorexTablet": "eZee[_']?(Tab|Go)[0-9]+|TabLC7|Looney Tunes Tab", "VodafoneTablet": "SmartTab([ ]+)?[0-9]+|SmartTabII10|SmartTabII7|VF-1497", "EssentielBTablet": "Smart[ ']?TAB[ ]+?[0-9]+|Family[ ']?TAB2", "RossMoorTablet": "RM-790|RM-997|RMD-878G|RMD-974R|RMT-705A|RMT-701|RME-601|RMT-501|RMT-711", "iMobileTablet": "i-mobile i-note", "TolinoTablet": "tolino tab [0-9.]+|tolino shine", "AudioSonicTablet": "\\bC-22Q|T7-QC|T-17B|T-17P\\b", "AMPETablet": "Android.* A78 ", "SkkTablet": "Android.* (SKYPAD|PHOENIX|CYCLOPS)", "TecnoTablet": "TECNO P9", "JXDTablet": "Android.* \\b(F3000|A3300|JXD5000|JXD3000|JXD2000|JXD300B|JXD300|S5800|S7800|S602b|S5110b|S7300|S5300|S602|S603|S5100|S5110|S601|S7100a|P3000F|P3000s|P101|P200s|P1000m|P200m|P9100|P1000s|S6600b|S908|P1000|P300|S18|S6600|S9100)\\b", "iJoyTablet": "Tablet (Spirit 7|Essentia|Galatea|Fusion|Onix 7|Landa|Titan|Scooby|Deox|Stella|Themis|Argon|Unique 7|Sygnus|Hexen|Finity 7|Cream|Cream X2|Jade|Neon 7|Neron 7|Kandy|Scape|Saphyr 7|Rebel|Biox|Rebel|Rebel 8GB|Myst|Draco 7|Myst|Tab7-004|Myst|Tadeo Jones|Tablet Boing|Arrow|Draco Dual Cam|Aurix|Mint|Amity|Revolution|Finity 9|Neon 9|T9w|Amity 4GB Dual Cam|Stone 4GB|Stone 8GB|Andromeda|Silken|X2|Andromeda II|Halley|Flame|Saphyr 9,7|Touch 8|Planet|Triton|Unique 10|Hexen 10|Memphis 4GB|Memphis 8GB|Onix 10)", "FX2Tablet": "FX2 PAD7|FX2 PAD10", "XoroTablet": "KidsPAD 701|PAD[ ]?712|PAD[ ]?714|PAD[ ]?716|PAD[ ]?717|PAD[ ]?718|PAD[ ]?720|PAD[ ]?721|PAD[ ]?722|PAD[ ]?790|PAD[ ]?792|PAD[ ]?900|PAD[ ]?9715D|PAD[ ]?9716DR|PAD[ ]?9718DR|PAD[ ]?9719QR|PAD[ ]?9720QR|TelePAD1030|Telepad1032|TelePAD730|TelePAD731|TelePAD732|TelePAD735Q|TelePAD830|TelePAD9730|TelePAD795|MegaPAD 1331|MegaPAD 1851|MegaPAD 2151", "ViewsonicTablet": "ViewPad 10pi|ViewPad 10e|ViewPad 10s|ViewPad E72|ViewPad7|ViewPad E100|ViewPad 7e|ViewSonic VB733|VB100a", "OdysTablet": "LOOX|XENO10|ODYS[ -](Space|EVO|Xpress|NOON)|\\bXELIO\\b|Xelio10Pro|XELIO7PHONETAB|XELIO10EXTREME|XELIOPT2|NEO_QUAD10", "CaptivaTablet": "CAPTIVA PAD", "IconbitTablet": "NetTAB|NT-3702|NT-3702S|NT-3702S|NT-3603P|NT-3603P|NT-0704S|NT-0704S|NT-3805C|NT-3805C|NT-0806C|NT-0806C|NT-0909T|NT-0909T|NT-0907S|NT-0907S|NT-0902S|NT-0902S", "TeclastTablet": "T98 4G|\\bP80\\b|\\bX90HD\\b|X98 Air|X98 Air 3G|\\bX89\\b|P80 3G|\\bX80h\\b|P98 Air|\\bX89HD\\b|P98 3G|\\bP90HD\\b|P89 3G|X98 3G|\\bP70h\\b|P79HD 3G|G18d 3G|\\bP79HD\\b|\\bP89s\\b|\\bA88\\b|\\bP10HD\\b|\\bP19HD\\b|G18 3G|\\bP78HD\\b|\\bA78\\b|\\bP75\\b|G17s 3G|G17h 3G|\\bP85t\\b|\\bP90\\b|\\bP11\\b|\\bP98t\\b|\\bP98HD\\b|\\bG18d\\b|\\bP85s\\b|\\bP11HD\\b|\\bP88s\\b|\\bA80HD\\b|\\bA80se\\b|\\bA10h\\b|\\bP89\\b|\\bP78s\\b|\\bG18\\b|\\bP85\\b|\\bA70h\\b|\\bA70\\b|\\bG17\\b|\\bP18\\b|\\bA80s\\b|\\bA11s\\b|\\bP88HD\\b|\\bA80h\\b|\\bP76s\\b|\\bP76h\\b|\\bP98\\b|\\bA10HD\\b|\\bP78\\b|\\bP88\\b|\\bA11\\b|\\bA10t\\b|\\bP76a\\b|\\bP76t\\b|\\bP76e\\b|\\bP85HD\\b|\\bP85a\\b|\\bP86\\b|\\bP75HD\\b|\\bP76v\\b|\\bA12\\b|\\bP75a\\b|\\bA15\\b|\\bP76Ti\\b|\\bP81HD\\b|\\bA10\\b|\\bT760VE\\b|\\bT720HD\\b|\\bP76\\b|\\bP73\\b|\\bP71\\b|\\bP72\\b|\\bT720SE\\b|\\bC520Ti\\b|\\bT760\\b|\\bT720VE\\b|T720-3GE|T720-WiFi", "OndaTablet": "\\b(V975i|Vi30|VX530|V701|Vi60|V701s|Vi50|V801s|V719|Vx610w|VX610W|V819i|Vi10|VX580W|Vi10|V711s|V813|V811|V820w|V820|Vi20|V711|VI30W|V712|V891w|V972|V819w|V820w|Vi60|V820w|V711|V813s|V801|V819|V975s|V801|V819|V819|V818|V811|V712|V975m|V101w|V961w|V812|V818|V971|V971s|V919|V989|V116w|V102w|V973|Vi40)\\b[\\s]+", "JaytechTablet": "TPC-PA762", "BlaupunktTablet": "Endeavour 800NG|Endeavour 1010", "DigmaTablet": "\\b(iDx10|iDx9|iDx8|iDx7|iDxD7|iDxD8|iDsQ8|iDsQ7|iDsQ8|iDsD10|iDnD7|3TS804H|iDsQ11|iDj7|iDs10)\\b", "EvolioTablet": "ARIA_Mini_wifi|Aria[ _]Mini|Evolio X10|Evolio X7|Evolio X8|\\bEvotab\\b|\\bNeura\\b", "LavaTablet": "QPAD E704|\\bIvoryS\\b|E-TAB IVORY|\\bE-TAB\\b", "AocTablet": "MW0811|MW0812|MW0922|MTK8382|MW1031|MW0831|MW0821|MW0931|MW0712", "MpmanTablet": "MP11 OCTA|MP10 OCTA|MPQC1114|MPQC1004|MPQC994|MPQC974|MPQC973|MPQC804|MPQC784|MPQC780|\\bMPG7\\b|MPDCG75|MPDCG71|MPDC1006|MP101DC|MPDC9000|MPDC905|MPDC706HD|MPDC706|MPDC705|MPDC110|MPDC100|MPDC99|MPDC97|MPDC88|MPDC8|MPDC77|MP709|MID701|MID711|MID170|MPDC703|MPQC1010", "CelkonTablet": "CT695|CT888|CT[\\s]?910|CT7 Tab|CT9 Tab|CT3 Tab|CT2 Tab|CT1 Tab|C820|C720|\\bCT-1\\b", "WolderTablet": "miTab \\b(DIAMOND|SPACE|BROOKLYN|NEO|FLY|MANHATTAN|FUNK|EVOLUTION|SKY|GOCAR|IRON|GENIUS|POP|MINT|EPSILON|BROADWAY|JUMP|HOP|LEGEND|NEW AGE|LINE|ADVANCE|FEEL|FOLLOW|LIKE|LINK|LIVE|THINK|FREEDOM|CHICAGO|CLEVELAND|BALTIMORE-GH|IOWA|BOSTON|SEATTLE|PHOENIX|DALLAS|IN 101|MasterChef)\\b", "MiTablet": "\\bMI PAD\\b|\\bHM NOTE 1W\\b", "NibiruTablet": "Nibiru M1|Nibiru Jupiter One", "NexoTablet": "NEXO NOVA|NEXO 10|NEXO AVIO|NEXO FREE|NEXO GO|NEXO EVO|NEXO 3G|NEXO SMART|NEXO KIDDO|NEXO MOBI", "LeaderTablet": "TBLT10Q|TBLT10I|TBL-10WDKB|TBL-10WDKBO2013|TBL-W230V2|TBL-W450|TBL-W500|SV572|TBLT7I|TBA-AC7-8G|TBLT79|TBL-8W16|TBL-10W32|TBL-10WKB|TBL-W100", "UbislateTablet": "UbiSlate[\\s]?7C", "PocketBookTablet": "Pocketbook", "KocasoTablet": "\\b(TB-1207)\\b", "Hudl": "Hudl HT7S3|Hudl 2", "TelstraTablet": "T-Hub2", "GenericTablet": "Android.*\\b97D\\b|Tablet(?!.*PC)|BNTV250A|MID-WCDMA|LogicPD Zoom2|\\bA7EB\\b|CatNova8|A1_07|CT704|CT1002|\\bM721\\b|rk30sdk|\\bEVOTAB\\b|M758A|ET904|ALUMIUM10|Smartfren Tab|Endeavour 1010|Tablet-PC-4|Tagi Tab|\\bM6pro\\b|CT1020W|arc 10HD|\\bJolla\\b|\\bTP750\\b" }, "oss": { "AndroidOS": "Android", "BlackBerryOS": "blackberry|\\bBB10\\b|rim tablet os", "PalmOS": "PalmOS|avantgo|blazer|elaine|hiptop|palm|plucker|xiino", "SymbianOS": "Symbian|SymbOS|Series60|Series40|SYB-[0-9]+|\\bS60\\b", "WindowsMobileOS": "Windows CE.*(PPC|Smartphone|Mobile|[0-9]{3}x[0-9]{3})|Window Mobile|Windows Phone [0-9.]+|WCE;", "WindowsPhoneOS": "Windows Phone 10.0|Windows Phone 8.1|Windows Phone 8.0|Windows Phone OS|XBLWP7|ZuneWP7|Windows NT 6.[23]; ARM;", "iOS": "\\biPhone.*Mobile|\\biPod|\\biPad", "MeeGoOS": "MeeGo", "MaemoOS": "Maemo", "JavaOS": "J2ME\/|\\bMIDP\\b|\\bCLDC\\b", "webOS": "webOS|hpwOS", "badaOS": "\\bBada\\b", "BREWOS": "BREW" }, "uas": { "Vivaldi": "Vivaldi", "Chrome": "\\bCrMo\\b|CriOS|Android.*Chrome\/[.0-9]* (Mobile)?", "Dolfin": "\\bDolfin\\b", "Opera": "Opera.*Mini|Opera.*Mobi|Android.*Opera|Mobile.*OPR\/[0-9.]+|Coast\/[0-9.]+", "Skyfire": "Skyfire", "Edge": "Mobile Safari\/[.0-9]* Edge", "IE": "IEMobile|MSIEMobile", "Firefox": "fennec|firefox.*maemo|(Mobile|Tablet).*Firefox|Firefox.*Mobile", "Bolt": "bolt", "TeaShark": "teashark", "Blazer": "Blazer", "Safari": "Version.*Mobile.*Safari|Safari.*Mobile|MobileSafari", "Tizen": "Tizen", "UCBrowser": "UC.*Browser|UCWEB", "baiduboxapp": "baiduboxapp", "baidubrowser": "baidubrowser", "DiigoBrowser": "DiigoBrowser", "Puffin": "Puffin", "Mercury": "\\bMercury\\b", "ObigoBrowser": "Obigo", "NetFront": "NF-Browser", "GenericBrowser": "NokiaBrowser|OviBrowser|OneBrowser|TwonkyBeamBrowser|SEMC.*Browser|FlyFlow|Minimo|NetFront|Novarra-Vision|MQQBrowser|MicroMessenger", "PaleMoon": "Android.*PaleMoon|Mobile.*PaleMoon" }, "props": { "Mobile": "Mobile\/[VER]", "Build": "Build\/[VER]", "Version": "Version\/[VER]", "VendorID": "VendorID\/[VER]", "iPad": "iPad.*CPU[a-z ]+[VER]", "iPhone": "iPhone.*CPU[a-z ]+[VER]", "iPod": "iPod.*CPU[a-z ]+[VER]", "Kindle": "Kindle\/[VER]", "Chrome": [ "Chrome\/[VER]", "CriOS\/[VER]", "CrMo\/[VER]" ], "Coast": [ "Coast\/[VER]" ], "Dolfin": "Dolfin\/[VER]", "Firefox": "Firefox\/[VER]", "Fennec": "Fennec\/[VER]", "Edge": "Edge\/[VER]", "IE": [ "IEMobile\/[VER];", "IEMobile [VER]", "MSIE [VER];", "Trident\/[0-9.]+;.*rv:[VER]" ], "NetFront": "NetFront\/[VER]", "NokiaBrowser": "NokiaBrowser\/[VER]", "Opera": [ " OPR\/[VER]", "Opera Mini\/[VER]", "Version\/[VER]" ], "Opera Mini": "Opera Mini\/[VER]", "Opera Mobi": "Version\/[VER]", "UC Browser": "UC Browser[VER]", "MQQBrowser": "MQQBrowser\/[VER]", "MicroMessenger": "MicroMessenger\/[VER]", "baiduboxapp": "baiduboxapp\/[VER]", "baidubrowser": "baidubrowser\/[VER]", "Iron": "Iron\/[VER]", "Safari": [ "Version\/[VER]", "Safari\/[VER]" ], "Skyfire": "Skyfire\/[VER]", "Tizen": "Tizen\/[VER]", "Webkit": "webkit[ \/][VER]", "PaleMoon": "PaleMoon\/[VER]", "Gecko": "Gecko\/[VER]", "Trident": "Trident\/[VER]", "Presto": "Presto\/[VER]", "Goanna": "Goanna\/[VER]", "iOS": " \\bi?OS\\b [VER][ ;]{1}", "Android": "Android [VER]", "BlackBerry": [ "BlackBerry[\\w]+\/[VER]", "BlackBerry.*Version\/[VER]", "Version\/[VER]" ], "BREW": "BREW [VER]", "Java": "Java\/[VER]", "Windows Phone OS": [ "Windows Phone OS [VER]", "Windows Phone [VER]" ], "Windows Phone": "Windows Phone [VER]", "Windows CE": "Windows CE\/[VER]", "Windows NT": "Windows NT [VER]", "Symbian": [ "SymbianOS\/[VER]", "Symbian\/[VER]" ], "webOS": [ "webOS\/[VER]", "hpwOS\/[VER];" ] }, "utils": { "Bot": "Googlebot|facebookexternalhit|AdsBot-Google|Google Keyword Suggestion|Facebot|YandexBot|bingbot|ia_archiver|AhrefsBot|Ezooms|GSLFbot|WBSearchBot|Twitterbot|TweetmemeBot|Twikle|PaperLiBot|Wotbox|UnwindFetchor|Exabot|MJ12bot|YandexImages|TurnitinBot|Pingdom", "MobileBot": "Googlebot-Mobile|AdsBot-Google-Mobile|YahooSeeker\/M1A1-R2D2", "DesktopMode": "WPDesktop", "TV": "SonyDTV|HbbTV", "WebKit": "(webkit)[ \/]([\\w.]+)", "Console": "\\b(Nintendo|Nintendo WiiU|Nintendo 3DS|PLAYSTATION|Xbox)\\b", "Watch": "SM-V700" }} : { phones: { iPhone: string; BlackBerry: string; HTC: string; Nexus: string; Dell: string; Motorola: string; Samsung: string; LG: string; Sony: string; Asus: string; NokiaLumia: string; Micromax: string; Palm: string; Vertu: string; Pantech: string; Fly: string; Wiko: string; iMobile: string; SimValley: string; Wolfgang: string; Alcatel: string; Nintendo: string; Amoi: string; INQ: string; GenericPhone: string; }; tablets: { iPad: string; NexusTablet: string; SamsungTablet: string; Kindle: string; SurfaceTablet: string; HPTablet: string; AsusTablet: string; BlackBerryTablet: string; HTCtablet: string; MotorolaTablet: string; NookTablet: string; AcerTablet: string; ToshibaTablet: string; LGTablet: string; FujitsuTablet: string; PrestigioTablet: string; LenovoTablet: string; DellTablet: string; YarvikTablet: string; MedionTablet: string; ArnovaTablet: string; IntensoTablet: string; IRUTablet: string; MegafonTablet: string; EbodaTablet: string; AllViewTablet: string; ArchosTablet: string; AinolTablet: string; NokiaLumiaTablet: string; SonyTablet: string; PhilipsTablet: string; CubeTablet: string; CobyTablet: string; MIDTablet: string; MSITablet: string; SMiTTablet: string; RockChipTablet: string; FlyTablet: string; bqTablet: string; HuaweiTablet: string; NecTablet: string; PantechTablet: string; BronchoTablet: string; VersusTablet: string; ZyncTablet: string; PositivoTablet: string; NabiTablet: string; KoboTablet: string; DanewTablet: string; TexetTablet: string; PlaystationTablet: string; TrekstorTablet: string; PyleAudioTablet: string; AdvanTablet: string; DanyTechTablet: string; GalapadTablet: string; MicromaxTablet: string; KarbonnTablet: string; AllFineTablet: string; PROSCANTablet: string; YONESTablet: string; ChangJiaTablet: string; GUTablet: string; PointOfViewTablet: string; OvermaxTablet: string; HCLTablet: string; DPSTablet: string; VistureTablet: string; CrestaTablet: string; MediatekTablet: string; ConcordeTablet: string; GoCleverTablet: string; ModecomTablet: string; VoninoTablet: string; ECSTablet: string; StorexTablet: string; VodafoneTablet: string; EssentielBTablet: string; RossMoorTablet: string; iMobileTablet: string; TolinoTablet: string; AudioSonicTablet: string; AMPETablet: string; SkkTablet: string; TecnoTablet: string; JXDTablet: string; iJoyTablet: string; FX2Tablet: string; XoroTablet: string; ViewsonicTablet: string; OdysTablet: string; CaptivaTablet: string; IconbitTablet: string; TeclastTablet: string; OndaTablet: string; JaytechTablet: string; BlaupunktTablet: string; DigmaTablet: string; EvolioTablet: string; LavaTablet: string; AocTablet: string; MpmanTablet: string; CelkonTablet: string; WolderTablet: string; MiTablet: string; NibiruTablet: string; NexoTablet: string; LeaderTablet: string; UbislateTablet: string; PocketBookTablet: string; KocasoTablet: string; Hudl: string; TelstraTablet: string; GenericTablet: string; }; oss: { AndroidOS: string; BlackBerryOS: string; PalmOS: string; SymbianOS: string; WindowsMobileOS: string; WindowsPhoneOS: string; iOS: string; MeeGoOS: string; MaemoOS: string; JavaOS: string; webOS: string; badaOS: string; BREWOS: string; }; uas: { Vivaldi: string; Chrome: string; Dolfin: string; Opera: string; Skyfire: string; Edge: string; IE: string; Firefox: string; Bolt: string; TeaShark: string; Blazer: string; Safari: string; Tizen: string; UCBrowser: string; baiduboxapp: string; baidubrowser: string; DiigoBrowser: string; Puffin: string; Mercury: string; ObigoBrowser: string; NetFront: string; GenericBrowser: string; PaleMoon: string; }; props: { Mobile: string; Build: string; Version: string; VendorID: string; iPad: string; iPhone: string; iPod: string; Kindle: string; Chrome: string[]; Coast: string[]; Dolfin: string; Firefox: string; Fennec: string; Edge: string; IE: string[]; NetFront: string; NokiaBrowser: string; Opera: string[]; "Opera Mini": string; "Opera Mobi": string; "UC Browser": string; MQQBrowser: string; MicroMessenger: string; baiduboxapp: string; baidubrowser: string; Iron: string; Safari: string[]; Skyfire: string; Tizen: string; Webkit: string; PaleMoon: string; Gecko: string; Trident: string; Presto: string; Goanna: string; iOS: string; Android: string; BlackBerry: string[]; BREW: string; Java: string; "Windows Phone OS": string[]; "Windows Phone": string; "Windows CE": string; "Windows NT": string; Symbian: string[]; webOS: string[]; }; utils: { Bot: string; MobileBot: string; DesktopMode: string; TV: string; WebKit: string; Console: string; Watch: string; }; } +>{ "phones": { "iPhone": "\\biPhone\\b|\\biPod\\b", "BlackBerry": "BlackBerry|\\bBB10\\b|rim[0-9]+", "HTC": "HTC|HTC.*(Sensation|Evo|Vision|Explorer|6800|8100|8900|A7272|S510e|C110e|Legend|Desire|T8282)|APX515CKT|Qtek9090|APA9292KT|HD_mini|Sensation.*Z710e|PG86100|Z715e|Desire.*(A8181|HD)|ADR6200|ADR6400L|ADR6425|001HT|Inspire 4G|Android.*\\bEVO\\b|T-Mobile G1|Z520m", "Nexus": "Nexus One|Nexus S|Galaxy.*Nexus|Android.*Nexus.*Mobile|Nexus 4|Nexus 5|Nexus 6", "Dell": "Dell.*Streak|Dell.*Aero|Dell.*Venue|DELL.*Venue Pro|Dell Flash|Dell Smoke|Dell Mini 3iX|XCD28|XCD35|\\b001DL\\b|\\b101DL\\b|\\bGS01\\b", "Motorola": "Motorola|DROIDX|DROID BIONIC|\\bDroid\\b.*Build|Android.*Xoom|HRI39|MOT-|A1260|A1680|A555|A853|A855|A953|A955|A956|Motorola.*ELECTRIFY|Motorola.*i1|i867|i940|MB200|MB300|MB501|MB502|MB508|MB511|MB520|MB525|MB526|MB611|MB612|MB632|MB810|MB855|MB860|MB861|MB865|MB870|ME501|ME502|ME511|ME525|ME600|ME632|ME722|ME811|ME860|ME863|ME865|MT620|MT710|MT716|MT720|MT810|MT870|MT917|Motorola.*TITANIUM|WX435|WX445|XT300|XT301|XT311|XT316|XT317|XT319|XT320|XT390|XT502|XT530|XT531|XT532|XT535|XT603|XT610|XT611|XT615|XT681|XT701|XT702|XT711|XT720|XT800|XT806|XT860|XT862|XT875|XT882|XT883|XT894|XT901|XT907|XT909|XT910|XT912|XT928|XT926|XT915|XT919|XT925|XT1021|\\bMoto E\\b", "Samsung": "Samsung|SM-G9250|GT-19300|SGH-I337|BGT-S5230|GT-B2100|GT-B2700|GT-B2710|GT-B3210|GT-B3310|GT-B3410|GT-B3730|GT-B3740|GT-B5510|GT-B5512|GT-B5722|GT-B6520|GT-B7300|GT-B7320|GT-B7330|GT-B7350|GT-B7510|GT-B7722|GT-B7800|GT-C3010|GT-C3011|GT-C3060|GT-C3200|GT-C3212|GT-C3212I|GT-C3262|GT-C3222|GT-C3300|GT-C3300K|GT-C3303|GT-C3303K|GT-C3310|GT-C3322|GT-C3330|GT-C3350|GT-C3500|GT-C3510|GT-C3530|GT-C3630|GT-C3780|GT-C5010|GT-C5212|GT-C6620|GT-C6625|GT-C6712|GT-E1050|GT-E1070|GT-E1075|GT-E1080|GT-E1081|GT-E1085|GT-E1087|GT-E1100|GT-E1107|GT-E1110|GT-E1120|GT-E1125|GT-E1130|GT-E1160|GT-E1170|GT-E1175|GT-E1180|GT-E1182|GT-E1200|GT-E1210|GT-E1225|GT-E1230|GT-E1390|GT-E2100|GT-E2120|GT-E2121|GT-E2152|GT-E2220|GT-E2222|GT-E2230|GT-E2232|GT-E2250|GT-E2370|GT-E2550|GT-E2652|GT-E3210|GT-E3213|GT-I5500|GT-I5503|GT-I5700|GT-I5800|GT-I5801|GT-I6410|GT-I6420|GT-I7110|GT-I7410|GT-I7500|GT-I8000|GT-I8150|GT-I8160|GT-I8190|GT-I8320|GT-I8330|GT-I8350|GT-I8530|GT-I8700|GT-I8703|GT-I8910|GT-I9000|GT-I9001|GT-I9003|GT-I9010|GT-I9020|GT-I9023|GT-I9070|GT-I9082|GT-I9100|GT-I9103|GT-I9220|GT-I9250|GT-I9300|GT-I9305|GT-I9500|GT-I9505|GT-M3510|GT-M5650|GT-M7500|GT-M7600|GT-M7603|GT-M8800|GT-M8910|GT-N7000|GT-S3110|GT-S3310|GT-S3350|GT-S3353|GT-S3370|GT-S3650|GT-S3653|GT-S3770|GT-S3850|GT-S5210|GT-S5220|GT-S5229|GT-S5230|GT-S5233|GT-S5250|GT-S5253|GT-S5260|GT-S5263|GT-S5270|GT-S5300|GT-S5330|GT-S5350|GT-S5360|GT-S5363|GT-S5369|GT-S5380|GT-S5380D|GT-S5560|GT-S5570|GT-S5600|GT-S5603|GT-S5610|GT-S5620|GT-S5660|GT-S5670|GT-S5690|GT-S5750|GT-S5780|GT-S5830|GT-S5839|GT-S6102|GT-S6500|GT-S7070|GT-S7200|GT-S7220|GT-S7230|GT-S7233|GT-S7250|GT-S7500|GT-S7530|GT-S7550|GT-S7562|GT-S7710|GT-S8000|GT-S8003|GT-S8500|GT-S8530|GT-S8600|SCH-A310|SCH-A530|SCH-A570|SCH-A610|SCH-A630|SCH-A650|SCH-A790|SCH-A795|SCH-A850|SCH-A870|SCH-A890|SCH-A930|SCH-A950|SCH-A970|SCH-A990|SCH-I100|SCH-I110|SCH-I400|SCH-I405|SCH-I500|SCH-I510|SCH-I515|SCH-I600|SCH-I730|SCH-I760|SCH-I770|SCH-I830|SCH-I910|SCH-I920|SCH-I959|SCH-LC11|SCH-N150|SCH-N300|SCH-R100|SCH-R300|SCH-R351|SCH-R400|SCH-R410|SCH-T300|SCH-U310|SCH-U320|SCH-U350|SCH-U360|SCH-U365|SCH-U370|SCH-U380|SCH-U410|SCH-U430|SCH-U450|SCH-U460|SCH-U470|SCH-U490|SCH-U540|SCH-U550|SCH-U620|SCH-U640|SCH-U650|SCH-U660|SCH-U700|SCH-U740|SCH-U750|SCH-U810|SCH-U820|SCH-U900|SCH-U940|SCH-U960|SCS-26UC|SGH-A107|SGH-A117|SGH-A127|SGH-A137|SGH-A157|SGH-A167|SGH-A177|SGH-A187|SGH-A197|SGH-A227|SGH-A237|SGH-A257|SGH-A437|SGH-A517|SGH-A597|SGH-A637|SGH-A657|SGH-A667|SGH-A687|SGH-A697|SGH-A707|SGH-A717|SGH-A727|SGH-A737|SGH-A747|SGH-A767|SGH-A777|SGH-A797|SGH-A817|SGH-A827|SGH-A837|SGH-A847|SGH-A867|SGH-A877|SGH-A887|SGH-A897|SGH-A927|SGH-B100|SGH-B130|SGH-B200|SGH-B220|SGH-C100|SGH-C110|SGH-C120|SGH-C130|SGH-C140|SGH-C160|SGH-C170|SGH-C180|SGH-C200|SGH-C207|SGH-C210|SGH-C225|SGH-C230|SGH-C417|SGH-C450|SGH-D307|SGH-D347|SGH-D357|SGH-D407|SGH-D415|SGH-D780|SGH-D807|SGH-D980|SGH-E105|SGH-E200|SGH-E315|SGH-E316|SGH-E317|SGH-E335|SGH-E590|SGH-E635|SGH-E715|SGH-E890|SGH-F300|SGH-F480|SGH-I200|SGH-I300|SGH-I320|SGH-I550|SGH-I577|SGH-I600|SGH-I607|SGH-I617|SGH-I627|SGH-I637|SGH-I677|SGH-I700|SGH-I717|SGH-I727|SGH-i747M|SGH-I777|SGH-I780|SGH-I827|SGH-I847|SGH-I857|SGH-I896|SGH-I897|SGH-I900|SGH-I907|SGH-I917|SGH-I927|SGH-I937|SGH-I997|SGH-J150|SGH-J200|SGH-L170|SGH-L700|SGH-M110|SGH-M150|SGH-M200|SGH-N105|SGH-N500|SGH-N600|SGH-N620|SGH-N625|SGH-N700|SGH-N710|SGH-P107|SGH-P207|SGH-P300|SGH-P310|SGH-P520|SGH-P735|SGH-P777|SGH-Q105|SGH-R210|SGH-R220|SGH-R225|SGH-S105|SGH-S307|SGH-T109|SGH-T119|SGH-T139|SGH-T209|SGH-T219|SGH-T229|SGH-T239|SGH-T249|SGH-T259|SGH-T309|SGH-T319|SGH-T329|SGH-T339|SGH-T349|SGH-T359|SGH-T369|SGH-T379|SGH-T409|SGH-T429|SGH-T439|SGH-T459|SGH-T469|SGH-T479|SGH-T499|SGH-T509|SGH-T519|SGH-T539|SGH-T559|SGH-T589|SGH-T609|SGH-T619|SGH-T629|SGH-T639|SGH-T659|SGH-T669|SGH-T679|SGH-T709|SGH-T719|SGH-T729|SGH-T739|SGH-T746|SGH-T749|SGH-T759|SGH-T769|SGH-T809|SGH-T819|SGH-T839|SGH-T919|SGH-T929|SGH-T939|SGH-T959|SGH-T989|SGH-U100|SGH-U200|SGH-U800|SGH-V205|SGH-V206|SGH-X100|SGH-X105|SGH-X120|SGH-X140|SGH-X426|SGH-X427|SGH-X475|SGH-X495|SGH-X497|SGH-X507|SGH-X600|SGH-X610|SGH-X620|SGH-X630|SGH-X700|SGH-X820|SGH-X890|SGH-Z130|SGH-Z150|SGH-Z170|SGH-ZX10|SGH-ZX20|SHW-M110|SPH-A120|SPH-A400|SPH-A420|SPH-A460|SPH-A500|SPH-A560|SPH-A600|SPH-A620|SPH-A660|SPH-A700|SPH-A740|SPH-A760|SPH-A790|SPH-A800|SPH-A820|SPH-A840|SPH-A880|SPH-A900|SPH-A940|SPH-A960|SPH-D600|SPH-D700|SPH-D710|SPH-D720|SPH-I300|SPH-I325|SPH-I330|SPH-I350|SPH-I500|SPH-I600|SPH-I700|SPH-L700|SPH-M100|SPH-M220|SPH-M240|SPH-M300|SPH-M305|SPH-M320|SPH-M330|SPH-M350|SPH-M360|SPH-M370|SPH-M380|SPH-M510|SPH-M540|SPH-M550|SPH-M560|SPH-M570|SPH-M580|SPH-M610|SPH-M620|SPH-M630|SPH-M800|SPH-M810|SPH-M850|SPH-M900|SPH-M910|SPH-M920|SPH-M930|SPH-N100|SPH-N200|SPH-N240|SPH-N300|SPH-N400|SPH-Z400|SWC-E100|SCH-i909|GT-N7100|GT-N7105|SCH-I535|SM-N900A|SGH-I317|SGH-T999L|GT-S5360B|GT-I8262|GT-S6802|GT-S6312|GT-S6310|GT-S5312|GT-S5310|GT-I9105|GT-I8510|GT-S6790N|SM-G7105|SM-N9005|GT-S5301|GT-I9295|GT-I9195|SM-C101|GT-S7392|GT-S7560|GT-B7610|GT-I5510|GT-S7582|GT-S7530E|GT-I8750|SM-G9006V|SM-G9008V|SM-G9009D|SM-G900A|SM-G900D|SM-G900F|SM-G900H|SM-G900I|SM-G900J|SM-G900K|SM-G900L|SM-G900M|SM-G900P|SM-G900R4|SM-G900S|SM-G900T|SM-G900V|SM-G900W8|SHV-E160K|SCH-P709|SCH-P729|SM-T2558|GT-I9205|SM-G9350|SM-J120F", "LG": "\\bLG\\b;|LG[- ]?(C800|C900|E400|E610|E900|E-900|F160|F180K|F180L|F180S|730|855|L160|LS740|LS840|LS970|LU6200|MS690|MS695|MS770|MS840|MS870|MS910|P500|P700|P705|VM696|AS680|AS695|AX840|C729|E970|GS505|272|C395|E739BK|E960|L55C|L75C|LS696|LS860|P769BK|P350|P500|P509|P870|UN272|US730|VS840|VS950|LN272|LN510|LS670|LS855|LW690|MN270|MN510|P509|P769|P930|UN200|UN270|UN510|UN610|US670|US740|US760|UX265|UX840|VN271|VN530|VS660|VS700|VS740|VS750|VS910|VS920|VS930|VX9200|VX11000|AX840A|LW770|P506|P925|P999|E612|D955|D802|MS323)", "Sony": "SonyST|SonyLT|SonyEricsson|SonyEricssonLT15iv|LT18i|E10i|LT28h|LT26w|SonyEricssonMT27i|C5303|C6902|C6903|C6906|C6943|D2533", "Asus": "Asus.*Galaxy|PadFone.*Mobile", "NokiaLumia": "Lumia [0-9]{3,4}", "Micromax": "Micromax.*\\b(A210|A92|A88|A72|A111|A110Q|A115|A116|A110|A90S|A26|A51|A35|A54|A25|A27|A89|A68|A65|A57|A90)\\b", "Palm": "PalmSource|Palm", "Vertu": "Vertu|Vertu.*Ltd|Vertu.*Ascent|Vertu.*Ayxta|Vertu.*Constellation(F|Quest)?|Vertu.*Monika|Vertu.*Signature", "Pantech": "PANTECH|IM-A850S|IM-A840S|IM-A830L|IM-A830K|IM-A830S|IM-A820L|IM-A810K|IM-A810S|IM-A800S|IM-T100K|IM-A725L|IM-A780L|IM-A775C|IM-A770K|IM-A760S|IM-A750K|IM-A740S|IM-A730S|IM-A720L|IM-A710K|IM-A690L|IM-A690S|IM-A650S|IM-A630K|IM-A600S|VEGA PTL21|PT003|P8010|ADR910L|P6030|P6020|P9070|P4100|P9060|P5000|CDM8992|TXT8045|ADR8995|IS11PT|P2030|P6010|P8000|PT002|IS06|CDM8999|P9050|PT001|TXT8040|P2020|P9020|P2000|P7040|P7000|C790", "Fly": "IQ230|IQ444|IQ450|IQ440|IQ442|IQ441|IQ245|IQ256|IQ236|IQ255|IQ235|IQ245|IQ275|IQ240|IQ285|IQ280|IQ270|IQ260|IQ250", "Wiko": "KITE 4G|HIGHWAY|GETAWAY|STAIRWAY|DARKSIDE|DARKFULL|DARKNIGHT|DARKMOON|SLIDE|WAX 4G|RAINBOW|BLOOM|SUNSET|GOA(?!nna)|LENNY|BARRY|IGGY|OZZY|CINK FIVE|CINK PEAX|CINK PEAX 2|CINK SLIM|CINK SLIM 2|CINK +|CINK KING|CINK PEAX|CINK SLIM|SUBLIM", "iMobile": "i-mobile (IQ|i-STYLE|idea|ZAA|Hitz)", "SimValley": "\\b(SP-80|XT-930|SX-340|XT-930|SX-310|SP-360|SP60|SPT-800|SP-120|SPT-800|SP-140|SPX-5|SPX-8|SP-100|SPX-8|SPX-12)\\b", "Wolfgang": "AT-B24D|AT-AS50HD|AT-AS40W|AT-AS55HD|AT-AS45q2|AT-B26D|AT-AS50Q", "Alcatel": "Alcatel", "Nintendo": "Nintendo 3DS", "Amoi": "Amoi", "INQ": "INQ", "GenericPhone": "Tapatalk|PDA;|SAGEM|\\bmmp\\b|pocket|\\bpsp\\b|symbian|Smartphone|smartfon|treo|up.browser|up.link|vodafone|\\bwap\\b|nokia|Series40|Series60|S60|SonyEricsson|N900|MAUI.*WAP.*Browser" }, "tablets": { "iPad": "iPad|iPad.*Mobile", "NexusTablet": "Android.*Nexus[\\s]+(7|9|10)", "SamsungTablet": "SAMSUNG.*Tablet|Galaxy.*Tab|SC-01C|GT-P1000|GT-P1003|GT-P1010|GT-P3105|GT-P6210|GT-P6800|GT-P6810|GT-P7100|GT-P7300|GT-P7310|GT-P7500|GT-P7510|SCH-I800|SCH-I815|SCH-I905|SGH-I957|SGH-I987|SGH-T849|SGH-T859|SGH-T869|SPH-P100|GT-P3100|GT-P3108|GT-P3110|GT-P5100|GT-P5110|GT-P6200|GT-P7320|GT-P7511|GT-N8000|GT-P8510|SGH-I497|SPH-P500|SGH-T779|SCH-I705|SCH-I915|GT-N8013|GT-P3113|GT-P5113|GT-P8110|GT-N8010|GT-N8005|GT-N8020|GT-P1013|GT-P6201|GT-P7501|GT-N5100|GT-N5105|GT-N5110|SHV-E140K|SHV-E140L|SHV-E140S|SHV-E150S|SHV-E230K|SHV-E230L|SHV-E230S|SHW-M180K|SHW-M180L|SHW-M180S|SHW-M180W|SHW-M300W|SHW-M305W|SHW-M380K|SHW-M380S|SHW-M380W|SHW-M430W|SHW-M480K|SHW-M480S|SHW-M480W|SHW-M485W|SHW-M486W|SHW-M500W|GT-I9228|SCH-P739|SCH-I925|GT-I9200|GT-P5200|GT-P5210|GT-P5210X|SM-T311|SM-T310|SM-T310X|SM-T210|SM-T210R|SM-T211|SM-P600|SM-P601|SM-P605|SM-P900|SM-P901|SM-T217|SM-T217A|SM-T217S|SM-P6000|SM-T3100|SGH-I467|XE500|SM-T110|GT-P5220|GT-I9200X|GT-N5110X|GT-N5120|SM-P905|SM-T111|SM-T2105|SM-T315|SM-T320|SM-T320X|SM-T321|SM-T520|SM-T525|SM-T530NU|SM-T230NU|SM-T330NU|SM-T900|XE500T1C|SM-P605V|SM-P905V|SM-T337V|SM-T537V|SM-T707V|SM-T807V|SM-P600X|SM-P900X|SM-T210X|SM-T230|SM-T230X|SM-T325|GT-P7503|SM-T531|SM-T330|SM-T530|SM-T705|SM-T705C|SM-T535|SM-T331|SM-T800|SM-T700|SM-T537|SM-T807|SM-P907A|SM-T337A|SM-T537A|SM-T707A|SM-T807A|SM-T237|SM-T807P|SM-P607T|SM-T217T|SM-T337T|SM-T807T|SM-T116NQ|SM-P550|SM-T350|SM-T550|SM-T9000|SM-P9000|SM-T705Y|SM-T805|GT-P3113|SM-T710|SM-T810|SM-T815|SM-T360|SM-T533|SM-T113|SM-T335|SM-T715|SM-T560|SM-T670|SM-T677|SM-T377|SM-T567|SM-T357T|SM-T555|SM-T561", "Kindle": "Kindle|Silk.*Accelerated|Android.*\\b(KFOT|KFTT|KFJWI|KFJWA|KFOTE|KFSOWI|KFTHWI|KFTHWA|KFAPWI|KFAPWA|WFJWAE|KFSAWA|KFSAWI|KFASWI|KFARWI)\\b", "SurfaceTablet": "Windows NT [0-9.]+; ARM;.*(Tablet|ARMBJS)", "HPTablet": "HP Slate (7|8|10)|HP ElitePad 900|hp-tablet|EliteBook.*Touch|HP 8|Slate 21|HP SlateBook 10", "AsusTablet": "^.*PadFone((?!Mobile).)*$|Transformer|TF101|TF101G|TF300T|TF300TG|TF300TL|TF700T|TF700KL|TF701T|TF810C|ME171|ME301T|ME302C|ME371MG|ME370T|ME372MG|ME172V|ME173X|ME400C|Slider SL101|\\bK00F\\b|\\bK00C\\b|\\bK00E\\b|\\bK00L\\b|TX201LA|ME176C|ME102A|\\bM80TA\\b|ME372CL|ME560CG|ME372CG|ME302KL| K010 | K017 |ME572C|ME103K|ME170C|ME171C|\\bME70C\\b|ME581C|ME581CL|ME8510C|ME181C|P01Y|PO1MA", "BlackBerryTablet": "PlayBook|RIM Tablet", "HTCtablet": "HTC_Flyer_P512|HTC Flyer|HTC Jetstream|HTC-P715a|HTC EVO View 4G|PG41200|PG09410", "MotorolaTablet": "xoom|sholest|MZ615|MZ605|MZ505|MZ601|MZ602|MZ603|MZ604|MZ606|MZ607|MZ608|MZ609|MZ615|MZ616|MZ617", "NookTablet": "Android.*Nook|NookColor|nook browser|BNRV200|BNRV200A|BNTV250|BNTV250A|BNTV400|BNTV600|LogicPD Zoom2", "AcerTablet": "Android.*; \\b(A100|A101|A110|A200|A210|A211|A500|A501|A510|A511|A700|A701|W500|W500P|W501|W501P|W510|W511|W700|G100|G100W|B1-A71|B1-710|B1-711|A1-810|A1-811|A1-830)\\b|W3-810|\\bA3-A10\\b|\\bA3-A11\\b|\\bA3-A20", "ToshibaTablet": "Android.*(AT100|AT105|AT200|AT205|AT270|AT275|AT300|AT305|AT1S5|AT500|AT570|AT700|AT830)|TOSHIBA.*FOLIO", "LGTablet": "\\bL-06C|LG-V909|LG-V900|LG-V700|LG-V510|LG-V500|LG-V410|LG-V400|LG-VK810\\b", "FujitsuTablet": "Android.*\\b(F-01D|F-02F|F-05E|F-10D|M532|Q572)\\b", "PrestigioTablet": "PMP3170B|PMP3270B|PMP3470B|PMP7170B|PMP3370B|PMP3570C|PMP5870C|PMP3670B|PMP5570C|PMP5770D|PMP3970B|PMP3870C|PMP5580C|PMP5880D|PMP5780D|PMP5588C|PMP7280C|PMP7280C3G|PMP7280|PMP7880D|PMP5597D|PMP5597|PMP7100D|PER3464|PER3274|PER3574|PER3884|PER5274|PER5474|PMP5097CPRO|PMP5097|PMP7380D|PMP5297C|PMP5297C_QUAD|PMP812E|PMP812E3G|PMP812F|PMP810E|PMP880TD|PMT3017|PMT3037|PMT3047|PMT3057|PMT7008|PMT5887|PMT5001|PMT5002", "LenovoTablet": "Lenovo TAB|Idea(Tab|Pad)( A1|A10| K1|)|ThinkPad([ ]+)?Tablet|YT3-X90L|YT3-X90F|YT3-X90X|Lenovo.*(S2109|S2110|S5000|S6000|K3011|A3000|A3500|A1000|A2107|A2109|A1107|A5500|A7600|B6000|B8000|B8080)(-|)(FL|F|HV|H|)", "DellTablet": "Venue 11|Venue 8|Venue 7|Dell Streak 10|Dell Streak 7", "YarvikTablet": "Android.*\\b(TAB210|TAB211|TAB224|TAB250|TAB260|TAB264|TAB310|TAB360|TAB364|TAB410|TAB411|TAB420|TAB424|TAB450|TAB460|TAB461|TAB464|TAB465|TAB467|TAB468|TAB07-100|TAB07-101|TAB07-150|TAB07-151|TAB07-152|TAB07-200|TAB07-201-3G|TAB07-210|TAB07-211|TAB07-212|TAB07-214|TAB07-220|TAB07-400|TAB07-485|TAB08-150|TAB08-200|TAB08-201-3G|TAB08-201-30|TAB09-100|TAB09-211|TAB09-410|TAB10-150|TAB10-201|TAB10-211|TAB10-400|TAB10-410|TAB13-201|TAB274EUK|TAB275EUK|TAB374EUK|TAB462EUK|TAB474EUK|TAB9-200)\\b", "MedionTablet": "Android.*\\bOYO\\b|LIFE.*(P9212|P9514|P9516|S9512)|LIFETAB", "ArnovaTablet": "AN10G2|AN7bG3|AN7fG3|AN8G3|AN8cG3|AN7G3|AN9G3|AN7dG3|AN7dG3ST|AN7dG3ChildPad|AN10bG3|AN10bG3DT|AN9G2", "IntensoTablet": "INM8002KP|INM1010FP|INM805ND|Intenso Tab|TAB1004", "IRUTablet": "M702pro", "MegafonTablet": "MegaFon V9|\\bZTE V9\\b|Android.*\\bMT7A\\b", "EbodaTablet": "E-Boda (Supreme|Impresspeed|Izzycomm|Essential)", "AllViewTablet": "Allview.*(Viva|Alldro|City|Speed|All TV|Frenzy|Quasar|Shine|TX1|AX1|AX2)", "ArchosTablet": "\\b(101G9|80G9|A101IT)\\b|Qilive 97R|Archos5|\\bARCHOS (70|79|80|90|97|101|FAMILYPAD|)(b|)(G10| Cobalt| TITANIUM(HD|)| Xenon| Neon|XSK| 2| XS 2| PLATINUM| CARBON|GAMEPAD)\\b", "AinolTablet": "NOVO7|NOVO8|NOVO10|Novo7Aurora|Novo7Basic|NOVO7PALADIN|novo9-Spark", "NokiaLumiaTablet": "Lumia 2520", "SonyTablet": "Sony.*Tablet|Xperia Tablet|Sony Tablet S|SO-03E|SGPT12|SGPT13|SGPT114|SGPT121|SGPT122|SGPT123|SGPT111|SGPT112|SGPT113|SGPT131|SGPT132|SGPT133|SGPT211|SGPT212|SGPT213|SGP311|SGP312|SGP321|EBRD1101|EBRD1102|EBRD1201|SGP351|SGP341|SGP511|SGP512|SGP521|SGP541|SGP551|SGP621|SGP612|SOT31", "PhilipsTablet": "\\b(PI2010|PI3000|PI3100|PI3105|PI3110|PI3205|PI3210|PI3900|PI4010|PI7000|PI7100)\\b", "CubeTablet": "Android.*(K8GT|U9GT|U10GT|U16GT|U17GT|U18GT|U19GT|U20GT|U23GT|U30GT)|CUBE U8GT", "CobyTablet": "MID1042|MID1045|MID1125|MID1126|MID7012|MID7014|MID7015|MID7034|MID7035|MID7036|MID7042|MID7048|MID7127|MID8042|MID8048|MID8127|MID9042|MID9740|MID9742|MID7022|MID7010", "MIDTablet": "M9701|M9000|M9100|M806|M1052|M806|T703|MID701|MID713|MID710|MID727|MID760|MID830|MID728|MID933|MID125|MID810|MID732|MID120|MID930|MID800|MID731|MID900|MID100|MID820|MID735|MID980|MID130|MID833|MID737|MID960|MID135|MID860|MID736|MID140|MID930|MID835|MID733|MID4X10", "MSITablet": "MSI \\b(Primo 73K|Primo 73L|Primo 81L|Primo 77|Primo 93|Primo 75|Primo 76|Primo 73|Primo 81|Primo 91|Primo 90|Enjoy 71|Enjoy 7|Enjoy 10)\\b", "SMiTTablet": "Android.*(\\bMID\\b|MID-560|MTV-T1200|MTV-PND531|MTV-P1101|MTV-PND530)", "RockChipTablet": "Android.*(RK2818|RK2808A|RK2918|RK3066)|RK2738|RK2808A", "FlyTablet": "IQ310|Fly Vision", "bqTablet": "Android.*(bq)?.*(Elcano|Curie|Edison|Maxwell|Kepler|Pascal|Tesla|Hypatia|Platon|Newton|Livingstone|Cervantes|Avant|Aquaris E10)|Maxwell.*Lite|Maxwell.*Plus", "HuaweiTablet": "MediaPad|MediaPad 7 Youth|IDEOS S7|S7-201c|S7-202u|S7-101|S7-103|S7-104|S7-105|S7-106|S7-201|S7-Slim", "NecTablet": "\\bN-06D|\\bN-08D", "PantechTablet": "Pantech.*P4100", "BronchoTablet": "Broncho.*(N701|N708|N802|a710)", "VersusTablet": "TOUCHPAD.*[78910]|\\bTOUCHTAB\\b", "ZyncTablet": "z1000|Z99 2G|z99|z930|z999|z990|z909|Z919|z900", "PositivoTablet": "TB07STA|TB10STA|TB07FTA|TB10FTA", "NabiTablet": "Android.*\\bNabi", "KoboTablet": "Kobo Touch|\\bK080\\b|\\bVox\\b Build|\\bArc\\b Build", "DanewTablet": "DSlide.*\\b(700|701R|702|703R|704|802|970|971|972|973|974|1010|1012)\\b", "TexetTablet": "NaviPad|TB-772A|TM-7045|TM-7055|TM-9750|TM-7016|TM-7024|TM-7026|TM-7041|TM-7043|TM-7047|TM-8041|TM-9741|TM-9747|TM-9748|TM-9751|TM-7022|TM-7021|TM-7020|TM-7011|TM-7010|TM-7023|TM-7025|TM-7037W|TM-7038W|TM-7027W|TM-9720|TM-9725|TM-9737W|TM-1020|TM-9738W|TM-9740|TM-9743W|TB-807A|TB-771A|TB-727A|TB-725A|TB-719A|TB-823A|TB-805A|TB-723A|TB-715A|TB-707A|TB-705A|TB-709A|TB-711A|TB-890HD|TB-880HD|TB-790HD|TB-780HD|TB-770HD|TB-721HD|TB-710HD|TB-434HD|TB-860HD|TB-840HD|TB-760HD|TB-750HD|TB-740HD|TB-730HD|TB-722HD|TB-720HD|TB-700HD|TB-500HD|TB-470HD|TB-431HD|TB-430HD|TB-506|TB-504|TB-446|TB-436|TB-416|TB-146SE|TB-126SE", "PlaystationTablet": "Playstation.*(Portable|Vita)", "TrekstorTablet": "ST10416-1|VT10416-1|ST70408-1|ST702xx-1|ST702xx-2|ST80208|ST97216|ST70104-2|VT10416-2|ST10216-2A|SurfTab", "PyleAudioTablet": "\\b(PTBL10CEU|PTBL10C|PTBL72BC|PTBL72BCEU|PTBL7CEU|PTBL7C|PTBL92BC|PTBL92BCEU|PTBL9CEU|PTBL9CUK|PTBL9C)\\b", "AdvanTablet": "Android.* \\b(E3A|T3X|T5C|T5B|T3E|T3C|T3B|T1J|T1F|T2A|T1H|T1i|E1C|T1-E|T5-A|T4|E1-B|T2Ci|T1-B|T1-D|O1-A|E1-A|T1-A|T3A|T4i)\\b ", "DanyTechTablet": "Genius Tab G3|Genius Tab S2|Genius Tab Q3|Genius Tab G4|Genius Tab Q4|Genius Tab G-II|Genius TAB GII|Genius TAB GIII|Genius Tab S1", "GalapadTablet": "Android.*\\bG1\\b", "MicromaxTablet": "Funbook|Micromax.*\\b(P250|P560|P360|P362|P600|P300|P350|P500|P275)\\b", "KarbonnTablet": "Android.*\\b(A39|A37|A34|ST8|ST10|ST7|Smart Tab3|Smart Tab2)\\b", "AllFineTablet": "Fine7 Genius|Fine7 Shine|Fine7 Air|Fine8 Style|Fine9 More|Fine10 Joy|Fine11 Wide", "PROSCANTablet": "\\b(PEM63|PLT1023G|PLT1041|PLT1044|PLT1044G|PLT1091|PLT4311|PLT4311PL|PLT4315|PLT7030|PLT7033|PLT7033D|PLT7035|PLT7035D|PLT7044K|PLT7045K|PLT7045KB|PLT7071KG|PLT7072|PLT7223G|PLT7225G|PLT7777G|PLT7810K|PLT7849G|PLT7851G|PLT7852G|PLT8015|PLT8031|PLT8034|PLT8036|PLT8080K|PLT8082|PLT8088|PLT8223G|PLT8234G|PLT8235G|PLT8816K|PLT9011|PLT9045K|PLT9233G|PLT9735|PLT9760G|PLT9770G)\\b", "YONESTablet": "BQ1078|BC1003|BC1077|RK9702|BC9730|BC9001|IT9001|BC7008|BC7010|BC708|BC728|BC7012|BC7030|BC7027|BC7026", "ChangJiaTablet": "TPC7102|TPC7103|TPC7105|TPC7106|TPC7107|TPC7201|TPC7203|TPC7205|TPC7210|TPC7708|TPC7709|TPC7712|TPC7110|TPC8101|TPC8103|TPC8105|TPC8106|TPC8203|TPC8205|TPC8503|TPC9106|TPC9701|TPC97101|TPC97103|TPC97105|TPC97106|TPC97111|TPC97113|TPC97203|TPC97603|TPC97809|TPC97205|TPC10101|TPC10103|TPC10106|TPC10111|TPC10203|TPC10205|TPC10503", "GUTablet": "TX-A1301|TX-M9002|Q702|kf026", "PointOfViewTablet": "TAB-P506|TAB-navi-7-3G-M|TAB-P517|TAB-P-527|TAB-P701|TAB-P703|TAB-P721|TAB-P731N|TAB-P741|TAB-P825|TAB-P905|TAB-P925|TAB-PR945|TAB-PL1015|TAB-P1025|TAB-PI1045|TAB-P1325|TAB-PROTAB[0-9]+|TAB-PROTAB25|TAB-PROTAB26|TAB-PROTAB27|TAB-PROTAB26XL|TAB-PROTAB2-IPS9|TAB-PROTAB30-IPS9|TAB-PROTAB25XXL|TAB-PROTAB26-IPS10|TAB-PROTAB30-IPS10", "OvermaxTablet": "OV-(SteelCore|NewBase|Basecore|Baseone|Exellen|Quattor|EduTab|Solution|ACTION|BasicTab|TeddyTab|MagicTab|Stream|TB-08|TB-09)", "HCLTablet": "HCL.*Tablet|Connect-3G-2.0|Connect-2G-2.0|ME Tablet U1|ME Tablet U2|ME Tablet G1|ME Tablet X1|ME Tablet Y2|ME Tablet Sync", "DPSTablet": "DPS Dream 9|DPS Dual 7", "VistureTablet": "V97 HD|i75 3G|Visture V4( HD)?|Visture V5( HD)?|Visture V10", "CrestaTablet": "CTP(-)?810|CTP(-)?818|CTP(-)?828|CTP(-)?838|CTP(-)?888|CTP(-)?978|CTP(-)?980|CTP(-)?987|CTP(-)?988|CTP(-)?989", "MediatekTablet": "\\bMT8125|MT8389|MT8135|MT8377\\b", "ConcordeTablet": "Concorde([ ]+)?Tab|ConCorde ReadMan", "GoCleverTablet": "GOCLEVER TAB|A7GOCLEVER|M1042|M7841|M742|R1042BK|R1041|TAB A975|TAB A7842|TAB A741|TAB A741L|TAB M723G|TAB M721|TAB A1021|TAB I921|TAB R721|TAB I720|TAB T76|TAB R70|TAB R76.2|TAB R106|TAB R83.2|TAB M813G|TAB I721|GCTA722|TAB I70|TAB I71|TAB S73|TAB R73|TAB R74|TAB R93|TAB R75|TAB R76.1|TAB A73|TAB A93|TAB A93.2|TAB T72|TAB R83|TAB R974|TAB R973|TAB A101|TAB A103|TAB A104|TAB A104.2|R105BK|M713G|A972BK|TAB A971|TAB R974.2|TAB R104|TAB R83.3|TAB A1042", "ModecomTablet": "FreeTAB 9000|FreeTAB 7.4|FreeTAB 7004|FreeTAB 7800|FreeTAB 2096|FreeTAB 7.5|FreeTAB 1014|FreeTAB 1001 |FreeTAB 8001|FreeTAB 9706|FreeTAB 9702|FreeTAB 7003|FreeTAB 7002|FreeTAB 1002|FreeTAB 7801|FreeTAB 1331|FreeTAB 1004|FreeTAB 8002|FreeTAB 8014|FreeTAB 9704|FreeTAB 1003", "VoninoTablet": "\\b(Argus[ _]?S|Diamond[ _]?79HD|Emerald[ _]?78E|Luna[ _]?70C|Onyx[ _]?S|Onyx[ _]?Z|Orin[ _]?HD|Orin[ _]?S|Otis[ _]?S|SpeedStar[ _]?S|Magnet[ _]?M9|Primus[ _]?94[ _]?3G|Primus[ _]?94HD|Primus[ _]?QS|Android.*\\bQ8\\b|Sirius[ _]?EVO[ _]?QS|Sirius[ _]?QS|Spirit[ _]?S)\\b", "ECSTablet": "V07OT2|TM105A|S10OT1|TR10CS1", "StorexTablet": "eZee[_']?(Tab|Go)[0-9]+|TabLC7|Looney Tunes Tab", "VodafoneTablet": "SmartTab([ ]+)?[0-9]+|SmartTabII10|SmartTabII7|VF-1497", "EssentielBTablet": "Smart[ ']?TAB[ ]+?[0-9]+|Family[ ']?TAB2", "RossMoorTablet": "RM-790|RM-997|RMD-878G|RMD-974R|RMT-705A|RMT-701|RME-601|RMT-501|RMT-711", "iMobileTablet": "i-mobile i-note", "TolinoTablet": "tolino tab [0-9.]+|tolino shine", "AudioSonicTablet": "\\bC-22Q|T7-QC|T-17B|T-17P\\b", "AMPETablet": "Android.* A78 ", "SkkTablet": "Android.* (SKYPAD|PHOENIX|CYCLOPS)", "TecnoTablet": "TECNO P9", "JXDTablet": "Android.* \\b(F3000|A3300|JXD5000|JXD3000|JXD2000|JXD300B|JXD300|S5800|S7800|S602b|S5110b|S7300|S5300|S602|S603|S5100|S5110|S601|S7100a|P3000F|P3000s|P101|P200s|P1000m|P200m|P9100|P1000s|S6600b|S908|P1000|P300|S18|S6600|S9100)\\b", "iJoyTablet": "Tablet (Spirit 7|Essentia|Galatea|Fusion|Onix 7|Landa|Titan|Scooby|Deox|Stella|Themis|Argon|Unique 7|Sygnus|Hexen|Finity 7|Cream|Cream X2|Jade|Neon 7|Neron 7|Kandy|Scape|Saphyr 7|Rebel|Biox|Rebel|Rebel 8GB|Myst|Draco 7|Myst|Tab7-004|Myst|Tadeo Jones|Tablet Boing|Arrow|Draco Dual Cam|Aurix|Mint|Amity|Revolution|Finity 9|Neon 9|T9w|Amity 4GB Dual Cam|Stone 4GB|Stone 8GB|Andromeda|Silken|X2|Andromeda II|Halley|Flame|Saphyr 9,7|Touch 8|Planet|Triton|Unique 10|Hexen 10|Memphis 4GB|Memphis 8GB|Onix 10)", "FX2Tablet": "FX2 PAD7|FX2 PAD10", "XoroTablet": "KidsPAD 701|PAD[ ]?712|PAD[ ]?714|PAD[ ]?716|PAD[ ]?717|PAD[ ]?718|PAD[ ]?720|PAD[ ]?721|PAD[ ]?722|PAD[ ]?790|PAD[ ]?792|PAD[ ]?900|PAD[ ]?9715D|PAD[ ]?9716DR|PAD[ ]?9718DR|PAD[ ]?9719QR|PAD[ ]?9720QR|TelePAD1030|Telepad1032|TelePAD730|TelePAD731|TelePAD732|TelePAD735Q|TelePAD830|TelePAD9730|TelePAD795|MegaPAD 1331|MegaPAD 1851|MegaPAD 2151", "ViewsonicTablet": "ViewPad 10pi|ViewPad 10e|ViewPad 10s|ViewPad E72|ViewPad7|ViewPad E100|ViewPad 7e|ViewSonic VB733|VB100a", "OdysTablet": "LOOX|XENO10|ODYS[ -](Space|EVO|Xpress|NOON)|\\bXELIO\\b|Xelio10Pro|XELIO7PHONETAB|XELIO10EXTREME|XELIOPT2|NEO_QUAD10", "CaptivaTablet": "CAPTIVA PAD", "IconbitTablet": "NetTAB|NT-3702|NT-3702S|NT-3702S|NT-3603P|NT-3603P|NT-0704S|NT-0704S|NT-3805C|NT-3805C|NT-0806C|NT-0806C|NT-0909T|NT-0909T|NT-0907S|NT-0907S|NT-0902S|NT-0902S", "TeclastTablet": "T98 4G|\\bP80\\b|\\bX90HD\\b|X98 Air|X98 Air 3G|\\bX89\\b|P80 3G|\\bX80h\\b|P98 Air|\\bX89HD\\b|P98 3G|\\bP90HD\\b|P89 3G|X98 3G|\\bP70h\\b|P79HD 3G|G18d 3G|\\bP79HD\\b|\\bP89s\\b|\\bA88\\b|\\bP10HD\\b|\\bP19HD\\b|G18 3G|\\bP78HD\\b|\\bA78\\b|\\bP75\\b|G17s 3G|G17h 3G|\\bP85t\\b|\\bP90\\b|\\bP11\\b|\\bP98t\\b|\\bP98HD\\b|\\bG18d\\b|\\bP85s\\b|\\bP11HD\\b|\\bP88s\\b|\\bA80HD\\b|\\bA80se\\b|\\bA10h\\b|\\bP89\\b|\\bP78s\\b|\\bG18\\b|\\bP85\\b|\\bA70h\\b|\\bA70\\b|\\bG17\\b|\\bP18\\b|\\bA80s\\b|\\bA11s\\b|\\bP88HD\\b|\\bA80h\\b|\\bP76s\\b|\\bP76h\\b|\\bP98\\b|\\bA10HD\\b|\\bP78\\b|\\bP88\\b|\\bA11\\b|\\bA10t\\b|\\bP76a\\b|\\bP76t\\b|\\bP76e\\b|\\bP85HD\\b|\\bP85a\\b|\\bP86\\b|\\bP75HD\\b|\\bP76v\\b|\\bA12\\b|\\bP75a\\b|\\bA15\\b|\\bP76Ti\\b|\\bP81HD\\b|\\bA10\\b|\\bT760VE\\b|\\bT720HD\\b|\\bP76\\b|\\bP73\\b|\\bP71\\b|\\bP72\\b|\\bT720SE\\b|\\bC520Ti\\b|\\bT760\\b|\\bT720VE\\b|T720-3GE|T720-WiFi", "OndaTablet": "\\b(V975i|Vi30|VX530|V701|Vi60|V701s|Vi50|V801s|V719|Vx610w|VX610W|V819i|Vi10|VX580W|Vi10|V711s|V813|V811|V820w|V820|Vi20|V711|VI30W|V712|V891w|V972|V819w|V820w|Vi60|V820w|V711|V813s|V801|V819|V975s|V801|V819|V819|V818|V811|V712|V975m|V101w|V961w|V812|V818|V971|V971s|V919|V989|V116w|V102w|V973|Vi40)\\b[\\s]+", "JaytechTablet": "TPC-PA762", "BlaupunktTablet": "Endeavour 800NG|Endeavour 1010", "DigmaTablet": "\\b(iDx10|iDx9|iDx8|iDx7|iDxD7|iDxD8|iDsQ8|iDsQ7|iDsQ8|iDsD10|iDnD7|3TS804H|iDsQ11|iDj7|iDs10)\\b", "EvolioTablet": "ARIA_Mini_wifi|Aria[ _]Mini|Evolio X10|Evolio X7|Evolio X8|\\bEvotab\\b|\\bNeura\\b", "LavaTablet": "QPAD E704|\\bIvoryS\\b|E-TAB IVORY|\\bE-TAB\\b", "AocTablet": "MW0811|MW0812|MW0922|MTK8382|MW1031|MW0831|MW0821|MW0931|MW0712", "MpmanTablet": "MP11 OCTA|MP10 OCTA|MPQC1114|MPQC1004|MPQC994|MPQC974|MPQC973|MPQC804|MPQC784|MPQC780|\\bMPG7\\b|MPDCG75|MPDCG71|MPDC1006|MP101DC|MPDC9000|MPDC905|MPDC706HD|MPDC706|MPDC705|MPDC110|MPDC100|MPDC99|MPDC97|MPDC88|MPDC8|MPDC77|MP709|MID701|MID711|MID170|MPDC703|MPQC1010", "CelkonTablet": "CT695|CT888|CT[\\s]?910|CT7 Tab|CT9 Tab|CT3 Tab|CT2 Tab|CT1 Tab|C820|C720|\\bCT-1\\b", "WolderTablet": "miTab \\b(DIAMOND|SPACE|BROOKLYN|NEO|FLY|MANHATTAN|FUNK|EVOLUTION|SKY|GOCAR|IRON|GENIUS|POP|MINT|EPSILON|BROADWAY|JUMP|HOP|LEGEND|NEW AGE|LINE|ADVANCE|FEEL|FOLLOW|LIKE|LINK|LIVE|THINK|FREEDOM|CHICAGO|CLEVELAND|BALTIMORE-GH|IOWA|BOSTON|SEATTLE|PHOENIX|DALLAS|IN 101|MasterChef)\\b", "MiTablet": "\\bMI PAD\\b|\\bHM NOTE 1W\\b", "NibiruTablet": "Nibiru M1|Nibiru Jupiter One", "NexoTablet": "NEXO NOVA|NEXO 10|NEXO AVIO|NEXO FREE|NEXO GO|NEXO EVO|NEXO 3G|NEXO SMART|NEXO KIDDO|NEXO MOBI", "LeaderTablet": "TBLT10Q|TBLT10I|TBL-10WDKB|TBL-10WDKBO2013|TBL-W230V2|TBL-W450|TBL-W500|SV572|TBLT7I|TBA-AC7-8G|TBLT79|TBL-8W16|TBL-10W32|TBL-10WKB|TBL-W100", "UbislateTablet": "UbiSlate[\\s]?7C", "PocketBookTablet": "Pocketbook", "KocasoTablet": "\\b(TB-1207)\\b", "Hudl": "Hudl HT7S3|Hudl 2", "TelstraTablet": "T-Hub2", "GenericTablet": "Android.*\\b97D\\b|Tablet(?!.*PC)|BNTV250A|MID-WCDMA|LogicPD Zoom2|\\bA7EB\\b|CatNova8|A1_07|CT704|CT1002|\\bM721\\b|rk30sdk|\\bEVOTAB\\b|M758A|ET904|ALUMIUM10|Smartfren Tab|Endeavour 1010|Tablet-PC-4|Tagi Tab|\\bM6pro\\b|CT1020W|arc 10HD|\\bJolla\\b|\\bTP750\\b" }, "oss": { "androids": "Android", "BlackBerryOS": "blackberry|\\bBB10\\b|rim tablet os", "PalmOS": "PalmOS|avantgo|blazer|elaine|hiptop|palm|plucker|xiino", "SymbianOS": "Symbian|symbols|Series60|Series40|SYB-[0-9]+|\\bS60\\b", "WindowsMobileOS": "Windows CE.*(PPC|Smartphone|Mobile|[0-9]{3}x[0-9]{3})|Window Mobile|Windows Phone [0-9.]+|WCE;", "WindowsPhoneOS": "Windows Phone 10.0|Windows Phone 8.1|Windows Phone 8.0|Windows Phone OS|XBLWP7|ZuneWP7|Windows NT 6.[23]; ARM;", "iOS": "\\biPhone.*Mobile|\\biPod|\\biPad", "MeeGoOS": "MeeGo", "MaemoOS": "Maemo", "JavaOS": "J2ME\/|\\bMIDP\\b|\\bCLDC\\b", "webOS": "webOS|hpwOS", "badaOS": "\\bBada\\b", "BREWOS": "BREW" }, "uas": { "Vivaldi": "Vivaldi", "Chrome": "\\bCrMo\\b|CriOS|Android.*Chrome\/[.0-9]* (Mobile)?", "Dolfin": "\\bDolfin\\b", "Opera": "Opera.*Mini|Opera.*Mobi|Android.*Opera|Mobile.*OPR\/[0-9.]+|Coast\/[0-9.]+", "Skyfire": "Skyfire", "Edge": "Mobile Safari\/[.0-9]* Edge", "IE": "IEMobile|MSIEMobile", "Firefox": "fennec|firefox.*maemo|(Mobile|Tablet).*Firefox|Firefox.*Mobile", "Bolt": "bolt", "TeaShark": "teashark", "Blazer": "Blazer", "Safari": "Version.*Mobile.*Safari|Safari.*Mobile|MobileSafari", "Tizen": "Tizen", "UCBrowser": "UC.*Browser|UCWEB", "baiduboxapp": "baiduboxapp", "baidubrowser": "baidubrowser", "DiigoBrowser": "DiigoBrowser", "Puffin": "Puffin", "Mercury": "\\bMercury\\b", "ObigoBrowser": "Obigo", "NetFront": "NF-Browser", "GenericBrowser": "NokiaBrowser|OviBrowser|OneBrowser|TwonkyBeamBrowser|SEMC.*Browser|FlyFlow|Minimo|NetFront|Novarra-Vision|MQQBrowser|MicroMessenger", "PaleMoon": "Android.*PaleMoon|Mobile.*PaleMoon" }, "props": { "Mobile": "Mobile\/[VER]", "Build": "Build\/[VER]", "Version": "Version\/[VER]", "VendorID": "VendorID\/[VER]", "iPad": "iPad.*CPU[a-z ]+[VER]", "iPhone": "iPhone.*CPU[a-z ]+[VER]", "iPod": "iPod.*CPU[a-z ]+[VER]", "Kindle": "Kindle\/[VER]", "Chrome": [ "Chrome\/[VER]", "CriOS\/[VER]", "CrMo\/[VER]" ], "Coast": [ "Coast\/[VER]" ], "Dolfin": "Dolfin\/[VER]", "Firefox": "Firefox\/[VER]", "Fennec": "Fennec\/[VER]", "Edge": "Edge\/[VER]", "IE": [ "IEMobile\/[VER];", "IEMobile [VER]", "MSIE [VER];", "Trident\/[0-9.]+;.*rv:[VER]" ], "NetFront": "NetFront\/[VER]", "NokiaBrowser": "NokiaBrowser\/[VER]", "Opera": [ " OPR\/[VER]", "Opera Mini\/[VER]", "Version\/[VER]" ], "Opera Mini": "Opera Mini\/[VER]", "Opera Mobi": "Version\/[VER]", "UC Browser": "UC Browser[VER]", "MQQBrowser": "MQQBrowser\/[VER]", "MicroMessenger": "MicroMessenger\/[VER]", "baiduboxapp": "baiduboxapp\/[VER]", "baidubrowser": "baidubrowser\/[VER]", "Iron": "Iron\/[VER]", "Safari": [ "Version\/[VER]", "Safari\/[VER]" ], "Skyfire": "Skyfire\/[VER]", "Tizen": "Tizen\/[VER]", "Webkit": "webkit[ \/][VER]", "PaleMoon": "PaleMoon\/[VER]", "Gecko": "Gecko\/[VER]", "Trident": "Trident\/[VER]", "Presto": "Presto\/[VER]", "Goanna": "Goanna\/[VER]", "iOS": " \\bi?OS\\b [VER][ ;]{1}", "Android": "Android [VER]", "BlackBerry": [ "BlackBerry[\\w]+\/[VER]", "BlackBerry.*Version\/[VER]", "Version\/[VER]" ], "BREW": "BREW [VER]", "Java": "Java\/[VER]", "Windows Phone OS": [ "Windows Phone OS [VER]", "Windows Phone [VER]" ], "Windows Phone": "Windows Phone [VER]", "Windows CE": "Windows CE\/[VER]", "Windows NT": "Windows NT [VER]", "Symbian": [ "SymbianOS\/[VER]", "Symbian\/[VER]" ], "webOS": [ "webOS\/[VER]", "hpwOS\/[VER];" ] }, "utils": { "Bot": "Googlebot|facebookexternalhit|AdsBot-Google|Google Keyword Suggestion|Facebot|YandexBot|bingbot|ia_archiver|AhrefsBot|Ezooms|GSLFbot|WBSearchBot|Twitterbot|TweetmemeBot|Twikle|PaperLiBot|Wotbox|UnwindFetchor|Exabot|MJ12bot|YandexImages|TurnitinBot|Pingdom", "MobileBot": "Googlebot-Mobile|AdsBot-Google-Mobile|YahooSeeker\/M1A1-R2D2", "DesktopMode": "WPDesktop", "TV": "SonyDTV|HbbTV", "WebKit": "(webkit)[ \/]([\\w.]+)", "Console": "\\b(Nintendo|Nintendo WiiU|Nintendo 3DS|PLAYSTATION|Xbox)\\b", "Watch": "SM-V700" }} : { phones: { iPhone: string; BlackBerry: string; HTC: string; Nexus: string; Dell: string; Motorola: string; Samsung: string; LG: string; Sony: string; Asus: string; NokiaLumia: string; Micromax: string; Palm: string; Vertu: string; Pantech: string; Fly: string; Wiko: string; iMobile: string; SimValley: string; Wolfgang: string; Alcatel: string; Nintendo: string; Amoi: string; INQ: string; GenericPhone: string; }; tablets: { iPad: string; NexusTablet: string; SamsungTablet: string; Kindle: string; SurfaceTablet: string; HPTablet: string; AsusTablet: string; BlackBerryTablet: string; HTCtablet: string; MotorolaTablet: string; NookTablet: string; AcerTablet: string; ToshibaTablet: string; LGTablet: string; FujitsuTablet: string; PrestigioTablet: string; LenovoTablet: string; DellTablet: string; YarvikTablet: string; MedionTablet: string; ArnovaTablet: string; IntensoTablet: string; IRUTablet: string; MegafonTablet: string; EbodaTablet: string; AllViewTablet: string; ArchosTablet: string; AinolTablet: string; NokiaLumiaTablet: string; SonyTablet: string; PhilipsTablet: string; CubeTablet: string; CobyTablet: string; MIDTablet: string; MSITablet: string; SMiTTablet: string; RockChipTablet: string; FlyTablet: string; bqTablet: string; HuaweiTablet: string; NecTablet: string; PantechTablet: string; BronchoTablet: string; VersusTablet: string; ZyncTablet: string; PositivoTablet: string; NabiTablet: string; KoboTablet: string; DanewTablet: string; TexetTablet: string; PlaystationTablet: string; TrekstorTablet: string; PyleAudioTablet: string; AdvanTablet: string; DanyTechTablet: string; GalapadTablet: string; MicromaxTablet: string; KarbonnTablet: string; AllFineTablet: string; PROSCANTablet: string; YONESTablet: string; ChangJiaTablet: string; GUTablet: string; PointOfViewTablet: string; OvermaxTablet: string; HCLTablet: string; DPSTablet: string; VistureTablet: string; CrestaTablet: string; MediatekTablet: string; ConcordeTablet: string; GoCleverTablet: string; ModecomTablet: string; VoninoTablet: string; ECSTablet: string; StorexTablet: string; VodafoneTablet: string; EssentielBTablet: string; RossMoorTablet: string; iMobileTablet: string; TolinoTablet: string; AudioSonicTablet: string; AMPETablet: string; SkkTablet: string; TecnoTablet: string; JXDTablet: string; iJoyTablet: string; FX2Tablet: string; XoroTablet: string; ViewsonicTablet: string; OdysTablet: string; CaptivaTablet: string; IconbitTablet: string; TeclastTablet: string; OndaTablet: string; JaytechTablet: string; BlaupunktTablet: string; DigmaTablet: string; EvolioTablet: string; LavaTablet: string; AocTablet: string; MpmanTablet: string; CelkonTablet: string; WolderTablet: string; MiTablet: string; NibiruTablet: string; NexoTablet: string; LeaderTablet: string; UbislateTablet: string; PocketBookTablet: string; KocasoTablet: string; Hudl: string; TelstraTablet: string; GenericTablet: string; }; oss: { androids: string; BlackBerryOS: string; PalmOS: string; SymbianOS: string; WindowsMobileOS: string; WindowsPhoneOS: string; iOS: string; MeeGoOS: string; MaemoOS: string; JavaOS: string; webOS: string; badaOS: string; BREWOS: string; }; uas: { Vivaldi: string; Chrome: string; Dolfin: string; Opera: string; Skyfire: string; Edge: string; IE: string; Firefox: string; Bolt: string; TeaShark: string; Blazer: string; Safari: string; Tizen: string; UCBrowser: string; baiduboxapp: string; baidubrowser: string; DiigoBrowser: string; Puffin: string; Mercury: string; ObigoBrowser: string; NetFront: string; GenericBrowser: string; PaleMoon: string; }; props: { Mobile: string; Build: string; Version: string; VendorID: string; iPad: string; iPhone: string; iPod: string; Kindle: string; Chrome: string[]; Coast: string[]; Dolfin: string; Firefox: string; Fennec: string; Edge: string; IE: string[]; NetFront: string; NokiaBrowser: string; Opera: string[]; "Opera Mini": string; "Opera Mobi": string; "UC Browser": string; MQQBrowser: string; MicroMessenger: string; baiduboxapp: string; baidubrowser: string; Iron: string; Safari: string[]; Skyfire: string; Tizen: string; Webkit: string; PaleMoon: string; Gecko: string; Trident: string; Presto: string; Goanna: string; iOS: string; Android: string; BlackBerry: string[]; BREW: string; Java: string; "Windows Phone OS": string[]; "Windows Phone": string; "Windows CE": string; "Windows NT": string; Symbian: string[]; webOS: string[]; }; utils: { Bot: string; MobileBot: string; DesktopMode: string; TV: string; WebKit: string; Console: string; Watch: string; }; } > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ "phones": { @@ -897,13 +897,13 @@ define(function () { }, "oss": { ->"oss" : { AndroidOS: string; BlackBerryOS: string; PalmOS: string; SymbianOS: string; WindowsMobileOS: string; WindowsPhoneOS: string; iOS: string; MeeGoOS: string; MaemoOS: string; JavaOS: string; webOS: string; badaOS: string; BREWOS: string; } +>"oss" : { androids: string; BlackBerryOS: string; PalmOS: string; SymbianOS: string; WindowsMobileOS: string; WindowsPhoneOS: string; iOS: string; MeeGoOS: string; MaemoOS: string; JavaOS: string; webOS: string; badaOS: string; BREWOS: string; } > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ->{ "AndroidOS": "Android", "BlackBerryOS": "blackberry|\\bBB10\\b|rim tablet os", "PalmOS": "PalmOS|avantgo|blazer|elaine|hiptop|palm|plucker|xiino", "SymbianOS": "Symbian|SymbOS|Series60|Series40|SYB-[0-9]+|\\bS60\\b", "WindowsMobileOS": "Windows CE.*(PPC|Smartphone|Mobile|[0-9]{3}x[0-9]{3})|Window Mobile|Windows Phone [0-9.]+|WCE;", "WindowsPhoneOS": "Windows Phone 10.0|Windows Phone 8.1|Windows Phone 8.0|Windows Phone OS|XBLWP7|ZuneWP7|Windows NT 6.[23]; ARM;", "iOS": "\\biPhone.*Mobile|\\biPod|\\biPad", "MeeGoOS": "MeeGo", "MaemoOS": "Maemo", "JavaOS": "J2ME\/|\\bMIDP\\b|\\bCLDC\\b", "webOS": "webOS|hpwOS", "badaOS": "\\bBada\\b", "BREWOS": "BREW" } : { AndroidOS: string; BlackBerryOS: string; PalmOS: string; SymbianOS: string; WindowsMobileOS: string; WindowsPhoneOS: string; iOS: string; MeeGoOS: string; MaemoOS: string; JavaOS: string; webOS: string; badaOS: string; BREWOS: string; } +>{ "androids": "Android", "BlackBerryOS": "blackberry|\\bBB10\\b|rim tablet os", "PalmOS": "PalmOS|avantgo|blazer|elaine|hiptop|palm|plucker|xiino", "SymbianOS": "Symbian|symbols|Series60|Series40|SYB-[0-9]+|\\bS60\\b", "WindowsMobileOS": "Windows CE.*(PPC|Smartphone|Mobile|[0-9]{3}x[0-9]{3})|Window Mobile|Windows Phone [0-9.]+|WCE;", "WindowsPhoneOS": "Windows Phone 10.0|Windows Phone 8.1|Windows Phone 8.0|Windows Phone OS|XBLWP7|ZuneWP7|Windows NT 6.[23]; ARM;", "iOS": "\\biPhone.*Mobile|\\biPod|\\biPad", "MeeGoOS": "MeeGo", "MaemoOS": "Maemo", "JavaOS": "J2ME\/|\\bMIDP\\b|\\bCLDC\\b", "webOS": "webOS|hpwOS", "badaOS": "\\bBada\\b", "BREWOS": "BREW" } : { androids: string; BlackBerryOS: string; PalmOS: string; SymbianOS: string; WindowsMobileOS: string; WindowsPhoneOS: string; iOS: string; MeeGoOS: string; MaemoOS: string; JavaOS: string; webOS: string; badaOS: string; BREWOS: string; } > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - "AndroidOS": "Android", ->"AndroidOS" : string + "androids": "Android", +>"androids" : string > : ^^^^^^ >"Android" : "Android" > : ^^^^^^^^^ @@ -920,10 +920,10 @@ define(function () { >"PalmOS|avantgo|blazer|elaine|hiptop|palm|plucker|xiino" : "PalmOS|avantgo|blazer|elaine|hiptop|palm|plucker|xiino" > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - "SymbianOS": "Symbian|SymbOS|Series60|Series40|SYB-[0-9]+|\\bS60\\b", + "SymbianOS": "Symbian|symbols|Series60|Series40|SYB-[0-9]+|\\bS60\\b", >"SymbianOS" : string > : ^^^^^^ ->"Symbian|SymbOS|Series60|Series40|SYB-[0-9]+|\\bS60\\b" : "Symbian|SymbOS|Series60|Series40|SYB-[0-9]+|\\bS60\\b" +>"Symbian|symbols|Series60|Series40|SYB-[0-9]+|\\bS60\\b" : "Symbian|symbols|Series60|Series40|SYB-[0-9]+|\\bS60\\b" > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ "WindowsMobileOS": "Windows CE.*(PPC|Smartphone|Mobile|[0-9]{3}x[0-9]{3})|Window Mobile|Windows Phone [0-9.]+|WCE;", @@ -3611,7 +3611,7 @@ define(function () { > : ^^^ >is : any > : ^^^ ->'AndroidOS' : "AndroidOS" +>'androids' : "androids" > : ^^^^^^^^^^^ >t.version('Android')>=4.0 : boolean > : ^^^^^^^ @@ -3670,7 +3670,7 @@ define(function () { > : ^^^ >is : any > : ^^^ ->'AndroidOS' : "AndroidOS" +>'androids' : "androids" > : ^^^^^^^^^^^ >t.version('Android')>=2.3 : boolean > : ^^^^^^^ @@ -3727,7 +3727,7 @@ define(function () { > : ^^^ >is : any > : ^^^ ->'AndroidOS' : "AndroidOS" +>'androids' : "androids" > : ^^^^^^^^^^^ // Meego 1.2 - Tested on Nokia 950 and N9 @@ -3888,7 +3888,7 @@ define(function () { > : ^^^ >is : any > : ^^^ ->'AndroidOS' : "AndroidOS" +>'androids' : "androids" > : ^^^^^^^^^^^ >t.is('NookTablet') : any > : ^^^ @@ -4551,7 +4551,7 @@ define(function () { } MobileDetect.prototype = { ->MobileDetect.prototype = { constructor: MobileDetect, /** * Returns the detected phone or tablet type or null if it is not a mobile device. *
* For a list of possible return values see {@link MobileDetect#phone} and {@link MobileDetect#tablet}.
*
* If the device is not detected by the regular expressions from Mobile-Detect, a test is made against * the patterns of detectmobilebrowsers.com. If this test * is positive, a value of UnknownPhone, UnknownTablet or * UnknownMobile is returned.
* When used in browser, the decision whether phone or tablet is made based on screen.width/height.
*
* When used server-side (node.js), there is no way to tell the difference between UnknownTablet * and UnknownMobile, so you will get UnknownMobile here.
* Be aware that since v1.0.0 in this special case you will get UnknownMobile only for: * {@link MobileDetect#mobile}, not for {@link MobileDetect#phone} and {@link MobileDetect#tablet}. * In versions before v1.0.0 all 3 methods returned UnknownMobile which was tedious to use. *
* In most cases you will use the return value just as a boolean. * * @returns {String} the key for the phone family or tablet family, e.g. "Nexus". * @function MobileDetect#mobile */ mobile: function () { impl.prepareDetectionCache(this._cache, this.ua, this.maxPhoneWidth); return this._cache.mobile; }, /** * Returns the detected phone type/family string or null. *
* The returned tablet (family or producer) is one of following keys:
*
iPhone, BlackBerry, HTC, Nexus, Dell, Motorola, Samsung, LG, Sony, Asus, * NokiaLumia, Micromax, Palm, Vertu, Pantech, Fly, Wiko, iMobile, SimValley, * Wolfgang, Alcatel, Nintendo, Amoi, INQ, GenericPhone
*
* If the device is not detected by the regular expressions from Mobile-Detect, a test is made against * the patterns of detectmobilebrowsers.com. If this test * is positive, a value of UnknownPhone or UnknownMobile is returned.
* When used in browser, the decision whether phone or tablet is made based on screen.width/height.
*
* When used server-side (node.js), there is no way to tell the difference between UnknownTablet * and UnknownMobile, so you will get null here, while {@link MobileDetect#mobile} * will return UnknownMobile.
* Be aware that since v1.0.0 in this special case you will get UnknownMobile only for: * {@link MobileDetect#mobile}, not for {@link MobileDetect#phone} and {@link MobileDetect#tablet}. * In versions before v1.0.0 all 3 methods returned UnknownMobile which was tedious to use. *
* In most cases you will use the return value just as a boolean. * * @returns {String} the key of the phone family or producer, e.g. "iPhone" * @function MobileDetect#phone */ phone: function () { impl.prepareDetectionCache(this._cache, this.ua, this.maxPhoneWidth); return this._cache.phone; }, /** * Returns the detected tablet type/family string or null. *
* The returned tablet (family or producer) is one of following keys:
*
iPad, NexusTablet, SamsungTablet, Kindle, SurfaceTablet, HPTablet, AsusTablet, * BlackBerryTablet, HTCtablet, MotorolaTablet, NookTablet, AcerTablet, * ToshibaTablet, LGTablet, FujitsuTablet, PrestigioTablet, LenovoTablet, * DellTablet, YarvikTablet, MedionTablet, ArnovaTablet, IntensoTablet, IRUTablet, * MegafonTablet, EbodaTablet, AllViewTablet, ArchosTablet, AinolTablet, * NokiaLumiaTablet, SonyTablet, PhilipsTablet, CubeTablet, CobyTablet, MIDTablet, * MSITablet, SMiTTablet, RockChipTablet, FlyTablet, bqTablet, HuaweiTablet, * NecTablet, PantechTablet, BronchoTablet, VersusTablet, ZyncTablet, * PositivoTablet, NabiTablet, KoboTablet, DanewTablet, TexetTablet, * PlaystationTablet, TrekstorTablet, PyleAudioTablet, AdvanTablet, * DanyTechTablet, GalapadTablet, MicromaxTablet, KarbonnTablet, AllFineTablet, * PROSCANTablet, YONESTablet, ChangJiaTablet, GUTablet, PointOfViewTablet, * OvermaxTablet, HCLTablet, DPSTablet, VistureTablet, CrestaTablet, * MediatekTablet, ConcordeTablet, GoCleverTablet, ModecomTablet, VoninoTablet, * ECSTablet, StorexTablet, VodafoneTablet, EssentielBTablet, RossMoorTablet, * iMobileTablet, TolinoTablet, AudioSonicTablet, AMPETablet, SkkTablet, * TecnoTablet, JXDTablet, iJoyTablet, FX2Tablet, XoroTablet, ViewsonicTablet, * OdysTablet, CaptivaTablet, IconbitTablet, TeclastTablet, OndaTablet, * JaytechTablet, BlaupunktTablet, DigmaTablet, EvolioTablet, LavaTablet, * AocTablet, MpmanTablet, CelkonTablet, WolderTablet, MiTablet, NibiruTablet, * NexoTablet, LeaderTablet, UbislateTablet, PocketBookTablet, KocasoTablet, Hudl, * TelstraTablet, GenericTablet
*
* If the device is not detected by the regular expressions from Mobile-Detect, a test is made against * the patterns of detectmobilebrowsers.com. If this test * is positive, a value of UnknownTablet or UnknownMobile is returned.
* When used in browser, the decision whether phone or tablet is made based on screen.width/height.
*
* When used server-side (node.js), there is no way to tell the difference between UnknownTablet * and UnknownMobile, so you will get null here, while {@link MobileDetect#mobile} * will return UnknownMobile.
* Be aware that since v1.0.0 in this special case you will get UnknownMobile only for: * {@link MobileDetect#mobile}, not for {@link MobileDetect#phone} and {@link MobileDetect#tablet}. * In versions before v1.0.0 all 3 methods returned UnknownMobile which was tedious to use. *
* In most cases you will use the return value just as a boolean. * * @returns {String} the key of the tablet family or producer, e.g. "SamsungTablet" * @function MobileDetect#tablet */ tablet: function () { impl.prepareDetectionCache(this._cache, this.ua, this.maxPhoneWidth); return this._cache.tablet; }, /** * Returns the (first) detected user-agent string or null. *
* The returned user-agent is one of following keys:
*
Vivaldi, Chrome, Dolfin, Opera, Skyfire, Edge, IE, Firefox, Bolt, TeaShark, * Blazer, Safari, Tizen, UCBrowser, baiduboxapp, baidubrowser, DiigoBrowser, * Puffin, Mercury, ObigoBrowser, NetFront, GenericBrowser, PaleMoon
*
* In most cases calling {@link MobileDetect#userAgent} will be sufficient. But there are rare * cases where a mobile device pretends to be more than one particular browser. You can get the * list of all matches with {@link MobileDetect#userAgents} or check for a particular value by * providing one of the defined keys as first argument to {@link MobileDetect#is}. * * @returns {String} the key for the detected user-agent or null * @function MobileDetect#userAgent */ userAgent: function () { if (this._cache.userAgent === undefined) { this._cache.userAgent = impl.findMatch(impl.mobileDetectRules.uas, this.ua); } return this._cache.userAgent; }, /** * Returns all detected user-agent strings. *
* The array is empty or contains one or more of following keys:
*
Vivaldi, Chrome, Dolfin, Opera, Skyfire, Edge, IE, Firefox, Bolt, TeaShark, * Blazer, Safari, Tizen, UCBrowser, baiduboxapp, baidubrowser, DiigoBrowser, * Puffin, Mercury, ObigoBrowser, NetFront, GenericBrowser, PaleMoon
*
* In most cases calling {@link MobileDetect#userAgent} will be sufficient. But there are rare * cases where a mobile device pretends to be more than one particular browser. You can get the * list of all matches with {@link MobileDetect#userAgents} or check for a particular value by * providing one of the defined keys as first argument to {@link MobileDetect#is}. * * @returns {Array} the array of detected user-agent keys or [] * @function MobileDetect#userAgents */ userAgents: function () { if (this._cache.userAgents === undefined) { this._cache.userAgents = impl.findMatches(impl.mobileDetectRules.uas, this.ua); } return this._cache.userAgents; }, /** * Returns the detected operating system string or null. *
* The operating system is one of following keys:
*
AndroidOS, BlackBerryOS, PalmOS, SymbianOS, WindowsMobileOS, WindowsPhoneOS, * iOS, MeeGoOS, MaemoOS, JavaOS, webOS, badaOS, BREWOS
* * @returns {String} the key for the detected operating system. * @function MobileDetect#os */ os: function () { if (this._cache.os === undefined) { this._cache.os = impl.detectOS(this.ua); } return this._cache.os; }, /** * Get the version (as Number) of the given property in the User-Agent. *
* Will return a float number. (eg. 2_0 will return 2.0, 4.3.1 will return 4.31) * * @param {String} key a key defining a thing which has a version.
* You can use one of following keys:
*
Mobile, Build, Version, VendorID, iPad, iPhone, iPod, Kindle, Chrome, Coast, * Dolfin, Firefox, Fennec, Edge, IE, NetFront, NokiaBrowser, Opera, Opera Mini, * Opera Mobi, UC Browser, MQQBrowser, MicroMessenger, baiduboxapp, baidubrowser, * Iron, Safari, Skyfire, Tizen, Webkit, PaleMoon, Gecko, Trident, Presto, Goanna, * iOS, Android, BlackBerry, BREW, Java, Windows Phone OS, Windows Phone, Windows * CE, Windows NT, Symbian, webOS
* * @returns {Number} the version as float or NaN if User-Agent doesn't contain this version. * Be careful when comparing this value with '==' operator! * @function MobileDetect#version */ version: function (key) { return impl.getVersion(key, this.ua); }, /** * Get the version (as String) of the given property in the User-Agent. *
* * @param {String} key a key defining a thing which has a version.
* You can use one of following keys:
*
Mobile, Build, Version, VendorID, iPad, iPhone, iPod, Kindle, Chrome, Coast, * Dolfin, Firefox, Fennec, Edge, IE, NetFront, NokiaBrowser, Opera, Opera Mini, * Opera Mobi, UC Browser, MQQBrowser, MicroMessenger, baiduboxapp, baidubrowser, * Iron, Safari, Skyfire, Tizen, Webkit, PaleMoon, Gecko, Trident, Presto, Goanna, * iOS, Android, BlackBerry, BREW, Java, Windows Phone OS, Windows Phone, Windows * CE, Windows NT, Symbian, webOS
* * @returns {String} the "raw" version as String or null if User-Agent doesn't contain this version. * * @function MobileDetect#versionStr */ versionStr: function (key) { return impl.getVersionStr(key, this.ua); }, /** * Global test key against userAgent, os, phone, tablet and some other properties of userAgent string. * * @param {String} key the key (case-insensitive) of a userAgent, an operating system, phone or * tablet family.
* For a complete list of possible values, see {@link MobileDetect#userAgent}, * {@link MobileDetect#os}, {@link MobileDetect#phone}, {@link MobileDetect#tablet}.
* Additionally you have following keys:
*
Bot, MobileBot, DesktopMode, TV, WebKit, Console, Watch
* * @returns {boolean} true when the given key is one of the defined keys of userAgent, os, phone, * tablet or one of the listed additional keys, otherwise false * @function MobileDetect#is */ is: function (key) { return containsIC(this.userAgents(), key) || equalIC(key, this.os()) || equalIC(key, this.phone()) || equalIC(key, this.tablet()) || containsIC(impl.findMatches(impl.mobileDetectRules.utils, this.ua), key); }, /** * Do a quick test against navigator::userAgent. * * @param {String|RegExp} pattern the pattern, either as String or RegExp * (a string will be converted to a case-insensitive RegExp). * @returns {boolean} true when the pattern matches, otherwise false * @function MobileDetect#match */ match: function (pattern) { if (!(pattern instanceof RegExp)) { pattern = new RegExp(pattern, 'i'); } return pattern.test(this.ua); }, /** * Checks whether the mobile device can be considered as phone regarding screen.width. *
* Obviously this method makes sense in browser environments only (not for Node.js)! * @param {number} [maxPhoneWidth] the maximum logical pixels (aka. CSS-pixels) to be considered as phone.
* The argument is optional and if not present or falsy, the value of the constructor is taken. * @returns {boolean|undefined} undefined if screen size wasn't detectable, else true * when screen.width is less or equal to maxPhoneWidth, otherwise false.
* Will always return undefined server-side. */ isPhoneSized: function (maxPhoneWidth) { return MobileDetect.isPhoneSized(maxPhoneWidth || this.maxPhoneWidth); }, /** * Returns the mobile grade ('A', 'B', 'C'). * * @returns {String} one of the mobile grades ('A', 'B', 'C'). * @function MobileDetect#mobileGrade */ mobileGrade: function () { if (this._cache.grade === undefined) { this._cache.grade = impl.mobileGrade(this); } return this._cache.grade; } } : { constructor: { (userAgent: any, maxPhoneWidth: any): void; isPhoneSized(maxPhoneWidth: any): any; _impl: {}; version: string; }; mobile: () => any; phone: () => any; tablet: () => any; userAgent: () => any; userAgents: () => any; os: () => any; version: (key: any) => any; versionStr: (key: any) => any; is: (key: any) => boolean; match: (pattern: any) => any; isPhoneSized: (maxPhoneWidth: any) => any; mobileGrade: () => any; } +>MobileDetect.prototype = { constructor: MobileDetect, /** * Returns the detected phone or tablet type or null if it is not a mobile device. *
* For a list of possible return values see {@link MobileDetect#phone} and {@link MobileDetect#tablet}.
*
* If the device is not detected by the regular expressions from Mobile-Detect, a test is made against * the patterns of detectmobilebrowsers.com. If this test * is positive, a value of UnknownPhone, UnknownTablet or * UnknownMobile is returned.
* When used in browser, the decision whether phone or tablet is made based on screen.width/height.
*
* When used server-side (node.js), there is no way to tell the difference between UnknownTablet * and UnknownMobile, so you will get UnknownMobile here.
* Be aware that since v1.0.0 in this special case you will get UnknownMobile only for: * {@link MobileDetect#mobile}, not for {@link MobileDetect#phone} and {@link MobileDetect#tablet}. * In versions before v1.0.0 all 3 methods returned UnknownMobile which was tedious to use. *
* In most cases you will use the return value just as a boolean. * * @returns {String} the key for the phone family or tablet family, e.g. "Nexus". * @function MobileDetect#mobile */ mobile: function () { impl.prepareDetectionCache(this._cache, this.ua, this.maxPhoneWidth); return this._cache.mobile; }, /** * Returns the detected phone type/family string or null. *
* The returned tablet (family or producer) is one of following keys:
*
iPhone, BlackBerry, HTC, Nexus, Dell, Motorola, Samsung, LG, Sony, Asus, * NokiaLumia, Micromax, Palm, Vertu, Pantech, Fly, Wiko, iMobile, SimValley, * Wolfgang, Alcatel, Nintendo, Amoi, INQ, GenericPhone
*
* If the device is not detected by the regular expressions from Mobile-Detect, a test is made against * the patterns of detectmobilebrowsers.com. If this test * is positive, a value of UnknownPhone or UnknownMobile is returned.
* When used in browser, the decision whether phone or tablet is made based on screen.width/height.
*
* When used server-side (node.js), there is no way to tell the difference between UnknownTablet * and UnknownMobile, so you will get null here, while {@link MobileDetect#mobile} * will return UnknownMobile.
* Be aware that since v1.0.0 in this special case you will get UnknownMobile only for: * {@link MobileDetect#mobile}, not for {@link MobileDetect#phone} and {@link MobileDetect#tablet}. * In versions before v1.0.0 all 3 methods returned UnknownMobile which was tedious to use. *
* In most cases you will use the return value just as a boolean. * * @returns {String} the key of the phone family or producer, e.g. "iPhone" * @function MobileDetect#phone */ phone: function () { impl.prepareDetectionCache(this._cache, this.ua, this.maxPhoneWidth); return this._cache.phone; }, /** * Returns the detected tablet type/family string or null. *
* The returned tablet (family or producer) is one of following keys:
*
iPad, NexusTablet, SamsungTablet, Kindle, SurfaceTablet, HPTablet, AsusTablet, * BlackBerryTablet, HTCtablet, MotorolaTablet, NookTablet, AcerTablet, * ToshibaTablet, LGTablet, FujitsuTablet, PrestigioTablet, LenovoTablet, * DellTablet, YarvikTablet, MedionTablet, ArnovaTablet, IntensoTablet, IRUTablet, * MegafonTablet, EbodaTablet, AllViewTablet, ArchosTablet, AinolTablet, * NokiaLumiaTablet, SonyTablet, PhilipsTablet, CubeTablet, CobyTablet, MIDTablet, * MSITablet, SMiTTablet, RockChipTablet, FlyTablet, bqTablet, HuaweiTablet, * NecTablet, PantechTablet, BronchoTablet, VersusTablet, ZyncTablet, * PositivoTablet, NabiTablet, KoboTablet, DanewTablet, TexetTablet, * PlaystationTablet, TrekstorTablet, PyleAudioTablet, AdvanTablet, * DanyTechTablet, GalapadTablet, MicromaxTablet, KarbonnTablet, AllFineTablet, * PROSCANTablet, YONESTablet, ChangJiaTablet, GUTablet, PointOfViewTablet, * OvermaxTablet, HCLTablet, DPSTablet, VistureTablet, CrestaTablet, * MediatekTablet, ConcordeTablet, GoCleverTablet, ModecomTablet, VoninoTablet, * ECSTablet, StorexTablet, VodafoneTablet, EssentielBTablet, RossMoorTablet, * iMobileTablet, TolinoTablet, AudioSonicTablet, AMPETablet, SkkTablet, * TecnoTablet, JXDTablet, iJoyTablet, FX2Tablet, XoroTablet, ViewsonicTablet, * OdysTablet, CaptivaTablet, IconbitTablet, TeclastTablet, OndaTablet, * JaytechTablet, BlaupunktTablet, DigmaTablet, EvolioTablet, LavaTablet, * AocTablet, MpmanTablet, CelkonTablet, WolderTablet, MiTablet, NibiruTablet, * NexoTablet, LeaderTablet, UbislateTablet, PocketBookTablet, KocasoTablet, Hudl, * TelstraTablet, GenericTablet
*
* If the device is not detected by the regular expressions from Mobile-Detect, a test is made against * the patterns of detectmobilebrowsers.com. If this test * is positive, a value of UnknownTablet or UnknownMobile is returned.
* When used in browser, the decision whether phone or tablet is made based on screen.width/height.
*
* When used server-side (node.js), there is no way to tell the difference between UnknownTablet * and UnknownMobile, so you will get null here, while {@link MobileDetect#mobile} * will return UnknownMobile.
* Be aware that since v1.0.0 in this special case you will get UnknownMobile only for: * {@link MobileDetect#mobile}, not for {@link MobileDetect#phone} and {@link MobileDetect#tablet}. * In versions before v1.0.0 all 3 methods returned UnknownMobile which was tedious to use. *
* In most cases you will use the return value just as a boolean. * * @returns {String} the key of the tablet family or producer, e.g. "SamsungTablet" * @function MobileDetect#tablet */ tablet: function () { impl.prepareDetectionCache(this._cache, this.ua, this.maxPhoneWidth); return this._cache.tablet; }, /** * Returns the (first) detected user-agent string or null. *
* The returned user-agent is one of following keys:
*
Vivaldi, Chrome, Dolfin, Opera, Skyfire, Edge, IE, Firefox, Bolt, TeaShark, * Blazer, Safari, Tizen, UCBrowser, baiduboxapp, baidubrowser, DiigoBrowser, * Puffin, Mercury, ObigoBrowser, NetFront, GenericBrowser, PaleMoon
*
* In most cases calling {@link MobileDetect#userAgent} will be sufficient. But there are rare * cases where a mobile device pretends to be more than one particular browser. You can get the * list of all matches with {@link MobileDetect#userAgents} or check for a particular value by * providing one of the defined keys as first argument to {@link MobileDetect#is}. * * @returns {String} the key for the detected user-agent or null * @function MobileDetect#userAgent */ userAgent: function () { if (this._cache.userAgent === undefined) { this._cache.userAgent = impl.findMatch(impl.mobileDetectRules.uas, this.ua); } return this._cache.userAgent; }, /** * Returns all detected user-agent strings. *
* The array is empty or contains one or more of following keys:
*
Vivaldi, Chrome, Dolfin, Opera, Skyfire, Edge, IE, Firefox, Bolt, TeaShark, * Blazer, Safari, Tizen, UCBrowser, baiduboxapp, baidubrowser, DiigoBrowser, * Puffin, Mercury, ObigoBrowser, NetFront, GenericBrowser, PaleMoon
*
* In most cases calling {@link MobileDetect#userAgent} will be sufficient. But there are rare * cases where a mobile device pretends to be more than one particular browser. You can get the * list of all matches with {@link MobileDetect#userAgents} or check for a particular value by * providing one of the defined keys as first argument to {@link MobileDetect#is}. * * @returns {Array} the array of detected user-agent keys or [] * @function MobileDetect#userAgents */ userAgents: function () { if (this._cache.userAgents === undefined) { this._cache.userAgents = impl.findMatches(impl.mobileDetectRules.uas, this.ua); } return this._cache.userAgents; }, /** * Returns the detected operating system string or null. *
* The operating system is one of following keys:
*
androids, BlackBerryOS, PalmOS, SymbianOS, WindowsMobileOS, WindowsPhoneOS, * iOS, MeeGoOS, MaemoOS, JavaOS, webOS, badaOS, BREWOS
* * @returns {String} the key for the detected operating system. * @function MobileDetect#os */ os: function () { if (this._cache.os === undefined) { this._cache.os = impl.detectOS(this.ua); } return this._cache.os; }, /** * Get the version (as Number) of the given property in the User-Agent. *
* Will return a float number. (eg. 2_0 will return 2.0, 4.3.1 will return 4.31) * * @param {String} key a key defining a thing which has a version.
* You can use one of following keys:
*
Mobile, Build, Version, VendorID, iPad, iPhone, iPod, Kindle, Chrome, Coast, * Dolfin, Firefox, Fennec, Edge, IE, NetFront, NokiaBrowser, Opera, Opera Mini, * Opera Mobi, UC Browser, MQQBrowser, MicroMessenger, baiduboxapp, baidubrowser, * Iron, Safari, Skyfire, Tizen, Webkit, PaleMoon, Gecko, Trident, Presto, Goanna, * iOS, Android, BlackBerry, BREW, Java, Windows Phone OS, Windows Phone, Windows * CE, Windows NT, Symbian, webOS
* * @returns {Number} the version as float or NaN if User-Agent doesn't contain this version. * Be careful when comparing this value with '==' operator! * @function MobileDetect#version */ version: function (key) { return impl.getVersion(key, this.ua); }, /** * Get the version (as String) of the given property in the User-Agent. *
* * @param {String} key a key defining a thing which has a version.
* You can use one of following keys:
*
Mobile, Build, Version, VendorID, iPad, iPhone, iPod, Kindle, Chrome, Coast, * Dolfin, Firefox, Fennec, Edge, IE, NetFront, NokiaBrowser, Opera, Opera Mini, * Opera Mobi, UC Browser, MQQBrowser, MicroMessenger, baiduboxapp, baidubrowser, * Iron, Safari, Skyfire, Tizen, Webkit, PaleMoon, Gecko, Trident, Presto, Goanna, * iOS, Android, BlackBerry, BREW, Java, Windows Phone OS, Windows Phone, Windows * CE, Windows NT, Symbian, webOS
* * @returns {String} the "raw" version as String or null if User-Agent doesn't contain this version. * * @function MobileDetect#versionStr */ versionStr: function (key) { return impl.getVersionStr(key, this.ua); }, /** * Global test key against userAgent, os, phone, tablet and some other properties of userAgent string. * * @param {String} key the key (case-insensitive) of a userAgent, an operating system, phone or * tablet family.
* For a complete list of possible values, see {@link MobileDetect#userAgent}, * {@link MobileDetect#os}, {@link MobileDetect#phone}, {@link MobileDetect#tablet}.
* Additionally you have following keys:
*
Bot, MobileBot, DesktopMode, TV, WebKit, Console, Watch
* * @returns {boolean} true when the given key is one of the defined keys of userAgent, os, phone, * tablet or one of the listed additional keys, otherwise false * @function MobileDetect#is */ is: function (key) { return containsIC(this.userAgents(), key) || equalIC(key, this.os()) || equalIC(key, this.phone()) || equalIC(key, this.tablet()) || containsIC(impl.findMatches(impl.mobileDetectRules.utils, this.ua), key); }, /** * Do a quick test against navigator::userAgent. * * @param {String|RegExp} pattern the pattern, either as String or RegExp * (a string will be converted to a case-insensitive RegExp). * @returns {boolean} true when the pattern matches, otherwise false * @function MobileDetect#match */ match: function (pattern) { if (!(pattern instanceof RegExp)) { pattern = new RegExp(pattern, 'i'); } return pattern.test(this.ua); }, /** * Checks whether the mobile device can be considered as phone regarding screen.width. *
* Obviously this method makes sense in browser environments only (not for Node.js)! * @param {number} [maxPhoneWidth] the maximum logical pixels (aka. CSS-pixels) to be considered as phone.
* The argument is optional and if not present or falsy, the value of the constructor is taken. * @returns {boolean|undefined} undefined if screen size wasn't detectable, else true * when screen.width is less or equal to maxPhoneWidth, otherwise false.
* Will always return undefined server-side. */ isPhoneSized: function (maxPhoneWidth) { return MobileDetect.isPhoneSized(maxPhoneWidth || this.maxPhoneWidth); }, /** * Returns the mobile grade ('A', 'B', 'C'). * * @returns {String} one of the mobile grades ('A', 'B', 'C'). * @function MobileDetect#mobileGrade */ mobileGrade: function () { if (this._cache.grade === undefined) { this._cache.grade = impl.mobileGrade(this); } return this._cache.grade; } } : { constructor: { (userAgent: any, maxPhoneWidth: any): void; isPhoneSized(maxPhoneWidth: any): any; _impl: {}; version: string; }; mobile: () => any; phone: () => any; tablet: () => any; userAgent: () => any; userAgents: () => any; os: () => any; version: (key: any) => any; versionStr: (key: any) => any; is: (key: any) => boolean; match: (pattern: any) => any; isPhoneSized: (maxPhoneWidth: any) => any; mobileGrade: () => any; } > : ^^^^^^^^^^^^^^^^^^ ^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ >MobileDetect.prototype : any > : ^^^ @@ -4559,7 +4559,7 @@ define(function () { > : ^^^ ^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ >prototype : any > : ^^^ ->{ constructor: MobileDetect, /** * Returns the detected phone or tablet type or null if it is not a mobile device. *
* For a list of possible return values see {@link MobileDetect#phone} and {@link MobileDetect#tablet}.
*
* If the device is not detected by the regular expressions from Mobile-Detect, a test is made against * the patterns of detectmobilebrowsers.com. If this test * is positive, a value of UnknownPhone, UnknownTablet or * UnknownMobile is returned.
* When used in browser, the decision whether phone or tablet is made based on screen.width/height.
*
* When used server-side (node.js), there is no way to tell the difference between UnknownTablet * and UnknownMobile, so you will get UnknownMobile here.
* Be aware that since v1.0.0 in this special case you will get UnknownMobile only for: * {@link MobileDetect#mobile}, not for {@link MobileDetect#phone} and {@link MobileDetect#tablet}. * In versions before v1.0.0 all 3 methods returned UnknownMobile which was tedious to use. *
* In most cases you will use the return value just as a boolean. * * @returns {String} the key for the phone family or tablet family, e.g. "Nexus". * @function MobileDetect#mobile */ mobile: function () { impl.prepareDetectionCache(this._cache, this.ua, this.maxPhoneWidth); return this._cache.mobile; }, /** * Returns the detected phone type/family string or null. *
* The returned tablet (family or producer) is one of following keys:
*
iPhone, BlackBerry, HTC, Nexus, Dell, Motorola, Samsung, LG, Sony, Asus, * NokiaLumia, Micromax, Palm, Vertu, Pantech, Fly, Wiko, iMobile, SimValley, * Wolfgang, Alcatel, Nintendo, Amoi, INQ, GenericPhone
*
* If the device is not detected by the regular expressions from Mobile-Detect, a test is made against * the patterns of detectmobilebrowsers.com. If this test * is positive, a value of UnknownPhone or UnknownMobile is returned.
* When used in browser, the decision whether phone or tablet is made based on screen.width/height.
*
* When used server-side (node.js), there is no way to tell the difference between UnknownTablet * and UnknownMobile, so you will get null here, while {@link MobileDetect#mobile} * will return UnknownMobile.
* Be aware that since v1.0.0 in this special case you will get UnknownMobile only for: * {@link MobileDetect#mobile}, not for {@link MobileDetect#phone} and {@link MobileDetect#tablet}. * In versions before v1.0.0 all 3 methods returned UnknownMobile which was tedious to use. *
* In most cases you will use the return value just as a boolean. * * @returns {String} the key of the phone family or producer, e.g. "iPhone" * @function MobileDetect#phone */ phone: function () { impl.prepareDetectionCache(this._cache, this.ua, this.maxPhoneWidth); return this._cache.phone; }, /** * Returns the detected tablet type/family string or null. *
* The returned tablet (family or producer) is one of following keys:
*
iPad, NexusTablet, SamsungTablet, Kindle, SurfaceTablet, HPTablet, AsusTablet, * BlackBerryTablet, HTCtablet, MotorolaTablet, NookTablet, AcerTablet, * ToshibaTablet, LGTablet, FujitsuTablet, PrestigioTablet, LenovoTablet, * DellTablet, YarvikTablet, MedionTablet, ArnovaTablet, IntensoTablet, IRUTablet, * MegafonTablet, EbodaTablet, AllViewTablet, ArchosTablet, AinolTablet, * NokiaLumiaTablet, SonyTablet, PhilipsTablet, CubeTablet, CobyTablet, MIDTablet, * MSITablet, SMiTTablet, RockChipTablet, FlyTablet, bqTablet, HuaweiTablet, * NecTablet, PantechTablet, BronchoTablet, VersusTablet, ZyncTablet, * PositivoTablet, NabiTablet, KoboTablet, DanewTablet, TexetTablet, * PlaystationTablet, TrekstorTablet, PyleAudioTablet, AdvanTablet, * DanyTechTablet, GalapadTablet, MicromaxTablet, KarbonnTablet, AllFineTablet, * PROSCANTablet, YONESTablet, ChangJiaTablet, GUTablet, PointOfViewTablet, * OvermaxTablet, HCLTablet, DPSTablet, VistureTablet, CrestaTablet, * MediatekTablet, ConcordeTablet, GoCleverTablet, ModecomTablet, VoninoTablet, * ECSTablet, StorexTablet, VodafoneTablet, EssentielBTablet, RossMoorTablet, * iMobileTablet, TolinoTablet, AudioSonicTablet, AMPETablet, SkkTablet, * TecnoTablet, JXDTablet, iJoyTablet, FX2Tablet, XoroTablet, ViewsonicTablet, * OdysTablet, CaptivaTablet, IconbitTablet, TeclastTablet, OndaTablet, * JaytechTablet, BlaupunktTablet, DigmaTablet, EvolioTablet, LavaTablet, * AocTablet, MpmanTablet, CelkonTablet, WolderTablet, MiTablet, NibiruTablet, * NexoTablet, LeaderTablet, UbislateTablet, PocketBookTablet, KocasoTablet, Hudl, * TelstraTablet, GenericTablet
*
* If the device is not detected by the regular expressions from Mobile-Detect, a test is made against * the patterns of detectmobilebrowsers.com. If this test * is positive, a value of UnknownTablet or UnknownMobile is returned.
* When used in browser, the decision whether phone or tablet is made based on screen.width/height.
*
* When used server-side (node.js), there is no way to tell the difference between UnknownTablet * and UnknownMobile, so you will get null here, while {@link MobileDetect#mobile} * will return UnknownMobile.
* Be aware that since v1.0.0 in this special case you will get UnknownMobile only for: * {@link MobileDetect#mobile}, not for {@link MobileDetect#phone} and {@link MobileDetect#tablet}. * In versions before v1.0.0 all 3 methods returned UnknownMobile which was tedious to use. *
* In most cases you will use the return value just as a boolean. * * @returns {String} the key of the tablet family or producer, e.g. "SamsungTablet" * @function MobileDetect#tablet */ tablet: function () { impl.prepareDetectionCache(this._cache, this.ua, this.maxPhoneWidth); return this._cache.tablet; }, /** * Returns the (first) detected user-agent string or null. *
* The returned user-agent is one of following keys:
*
Vivaldi, Chrome, Dolfin, Opera, Skyfire, Edge, IE, Firefox, Bolt, TeaShark, * Blazer, Safari, Tizen, UCBrowser, baiduboxapp, baidubrowser, DiigoBrowser, * Puffin, Mercury, ObigoBrowser, NetFront, GenericBrowser, PaleMoon
*
* In most cases calling {@link MobileDetect#userAgent} will be sufficient. But there are rare * cases where a mobile device pretends to be more than one particular browser. You can get the * list of all matches with {@link MobileDetect#userAgents} or check for a particular value by * providing one of the defined keys as first argument to {@link MobileDetect#is}. * * @returns {String} the key for the detected user-agent or null * @function MobileDetect#userAgent */ userAgent: function () { if (this._cache.userAgent === undefined) { this._cache.userAgent = impl.findMatch(impl.mobileDetectRules.uas, this.ua); } return this._cache.userAgent; }, /** * Returns all detected user-agent strings. *
* The array is empty or contains one or more of following keys:
*
Vivaldi, Chrome, Dolfin, Opera, Skyfire, Edge, IE, Firefox, Bolt, TeaShark, * Blazer, Safari, Tizen, UCBrowser, baiduboxapp, baidubrowser, DiigoBrowser, * Puffin, Mercury, ObigoBrowser, NetFront, GenericBrowser, PaleMoon
*
* In most cases calling {@link MobileDetect#userAgent} will be sufficient. But there are rare * cases where a mobile device pretends to be more than one particular browser. You can get the * list of all matches with {@link MobileDetect#userAgents} or check for a particular value by * providing one of the defined keys as first argument to {@link MobileDetect#is}. * * @returns {Array} the array of detected user-agent keys or [] * @function MobileDetect#userAgents */ userAgents: function () { if (this._cache.userAgents === undefined) { this._cache.userAgents = impl.findMatches(impl.mobileDetectRules.uas, this.ua); } return this._cache.userAgents; }, /** * Returns the detected operating system string or null. *
* The operating system is one of following keys:
*
AndroidOS, BlackBerryOS, PalmOS, SymbianOS, WindowsMobileOS, WindowsPhoneOS, * iOS, MeeGoOS, MaemoOS, JavaOS, webOS, badaOS, BREWOS
* * @returns {String} the key for the detected operating system. * @function MobileDetect#os */ os: function () { if (this._cache.os === undefined) { this._cache.os = impl.detectOS(this.ua); } return this._cache.os; }, /** * Get the version (as Number) of the given property in the User-Agent. *
* Will return a float number. (eg. 2_0 will return 2.0, 4.3.1 will return 4.31) * * @param {String} key a key defining a thing which has a version.
* You can use one of following keys:
*
Mobile, Build, Version, VendorID, iPad, iPhone, iPod, Kindle, Chrome, Coast, * Dolfin, Firefox, Fennec, Edge, IE, NetFront, NokiaBrowser, Opera, Opera Mini, * Opera Mobi, UC Browser, MQQBrowser, MicroMessenger, baiduboxapp, baidubrowser, * Iron, Safari, Skyfire, Tizen, Webkit, PaleMoon, Gecko, Trident, Presto, Goanna, * iOS, Android, BlackBerry, BREW, Java, Windows Phone OS, Windows Phone, Windows * CE, Windows NT, Symbian, webOS
* * @returns {Number} the version as float or NaN if User-Agent doesn't contain this version. * Be careful when comparing this value with '==' operator! * @function MobileDetect#version */ version: function (key) { return impl.getVersion(key, this.ua); }, /** * Get the version (as String) of the given property in the User-Agent. *
* * @param {String} key a key defining a thing which has a version.
* You can use one of following keys:
*
Mobile, Build, Version, VendorID, iPad, iPhone, iPod, Kindle, Chrome, Coast, * Dolfin, Firefox, Fennec, Edge, IE, NetFront, NokiaBrowser, Opera, Opera Mini, * Opera Mobi, UC Browser, MQQBrowser, MicroMessenger, baiduboxapp, baidubrowser, * Iron, Safari, Skyfire, Tizen, Webkit, PaleMoon, Gecko, Trident, Presto, Goanna, * iOS, Android, BlackBerry, BREW, Java, Windows Phone OS, Windows Phone, Windows * CE, Windows NT, Symbian, webOS
* * @returns {String} the "raw" version as String or null if User-Agent doesn't contain this version. * * @function MobileDetect#versionStr */ versionStr: function (key) { return impl.getVersionStr(key, this.ua); }, /** * Global test key against userAgent, os, phone, tablet and some other properties of userAgent string. * * @param {String} key the key (case-insensitive) of a userAgent, an operating system, phone or * tablet family.
* For a complete list of possible values, see {@link MobileDetect#userAgent}, * {@link MobileDetect#os}, {@link MobileDetect#phone}, {@link MobileDetect#tablet}.
* Additionally you have following keys:
*
Bot, MobileBot, DesktopMode, TV, WebKit, Console, Watch
* * @returns {boolean} true when the given key is one of the defined keys of userAgent, os, phone, * tablet or one of the listed additional keys, otherwise false * @function MobileDetect#is */ is: function (key) { return containsIC(this.userAgents(), key) || equalIC(key, this.os()) || equalIC(key, this.phone()) || equalIC(key, this.tablet()) || containsIC(impl.findMatches(impl.mobileDetectRules.utils, this.ua), key); }, /** * Do a quick test against navigator::userAgent. * * @param {String|RegExp} pattern the pattern, either as String or RegExp * (a string will be converted to a case-insensitive RegExp). * @returns {boolean} true when the pattern matches, otherwise false * @function MobileDetect#match */ match: function (pattern) { if (!(pattern instanceof RegExp)) { pattern = new RegExp(pattern, 'i'); } return pattern.test(this.ua); }, /** * Checks whether the mobile device can be considered as phone regarding screen.width. *
* Obviously this method makes sense in browser environments only (not for Node.js)! * @param {number} [maxPhoneWidth] the maximum logical pixels (aka. CSS-pixels) to be considered as phone.
* The argument is optional and if not present or falsy, the value of the constructor is taken. * @returns {boolean|undefined} undefined if screen size wasn't detectable, else true * when screen.width is less or equal to maxPhoneWidth, otherwise false.
* Will always return undefined server-side. */ isPhoneSized: function (maxPhoneWidth) { return MobileDetect.isPhoneSized(maxPhoneWidth || this.maxPhoneWidth); }, /** * Returns the mobile grade ('A', 'B', 'C'). * * @returns {String} one of the mobile grades ('A', 'B', 'C'). * @function MobileDetect#mobileGrade */ mobileGrade: function () { if (this._cache.grade === undefined) { this._cache.grade = impl.mobileGrade(this); } return this._cache.grade; } } : { constructor: { (userAgent: any, maxPhoneWidth: any): void; isPhoneSized(maxPhoneWidth: any): any; _impl: {}; version: string; }; mobile: () => any; phone: () => any; tablet: () => any; userAgent: () => any; userAgents: () => any; os: () => any; version: (key: any) => any; versionStr: (key: any) => any; is: (key: any) => boolean; match: (pattern: any) => any; isPhoneSized: (maxPhoneWidth: any) => any; mobileGrade: () => any; } +>{ constructor: MobileDetect, /** * Returns the detected phone or tablet type or null if it is not a mobile device. *
* For a list of possible return values see {@link MobileDetect#phone} and {@link MobileDetect#tablet}.
*
* If the device is not detected by the regular expressions from Mobile-Detect, a test is made against * the patterns of detectmobilebrowsers.com. If this test * is positive, a value of UnknownPhone, UnknownTablet or * UnknownMobile is returned.
* When used in browser, the decision whether phone or tablet is made based on screen.width/height.
*
* When used server-side (node.js), there is no way to tell the difference between UnknownTablet * and UnknownMobile, so you will get UnknownMobile here.
* Be aware that since v1.0.0 in this special case you will get UnknownMobile only for: * {@link MobileDetect#mobile}, not for {@link MobileDetect#phone} and {@link MobileDetect#tablet}. * In versions before v1.0.0 all 3 methods returned UnknownMobile which was tedious to use. *
* In most cases you will use the return value just as a boolean. * * @returns {String} the key for the phone family or tablet family, e.g. "Nexus". * @function MobileDetect#mobile */ mobile: function () { impl.prepareDetectionCache(this._cache, this.ua, this.maxPhoneWidth); return this._cache.mobile; }, /** * Returns the detected phone type/family string or null. *
* The returned tablet (family or producer) is one of following keys:
*
iPhone, BlackBerry, HTC, Nexus, Dell, Motorola, Samsung, LG, Sony, Asus, * NokiaLumia, Micromax, Palm, Vertu, Pantech, Fly, Wiko, iMobile, SimValley, * Wolfgang, Alcatel, Nintendo, Amoi, INQ, GenericPhone
*
* If the device is not detected by the regular expressions from Mobile-Detect, a test is made against * the patterns of detectmobilebrowsers.com. If this test * is positive, a value of UnknownPhone or UnknownMobile is returned.
* When used in browser, the decision whether phone or tablet is made based on screen.width/height.
*
* When used server-side (node.js), there is no way to tell the difference between UnknownTablet * and UnknownMobile, so you will get null here, while {@link MobileDetect#mobile} * will return UnknownMobile.
* Be aware that since v1.0.0 in this special case you will get UnknownMobile only for: * {@link MobileDetect#mobile}, not for {@link MobileDetect#phone} and {@link MobileDetect#tablet}. * In versions before v1.0.0 all 3 methods returned UnknownMobile which was tedious to use. *
* In most cases you will use the return value just as a boolean. * * @returns {String} the key of the phone family or producer, e.g. "iPhone" * @function MobileDetect#phone */ phone: function () { impl.prepareDetectionCache(this._cache, this.ua, this.maxPhoneWidth); return this._cache.phone; }, /** * Returns the detected tablet type/family string or null. *
* The returned tablet (family or producer) is one of following keys:
*
iPad, NexusTablet, SamsungTablet, Kindle, SurfaceTablet, HPTablet, AsusTablet, * BlackBerryTablet, HTCtablet, MotorolaTablet, NookTablet, AcerTablet, * ToshibaTablet, LGTablet, FujitsuTablet, PrestigioTablet, LenovoTablet, * DellTablet, YarvikTablet, MedionTablet, ArnovaTablet, IntensoTablet, IRUTablet, * MegafonTablet, EbodaTablet, AllViewTablet, ArchosTablet, AinolTablet, * NokiaLumiaTablet, SonyTablet, PhilipsTablet, CubeTablet, CobyTablet, MIDTablet, * MSITablet, SMiTTablet, RockChipTablet, FlyTablet, bqTablet, HuaweiTablet, * NecTablet, PantechTablet, BronchoTablet, VersusTablet, ZyncTablet, * PositivoTablet, NabiTablet, KoboTablet, DanewTablet, TexetTablet, * PlaystationTablet, TrekstorTablet, PyleAudioTablet, AdvanTablet, * DanyTechTablet, GalapadTablet, MicromaxTablet, KarbonnTablet, AllFineTablet, * PROSCANTablet, YONESTablet, ChangJiaTablet, GUTablet, PointOfViewTablet, * OvermaxTablet, HCLTablet, DPSTablet, VistureTablet, CrestaTablet, * MediatekTablet, ConcordeTablet, GoCleverTablet, ModecomTablet, VoninoTablet, * ECSTablet, StorexTablet, VodafoneTablet, EssentielBTablet, RossMoorTablet, * iMobileTablet, TolinoTablet, AudioSonicTablet, AMPETablet, SkkTablet, * TecnoTablet, JXDTablet, iJoyTablet, FX2Tablet, XoroTablet, ViewsonicTablet, * OdysTablet, CaptivaTablet, IconbitTablet, TeclastTablet, OndaTablet, * JaytechTablet, BlaupunktTablet, DigmaTablet, EvolioTablet, LavaTablet, * AocTablet, MpmanTablet, CelkonTablet, WolderTablet, MiTablet, NibiruTablet, * NexoTablet, LeaderTablet, UbislateTablet, PocketBookTablet, KocasoTablet, Hudl, * TelstraTablet, GenericTablet
*
* If the device is not detected by the regular expressions from Mobile-Detect, a test is made against * the patterns of detectmobilebrowsers.com. If this test * is positive, a value of UnknownTablet or UnknownMobile is returned.
* When used in browser, the decision whether phone or tablet is made based on screen.width/height.
*
* When used server-side (node.js), there is no way to tell the difference between UnknownTablet * and UnknownMobile, so you will get null here, while {@link MobileDetect#mobile} * will return UnknownMobile.
* Be aware that since v1.0.0 in this special case you will get UnknownMobile only for: * {@link MobileDetect#mobile}, not for {@link MobileDetect#phone} and {@link MobileDetect#tablet}. * In versions before v1.0.0 all 3 methods returned UnknownMobile which was tedious to use. *
* In most cases you will use the return value just as a boolean. * * @returns {String} the key of the tablet family or producer, e.g. "SamsungTablet" * @function MobileDetect#tablet */ tablet: function () { impl.prepareDetectionCache(this._cache, this.ua, this.maxPhoneWidth); return this._cache.tablet; }, /** * Returns the (first) detected user-agent string or null. *
* The returned user-agent is one of following keys:
*
Vivaldi, Chrome, Dolfin, Opera, Skyfire, Edge, IE, Firefox, Bolt, TeaShark, * Blazer, Safari, Tizen, UCBrowser, baiduboxapp, baidubrowser, DiigoBrowser, * Puffin, Mercury, ObigoBrowser, NetFront, GenericBrowser, PaleMoon
*
* In most cases calling {@link MobileDetect#userAgent} will be sufficient. But there are rare * cases where a mobile device pretends to be more than one particular browser. You can get the * list of all matches with {@link MobileDetect#userAgents} or check for a particular value by * providing one of the defined keys as first argument to {@link MobileDetect#is}. * * @returns {String} the key for the detected user-agent or null * @function MobileDetect#userAgent */ userAgent: function () { if (this._cache.userAgent === undefined) { this._cache.userAgent = impl.findMatch(impl.mobileDetectRules.uas, this.ua); } return this._cache.userAgent; }, /** * Returns all detected user-agent strings. *
* The array is empty or contains one or more of following keys:
*
Vivaldi, Chrome, Dolfin, Opera, Skyfire, Edge, IE, Firefox, Bolt, TeaShark, * Blazer, Safari, Tizen, UCBrowser, baiduboxapp, baidubrowser, DiigoBrowser, * Puffin, Mercury, ObigoBrowser, NetFront, GenericBrowser, PaleMoon
*
* In most cases calling {@link MobileDetect#userAgent} will be sufficient. But there are rare * cases where a mobile device pretends to be more than one particular browser. You can get the * list of all matches with {@link MobileDetect#userAgents} or check for a particular value by * providing one of the defined keys as first argument to {@link MobileDetect#is}. * * @returns {Array} the array of detected user-agent keys or [] * @function MobileDetect#userAgents */ userAgents: function () { if (this._cache.userAgents === undefined) { this._cache.userAgents = impl.findMatches(impl.mobileDetectRules.uas, this.ua); } return this._cache.userAgents; }, /** * Returns the detected operating system string or null. *
* The operating system is one of following keys:
*
androids, BlackBerryOS, PalmOS, SymbianOS, WindowsMobileOS, WindowsPhoneOS, * iOS, MeeGoOS, MaemoOS, JavaOS, webOS, badaOS, BREWOS
* * @returns {String} the key for the detected operating system. * @function MobileDetect#os */ os: function () { if (this._cache.os === undefined) { this._cache.os = impl.detectOS(this.ua); } return this._cache.os; }, /** * Get the version (as Number) of the given property in the User-Agent. *
* Will return a float number. (eg. 2_0 will return 2.0, 4.3.1 will return 4.31) * * @param {String} key a key defining a thing which has a version.
* You can use one of following keys:
*
Mobile, Build, Version, VendorID, iPad, iPhone, iPod, Kindle, Chrome, Coast, * Dolfin, Firefox, Fennec, Edge, IE, NetFront, NokiaBrowser, Opera, Opera Mini, * Opera Mobi, UC Browser, MQQBrowser, MicroMessenger, baiduboxapp, baidubrowser, * Iron, Safari, Skyfire, Tizen, Webkit, PaleMoon, Gecko, Trident, Presto, Goanna, * iOS, Android, BlackBerry, BREW, Java, Windows Phone OS, Windows Phone, Windows * CE, Windows NT, Symbian, webOS
* * @returns {Number} the version as float or NaN if User-Agent doesn't contain this version. * Be careful when comparing this value with '==' operator! * @function MobileDetect#version */ version: function (key) { return impl.getVersion(key, this.ua); }, /** * Get the version (as String) of the given property in the User-Agent. *
* * @param {String} key a key defining a thing which has a version.
* You can use one of following keys:
*
Mobile, Build, Version, VendorID, iPad, iPhone, iPod, Kindle, Chrome, Coast, * Dolfin, Firefox, Fennec, Edge, IE, NetFront, NokiaBrowser, Opera, Opera Mini, * Opera Mobi, UC Browser, MQQBrowser, MicroMessenger, baiduboxapp, baidubrowser, * Iron, Safari, Skyfire, Tizen, Webkit, PaleMoon, Gecko, Trident, Presto, Goanna, * iOS, Android, BlackBerry, BREW, Java, Windows Phone OS, Windows Phone, Windows * CE, Windows NT, Symbian, webOS
* * @returns {String} the "raw" version as String or null if User-Agent doesn't contain this version. * * @function MobileDetect#versionStr */ versionStr: function (key) { return impl.getVersionStr(key, this.ua); }, /** * Global test key against userAgent, os, phone, tablet and some other properties of userAgent string. * * @param {String} key the key (case-insensitive) of a userAgent, an operating system, phone or * tablet family.
* For a complete list of possible values, see {@link MobileDetect#userAgent}, * {@link MobileDetect#os}, {@link MobileDetect#phone}, {@link MobileDetect#tablet}.
* Additionally you have following keys:
*
Bot, MobileBot, DesktopMode, TV, WebKit, Console, Watch
* * @returns {boolean} true when the given key is one of the defined keys of userAgent, os, phone, * tablet or one of the listed additional keys, otherwise false * @function MobileDetect#is */ is: function (key) { return containsIC(this.userAgents(), key) || equalIC(key, this.os()) || equalIC(key, this.phone()) || equalIC(key, this.tablet()) || containsIC(impl.findMatches(impl.mobileDetectRules.utils, this.ua), key); }, /** * Do a quick test against navigator::userAgent. * * @param {String|RegExp} pattern the pattern, either as String or RegExp * (a string will be converted to a case-insensitive RegExp). * @returns {boolean} true when the pattern matches, otherwise false * @function MobileDetect#match */ match: function (pattern) { if (!(pattern instanceof RegExp)) { pattern = new RegExp(pattern, 'i'); } return pattern.test(this.ua); }, /** * Checks whether the mobile device can be considered as phone regarding screen.width. *
* Obviously this method makes sense in browser environments only (not for Node.js)! * @param {number} [maxPhoneWidth] the maximum logical pixels (aka. CSS-pixels) to be considered as phone.
* The argument is optional and if not present or falsy, the value of the constructor is taken. * @returns {boolean|undefined} undefined if screen size wasn't detectable, else true * when screen.width is less or equal to maxPhoneWidth, otherwise false.
* Will always return undefined server-side. */ isPhoneSized: function (maxPhoneWidth) { return MobileDetect.isPhoneSized(maxPhoneWidth || this.maxPhoneWidth); }, /** * Returns the mobile grade ('A', 'B', 'C'). * * @returns {String} one of the mobile grades ('A', 'B', 'C'). * @function MobileDetect#mobileGrade */ mobileGrade: function () { if (this._cache.grade === undefined) { this._cache.grade = impl.mobileGrade(this); } return this._cache.grade; } } : { constructor: { (userAgent: any, maxPhoneWidth: any): void; isPhoneSized(maxPhoneWidth: any): any; _impl: {}; version: string; }; mobile: () => any; phone: () => any; tablet: () => any; userAgent: () => any; userAgents: () => any; os: () => any; version: (key: any) => any; versionStr: (key: any) => any; is: (key: any) => boolean; match: (pattern: any) => any; isPhoneSized: (maxPhoneWidth: any) => any; mobileGrade: () => any; } > : ^^^^^^^^^^^^^^^^^^ ^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ constructor: MobileDetect, @@ -4987,7 +4987,7 @@ define(function () { * Returns the detected operating system string or null. *
* The operating system is one of following keys:
- *
AndroidOS, BlackBerryOS, PalmOS, SymbianOS, WindowsMobileOS, WindowsPhoneOS, + *
androids, BlackBerryOS, PalmOS, SymbianOS, WindowsMobileOS, WindowsPhoneOS, * iOS, MeeGoOS, MaemoOS, JavaOS, webOS, badaOS, BREWOS
* * @returns {String} the key for the detected operating system. diff --git a/tests/baselines/reference/for-inStatementsInvalid.errors.txt b/tests/baselines/reference/for-inStatementsInvalid.errors.txt index 2a6a73733d936..7ba529f0d9e5b 100644 --- a/tests/baselines/reference/for-inStatementsInvalid.errors.txt +++ b/tests/baselines/reference/for-inStatementsInvalid.errors.txt @@ -21,8 +21,8 @@ for-inStatementsInvalid.ts(62,15): error TS2407: The right-hand side of a 'for.. ==== for-inStatementsInvalid.ts (20 errors) ==== - var aNumber: number; - for (aNumber in {}) { } + var a number: number; + for (a number in {}) { } ~~~~~~~ !!! error TS2405: The left-hand side of a 'for...in' statement must be of type 'string' or 'any'. diff --git a/tests/baselines/reference/for-inStatementsInvalid.js b/tests/baselines/reference/for-inStatementsInvalid.js index 1133a785527f6..da795d5878784 100644 --- a/tests/baselines/reference/for-inStatementsInvalid.js +++ b/tests/baselines/reference/for-inStatementsInvalid.js @@ -1,8 +1,8 @@ //// [tests/cases/conformance/statements/for-inStatements/for-inStatementsInvalid.ts] //// //// [for-inStatementsInvalid.ts] -var aNumber: number; -for (aNumber in {}) { } +var a number: number; +for (a number in {}) { } var aBoolean: boolean; for (aBoolean in {}) { } @@ -67,8 +67,8 @@ for (var x in i[42]) { } //// [for-inStatementsInvalid.js] "use strict"; -var aNumber; -for (aNumber in {}) { } +var a number; +for (a number in {}) { } var aBoolean; for (aBoolean in {}) { } var aRegExp; diff --git a/tests/baselines/reference/for-inStatementsInvalid.symbols b/tests/baselines/reference/for-inStatementsInvalid.symbols index 9381533a765a4..de2a119f620e1 100644 --- a/tests/baselines/reference/for-inStatementsInvalid.symbols +++ b/tests/baselines/reference/for-inStatementsInvalid.symbols @@ -1,11 +1,11 @@ //// [tests/cases/conformance/statements/for-inStatements/for-inStatementsInvalid.ts] //// === for-inStatementsInvalid.ts === -var aNumber: number; ->aNumber : Symbol(aNumber, Decl(for-inStatementsInvalid.ts, 0, 3)) +var a number: number; +>a number : Symbol(a number, Decl(for-inStatementsInvalid.ts, 0, 3)) -for (aNumber in {}) { } ->aNumber : Symbol(aNumber, Decl(for-inStatementsInvalid.ts, 0, 3)) +for (a number in {}) { } +>a number : Symbol(a number, Decl(for-inStatementsInvalid.ts, 0, 3)) var aBoolean: boolean; >aBoolean : Symbol(aBoolean, Decl(for-inStatementsInvalid.ts, 3, 3)) diff --git a/tests/baselines/reference/for-inStatementsInvalid.types b/tests/baselines/reference/for-inStatementsInvalid.types index b73d980f5f43c..de7c394d1a239 100644 --- a/tests/baselines/reference/for-inStatementsInvalid.types +++ b/tests/baselines/reference/for-inStatementsInvalid.types @@ -1,12 +1,12 @@ //// [tests/cases/conformance/statements/for-inStatements/for-inStatementsInvalid.ts] //// === for-inStatementsInvalid.ts === -var aNumber: number; ->aNumber : number +var a number: number; +>a number : number > : ^^^^^^ -for (aNumber in {}) { } ->aNumber : number +for (a number in {}) { } +>a number : number > : ^^^^^^ >{} : {} > : ^^ diff --git a/tests/baselines/reference/forAwaitPerIterationBindingDownlevel(target=es5).js b/tests/baselines/reference/forAwaitPerIterationBindingDownlevel(target=es5).js index 0b356e4ced2a9..20dc560c12d4f 100644 --- a/tests/baselines/reference/forAwaitPerIterationBindingDownlevel(target=es5).js +++ b/tests/baselines/reference/forAwaitPerIterationBindingDownlevel(target=es5).js @@ -38,7 +38,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge }); }; var __generator = (this && this.__generator) || function (thisArg, body) { - var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); + var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, tries: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; function verb(n) { return function (v) { return step([n, v]); }; } function step(op) { @@ -50,14 +50,14 @@ var __generator = (this && this.__generator) || function (thisArg, body) { case 0: case 1: t = op; break; case 4: _.label++; return { value: op[1], done: false }; case 5: _.label++; y = op[1]; op = [0]; continue; - case 7: op = _.ops.pop(); _.trys.pop(); continue; + case 7: op = _.ops.pop(); _.tries.pop(); continue; default: - if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } + if (!(t = _.tries, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } if (t[2]) _.ops.pop(); - _.trys.pop(); continue; + _.tries.pop(); continue; } op = body.call(thisArg, _); } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } @@ -112,7 +112,7 @@ var log = console.log; return __generator(this, function (_g) { switch (_g.label) { case 0: - _g.trys.push([0, 5, 6, 11]); + _g.tries.push([0, 5, 6, 11]); _loop_1 = function () { _f = _c.value; _a = false; @@ -154,7 +154,7 @@ var log = console.log; e_1 = { error: e_1_1 }; return [3 /*break*/, 11]; case 6: - _g.trys.push([6, , 9, 10]); + _g.tries.push([6, , 9, 10]); if (!(!_a && !_d && (_e = _b.return))) return [3 /*break*/, 8]; return [4 /*yield*/, _e.call(_b)]; case 7: diff --git a/tests/baselines/reference/forIn.errors.txt b/tests/baselines/reference/forIn.errors.txt index afe38783f4259..49c373a530bd3 100644 --- a/tests/baselines/reference/forIn.errors.txt +++ b/tests/baselines/reference/forIn.errors.txt @@ -1,8 +1,8 @@ -forIn.ts(2,10): error TS2404: The left-hand side of a 'for...in' statement cannot use a type annotation. -forIn.ts(20,4): error TS2304: Cannot find name 'k'. +foreign.ts(2,10): error TS2404: The left-hand side of a 'for...in' statement cannot use a type annotation. +foreign.ts(20,4): error TS2304: Cannot find name 'k'. -==== forIn.ts (2 errors) ==== +==== foreign.ts (2 errors) ==== var arr = null; for (var i:number in arr) { // error ~ diff --git a/tests/baselines/reference/forIn.js b/tests/baselines/reference/forIn.js index cb72dd72164cd..c518d31b3692c 100644 --- a/tests/baselines/reference/forIn.js +++ b/tests/baselines/reference/forIn.js @@ -1,6 +1,6 @@ -//// [tests/cases/compiler/forIn.ts] //// +//// [tests/cases/compiler/foreign.ts] //// -//// [forIn.ts] +//// [foreign.ts] var arr = null; for (var i:number in arr) { // error var x1 = arr[i]; @@ -23,7 +23,7 @@ for (var l in arr) { k[l] = 1; } -//// [forIn.js] +//// [foreign.js] "use strict"; var arr = null; for (var i in arr) { // error diff --git a/tests/baselines/reference/forIn.symbols b/tests/baselines/reference/forIn.symbols index 390267b83ef6d..464b0039d04d9 100644 --- a/tests/baselines/reference/forIn.symbols +++ b/tests/baselines/reference/forIn.symbols @@ -1,62 +1,62 @@ -//// [tests/cases/compiler/forIn.ts] //// +//// [tests/cases/compiler/foreign.ts] //// -=== forIn.ts === +=== foreign.ts === var arr = null; ->arr : Symbol(arr, Decl(forIn.ts, 0, 3)) +>arr : Symbol(arr, Decl(foreign.ts, 0, 3)) for (var i:number in arr) { // error ->i : Symbol(i, Decl(forIn.ts, 1, 8)) ->arr : Symbol(arr, Decl(forIn.ts, 0, 3)) +>i : Symbol(i, Decl(foreign.ts, 1, 8)) +>arr : Symbol(arr, Decl(foreign.ts, 0, 3)) var x1 = arr[i]; ->x1 : Symbol(x1, Decl(forIn.ts, 2, 7)) ->arr : Symbol(arr, Decl(forIn.ts, 0, 3)) ->i : Symbol(i, Decl(forIn.ts, 1, 8)) +>x1 : Symbol(x1, Decl(foreign.ts, 2, 7)) +>arr : Symbol(arr, Decl(foreign.ts, 0, 3)) +>i : Symbol(i, Decl(foreign.ts, 1, 8)) var y1 = arr[i]; ->y1 : Symbol(y1, Decl(forIn.ts, 3, 7)) ->arr : Symbol(arr, Decl(forIn.ts, 0, 3)) ->i : Symbol(i, Decl(forIn.ts, 1, 8)) +>y1 : Symbol(y1, Decl(foreign.ts, 3, 7)) +>arr : Symbol(arr, Decl(foreign.ts, 0, 3)) +>i : Symbol(i, Decl(foreign.ts, 1, 8)) } for (var j in arr) { // ok ->j : Symbol(j, Decl(forIn.ts, 6, 8)) ->arr : Symbol(arr, Decl(forIn.ts, 0, 3)) +>j : Symbol(j, Decl(foreign.ts, 6, 8)) +>arr : Symbol(arr, Decl(foreign.ts, 0, 3)) var x2 = arr[j]; ->x2 : Symbol(x2, Decl(forIn.ts, 7, 7)) ->arr : Symbol(arr, Decl(forIn.ts, 0, 3)) ->j : Symbol(j, Decl(forIn.ts, 6, 8)) +>x2 : Symbol(x2, Decl(foreign.ts, 7, 7)) +>arr : Symbol(arr, Decl(foreign.ts, 0, 3)) +>j : Symbol(j, Decl(foreign.ts, 6, 8)) var y2 = arr[j]; ->y2 : Symbol(y2, Decl(forIn.ts, 8, 7)) ->arr : Symbol(arr, Decl(forIn.ts, 0, 3)) ->j : Symbol(j, Decl(forIn.ts, 6, 8)) +>y2 : Symbol(y2, Decl(foreign.ts, 8, 7)) +>arr : Symbol(arr, Decl(foreign.ts, 0, 3)) +>j : Symbol(j, Decl(foreign.ts, 6, 8)) } var arr2 = []; ->arr2 : Symbol(arr2, Decl(forIn.ts, 11, 3)) +>arr2 : Symbol(arr2, Decl(foreign.ts, 11, 3)) for (j in arr2) { // ok ->j : Symbol(j, Decl(forIn.ts, 6, 8)) ->arr2 : Symbol(arr2, Decl(forIn.ts, 11, 3)) +>j : Symbol(j, Decl(foreign.ts, 6, 8)) +>arr2 : Symbol(arr2, Decl(foreign.ts, 11, 3)) var x3 = arr2[j]; ->x3 : Symbol(x3, Decl(forIn.ts, 13, 7)) ->arr2 : Symbol(arr2, Decl(forIn.ts, 11, 3)) ->j : Symbol(j, Decl(forIn.ts, 6, 8)) +>x3 : Symbol(x3, Decl(foreign.ts, 13, 7)) +>arr2 : Symbol(arr2, Decl(foreign.ts, 11, 3)) +>j : Symbol(j, Decl(foreign.ts, 6, 8)) var y3 = arr2[j]; ->y3 : Symbol(y3, Decl(forIn.ts, 14, 7)) ->arr2 : Symbol(arr2, Decl(forIn.ts, 11, 3)) ->j : Symbol(j, Decl(forIn.ts, 6, 8)) +>y3 : Symbol(y3, Decl(foreign.ts, 14, 7)) +>arr2 : Symbol(arr2, Decl(foreign.ts, 11, 3)) +>j : Symbol(j, Decl(foreign.ts, 6, 8)) } for (var l in arr) { ->l : Symbol(l, Decl(forIn.ts, 17, 8)) ->arr : Symbol(arr, Decl(forIn.ts, 0, 3)) +>l : Symbol(l, Decl(foreign.ts, 17, 8)) +>arr : Symbol(arr, Decl(foreign.ts, 0, 3)) // error in the body k[l] = 1; ->l : Symbol(l, Decl(forIn.ts, 17, 8)) +>l : Symbol(l, Decl(foreign.ts, 17, 8)) } diff --git a/tests/baselines/reference/forIn.types b/tests/baselines/reference/forIn.types index 374d9c5016574..532fd8b2d6d70 100644 --- a/tests/baselines/reference/forIn.types +++ b/tests/baselines/reference/forIn.types @@ -1,6 +1,6 @@ -//// [tests/cases/compiler/forIn.ts] //// +//// [tests/cases/compiler/foreign.ts] //// -=== forIn.ts === +=== foreign.ts === var arr = null; >arr : any > : ^^^ diff --git a/tests/baselines/reference/forStatements.errors.txt b/tests/baselines/reference/forStatements.errors.txt index 5ce609b63254f..dd0a05753d5fc 100644 --- a/tests/baselines/reference/forStatements.errors.txt +++ b/tests/baselines/reference/forStatements.errors.txt @@ -40,7 +40,7 @@ forStatements.ts(19,9): error TS2564: Property 'name' has no initializer and is export function F2(x: number): string { return x.toString(); } } - for(var aNumber: number = 9.9;;){} + for(var a number: number = 9.9;;){} for(var aString: string = 'this is a string';;){} for(var aDate: Date = new Date(12);;){} for(var anObject: Object = new Object();;){} diff --git a/tests/baselines/reference/forStatements.js b/tests/baselines/reference/forStatements.js index 1e16637d79644..a9df54ffee544 100644 --- a/tests/baselines/reference/forStatements.js +++ b/tests/baselines/reference/forStatements.js @@ -25,7 +25,7 @@ namespace M { export function F2(x: number): string { return x.toString(); } } -for(var aNumber: number = 9.9;;){} +for(var a number: number = 9.9;;){} for(var aString: string = 'this is a string';;){} for(var aDate: Date = new Date(12);;){} for(var anObject: Object = new Object();;){} @@ -63,7 +63,7 @@ var M; function F2(x) { return x.toString(); } M.F2 = F2; })(M || (M = {})); -for (var aNumber = 9.9;;) { } +for (var a number = 9.9;;) { } for (var aString = 'this is a string';;) { } for (var aDate = new Date(12);;) { } for (var anObject = new Object();;) { } diff --git a/tests/baselines/reference/forStatements.symbols b/tests/baselines/reference/forStatements.symbols index 46611388da3d6..52d68194c01ee 100644 --- a/tests/baselines/reference/forStatements.symbols +++ b/tests/baselines/reference/forStatements.symbols @@ -58,8 +58,8 @@ namespace M { >toString : Symbol(Number.toString, Decl(lib.es5.d.ts, --, --)) } -for(var aNumber: number = 9.9;;){} ->aNumber : Symbol(aNumber, Decl(forStatements.ts, 24, 7)) +for(var a number: number = 9.9;;){} +>a number : Symbol(a number, Decl(forStatements.ts, 24, 7)) for(var aString: string = 'this is a string';;){} >aString : Symbol(aString, Decl(forStatements.ts, 25, 7)) diff --git a/tests/baselines/reference/forStatements.types b/tests/baselines/reference/forStatements.types index 5ec0d6dede7fb..1509bd65fcca4 100644 --- a/tests/baselines/reference/forStatements.types +++ b/tests/baselines/reference/forStatements.types @@ -69,8 +69,8 @@ namespace M { > : ^ ^^^ ^^^^^ } -for(var aNumber: number = 9.9;;){} ->aNumber : number +for(var a number: number = 9.9;;){} +>a number : number > : ^^^^^^ >9.9 : 9.9 > : ^^^ diff --git a/tests/baselines/reference/functionImplementationErrors(target=es2015).errors.txt b/tests/baselines/reference/functionImplementationErrors(target=es2015).errors.txt index 8cc90763366fe..4211dba1d5360 100644 --- a/tests/baselines/reference/functionImplementationErrors(target=es2015).errors.txt +++ b/tests/baselines/reference/functionImplementationErrors(target=es2015).errors.txt @@ -27,7 +27,7 @@ functionImplementationErrors.ts(40,1): error TS2839: This condition will always } } - // Function implemetnation with non -void return type annotation with no return + // Function implementation with non -void return type annotation with no return function f5(): number { ~~~~~~ !!! error TS2355: A function whose declared type is neither 'undefined', 'void', nor 'any' must return a value. diff --git a/tests/baselines/reference/functionImplementationErrors(target=es2015).js b/tests/baselines/reference/functionImplementationErrors(target=es2015).js index 3b885c435621d..7f29b897264b7 100644 --- a/tests/baselines/reference/functionImplementationErrors(target=es2015).js +++ b/tests/baselines/reference/functionImplementationErrors(target=es2015).js @@ -24,7 +24,7 @@ var f4 = function () { } } -// Function implemetnation with non -void return type annotation with no return +// Function implementation with non -void return type annotation with no return function f5(): number { } @@ -99,7 +99,7 @@ var f4 = function () { return [1]; } }; -// Function implemetnation with non -void return type annotation with no return +// Function implementation with non -void return type annotation with no return function f5() { } // Function signature with parameter initializer referencing in scope local variable diff --git a/tests/baselines/reference/functionImplementationErrors(target=es2015).symbols b/tests/baselines/reference/functionImplementationErrors(target=es2015).symbols index f2162820077f8..3d37ce1d8c51f 100644 --- a/tests/baselines/reference/functionImplementationErrors(target=es2015).symbols +++ b/tests/baselines/reference/functionImplementationErrors(target=es2015).symbols @@ -33,7 +33,7 @@ var f4 = function () { } } -// Function implemetnation with non -void return type annotation with no return +// Function implementation with non -void return type annotation with no return function f5(): number { >f5 : Symbol(f5, Decl(functionImplementationErrors.ts, 21, 1)) } diff --git a/tests/baselines/reference/functionImplementationErrors(target=es2015).types b/tests/baselines/reference/functionImplementationErrors(target=es2015).types index 48ad8b978ffec..f932c9bc290ff 100644 --- a/tests/baselines/reference/functionImplementationErrors(target=es2015).types +++ b/tests/baselines/reference/functionImplementationErrors(target=es2015).types @@ -76,7 +76,7 @@ var f4 = function () { } } -// Function implemetnation with non -void return type annotation with no return +// Function implementation with non -void return type annotation with no return function f5(): number { >f5 : () => number > : ^^^^^^ diff --git a/tests/baselines/reference/functionImplementationErrors(target=es5).errors.txt b/tests/baselines/reference/functionImplementationErrors(target=es5).errors.txt index 7e99aab54a1fc..1457fdc7951dc 100644 --- a/tests/baselines/reference/functionImplementationErrors(target=es5).errors.txt +++ b/tests/baselines/reference/functionImplementationErrors(target=es5).errors.txt @@ -30,7 +30,7 @@ functionImplementationErrors.ts(40,1): error TS2839: This condition will always } } - // Function implemetnation with non -void return type annotation with no return + // Function implementation with non -void return type annotation with no return function f5(): number { ~~~~~~ !!! error TS2355: A function whose declared type is neither 'undefined', 'void', nor 'any' must return a value. diff --git a/tests/baselines/reference/functionImplementationErrors(target=es5).js b/tests/baselines/reference/functionImplementationErrors(target=es5).js index 4e5b69d4197e7..2330dde396d03 100644 --- a/tests/baselines/reference/functionImplementationErrors(target=es5).js +++ b/tests/baselines/reference/functionImplementationErrors(target=es5).js @@ -24,7 +24,7 @@ var f4 = function () { } } -// Function implemetnation with non -void return type annotation with no return +// Function implementation with non -void return type annotation with no return function f5(): number { } @@ -114,7 +114,7 @@ var f4 = function () { return [1]; } }; -// Function implemetnation with non -void return type annotation with no return +// Function implementation with non -void return type annotation with no return function f5() { } // Function signature with parameter initializer referencing in scope local variable diff --git a/tests/baselines/reference/functionImplementationErrors(target=es5).symbols b/tests/baselines/reference/functionImplementationErrors(target=es5).symbols index f652ac2accbca..adc6d1bd9932a 100644 --- a/tests/baselines/reference/functionImplementationErrors(target=es5).symbols +++ b/tests/baselines/reference/functionImplementationErrors(target=es5).symbols @@ -33,7 +33,7 @@ var f4 = function () { } } -// Function implemetnation with non -void return type annotation with no return +// Function implementation with non -void return type annotation with no return function f5(): number { >f5 : Symbol(f5, Decl(functionImplementationErrors.ts, 21, 1)) } diff --git a/tests/baselines/reference/functionImplementationErrors(target=es5).types b/tests/baselines/reference/functionImplementationErrors(target=es5).types index 4d80ab0a83e53..d4e6c011e78b2 100644 --- a/tests/baselines/reference/functionImplementationErrors(target=es5).types +++ b/tests/baselines/reference/functionImplementationErrors(target=es5).types @@ -76,7 +76,7 @@ var f4 = function () { } } -// Function implemetnation with non -void return type annotation with no return +// Function implementation with non -void return type annotation with no return function f5(): number { >f5 : () => number > : ^^^^^^ diff --git a/tests/baselines/reference/generatedContextualTyping.errors.txt b/tests/baselines/reference/generatedContextualTyping.errors.txt index a82eb3b967641..823f31220c285 100644 --- a/tests/baselines/reference/generatedContextualTyping.errors.txt +++ b/tests/baselines/reference/generatedContextualTyping.errors.txt @@ -36,7 +36,7 @@ generatedContextualTyping.ts(282,28): error TS2872: This kind of expression is a class Base { private p; } class Derived1 extends Base { private m; } class Derived2 extends Base { private n; } - interface Genric { func(n: T[]); } + interface Generic { func(n: T[]); } var b = new Base(), d1 = new Derived1(), d2 = new Derived2(); var x1: () => Base[] = () => [d1, d2]; var x2: () => Base[] = function() { return [d1, d2] }; @@ -49,7 +49,7 @@ generatedContextualTyping.ts(282,28): error TS2872: This kind of expression is a var x9: { [n: number]: Base; } = [d1, d2]; var x10: {n: Base[]; } = { n: [d1, d2] }; var x11: (s: Base[]) => any = n => { var n: Base[]; return null; }; - var x12: Genric = { func: n => { return [d1, d2]; } }; + var x12: Generic = { func: n => { return [d1, d2]; } }; class x13 { member: () => Base[] = () => [d1, d2] } class x14 { member: () => Base[] = function() { return [d1, d2] } } class x15 { member: () => Base[] = function named() { return [d1, d2] } } @@ -61,7 +61,7 @@ generatedContextualTyping.ts(282,28): error TS2872: This kind of expression is a class x21 { member: { [n: number]: Base; } = [d1, d2] } class x22 { member: {n: Base[]; } = { n: [d1, d2] } } class x23 { member: (s: Base[]) => any = n => { var n: Base[]; return null; } } - class x24 { member: Genric = { func: n => { return [d1, d2]; } } } + class x24 { member: Generic = { func: n => { return [d1, d2]; } } } class x25 { private member: () => Base[] = () => [d1, d2] } class x26 { private member: () => Base[] = function() { return [d1, d2] } } class x27 { private member: () => Base[] = function named() { return [d1, d2] } } @@ -73,7 +73,7 @@ generatedContextualTyping.ts(282,28): error TS2872: This kind of expression is a class x33 { private member: { [n: number]: Base; } = [d1, d2] } class x34 { private member: {n: Base[]; } = { n: [d1, d2] } } class x35 { private member: (s: Base[]) => any = n => { var n: Base[]; return null; } } - class x36 { private member: Genric = { func: n => { return [d1, d2]; } } } + class x36 { private member: Generic = { func: n => { return [d1, d2]; } } } class x37 { public member: () => Base[] = () => [d1, d2] } class x38 { public member: () => Base[] = function() { return [d1, d2] } } class x39 { public member: () => Base[] = function named() { return [d1, d2] } } @@ -85,7 +85,7 @@ generatedContextualTyping.ts(282,28): error TS2872: This kind of expression is a class x45 { public member: { [n: number]: Base; } = [d1, d2] } class x46 { public member: {n: Base[]; } = { n: [d1, d2] } } class x47 { public member: (s: Base[]) => any = n => { var n: Base[]; return null; } } - class x48 { public member: Genric = { func: n => { return [d1, d2]; } } } + class x48 { public member: Generic = { func: n => { return [d1, d2]; } } } class x49 { static member: () => Base[] = () => [d1, d2] } class x50 { static member: () => Base[] = function() { return [d1, d2] } } class x51 { static member: () => Base[] = function named() { return [d1, d2] } } @@ -97,7 +97,7 @@ generatedContextualTyping.ts(282,28): error TS2872: This kind of expression is a class x57 { static member: { [n: number]: Base; } = [d1, d2] } class x58 { static member: {n: Base[]; } = { n: [d1, d2] } } class x59 { static member: (s: Base[]) => any = n => { var n: Base[]; return null; } } - class x60 { static member: Genric = { func: n => { return [d1, d2]; } } } + class x60 { static member: Generic = { func: n => { return [d1, d2]; } } } class x61 { private static member: () => Base[] = () => [d1, d2] } class x62 { private static member: () => Base[] = function() { return [d1, d2] } } class x63 { private static member: () => Base[] = function named() { return [d1, d2] } } @@ -109,7 +109,7 @@ generatedContextualTyping.ts(282,28): error TS2872: This kind of expression is a class x69 { private static member: { [n: number]: Base; } = [d1, d2] } class x70 { private static member: {n: Base[]; } = { n: [d1, d2] } } class x71 { private static member: (s: Base[]) => any = n => { var n: Base[]; return null; } } - class x72 { private static member: Genric = { func: n => { return [d1, d2]; } } } + class x72 { private static member: Generic = { func: n => { return [d1, d2]; } } } class x73 { public static member: () => Base[] = () => [d1, d2] } class x74 { public static member: () => Base[] = function() { return [d1, d2] } } class x75 { public static member: () => Base[] = function named() { return [d1, d2] } } @@ -121,7 +121,7 @@ generatedContextualTyping.ts(282,28): error TS2872: This kind of expression is a class x81 { public static member: { [n: number]: Base; } = [d1, d2] } class x82 { public static member: {n: Base[]; } = { n: [d1, d2] } } class x83 { public static member: (s: Base[]) => any = n => { var n: Base[]; return null; } } - class x84 { public static member: Genric = { func: n => { return [d1, d2]; } } } + class x84 { public static member: Generic = { func: n => { return [d1, d2]; } } } class x85 { constructor(parm: () => Base[] = () => [d1, d2]) { } } class x86 { constructor(parm: () => Base[] = function() { return [d1, d2] }) { } } class x87 { constructor(parm: () => Base[] = function named() { return [d1, d2] }) { } } @@ -133,7 +133,7 @@ generatedContextualTyping.ts(282,28): error TS2872: This kind of expression is a class x93 { constructor(parm: { [n: number]: Base; } = [d1, d2]) { } } class x94 { constructor(parm: {n: Base[]; } = { n: [d1, d2] }) { } } class x95 { constructor(parm: (s: Base[]) => any = n => { var n: Base[]; return null; }) { } } - class x96 { constructor(parm: Genric = { func: n => { return [d1, d2]; } }) { } } + class x96 { constructor(parm: Generic = { func: n => { return [d1, d2]; } }) { } } class x97 { constructor(public parm: () => Base[] = () => [d1, d2]) { } } class x98 { constructor(public parm: () => Base[] = function() { return [d1, d2] }) { } } class x99 { constructor(public parm: () => Base[] = function named() { return [d1, d2] }) { } } @@ -145,7 +145,7 @@ generatedContextualTyping.ts(282,28): error TS2872: This kind of expression is a class x105 { constructor(public parm: { [n: number]: Base; } = [d1, d2]) { } } class x106 { constructor(public parm: {n: Base[]; } = { n: [d1, d2] }) { } } class x107 { constructor(public parm: (s: Base[]) => any = n => { var n: Base[]; return null; }) { } } - class x108 { constructor(public parm: Genric = { func: n => { return [d1, d2]; } }) { } } + class x108 { constructor(public parm: Generic = { func: n => { return [d1, d2]; } }) { } } class x109 { constructor(private parm: () => Base[] = () => [d1, d2]) { } } class x110 { constructor(private parm: () => Base[] = function() { return [d1, d2] }) { } } class x111 { constructor(private parm: () => Base[] = function named() { return [d1, d2] }) { } } @@ -157,7 +157,7 @@ generatedContextualTyping.ts(282,28): error TS2872: This kind of expression is a class x117 { constructor(private parm: { [n: number]: Base; } = [d1, d2]) { } } class x118 { constructor(private parm: {n: Base[]; } = { n: [d1, d2] }) { } } class x119 { constructor(private parm: (s: Base[]) => any = n => { var n: Base[]; return null; }) { } } - class x120 { constructor(private parm: Genric = { func: n => { return [d1, d2]; } }) { } } + class x120 { constructor(private parm: Generic = { func: n => { return [d1, d2]; } }) { } } function x121(parm: () => Base[] = () => [d1, d2]) { } function x122(parm: () => Base[] = function() { return [d1, d2] }) { } function x123(parm: () => Base[] = function named() { return [d1, d2] }) { } @@ -169,7 +169,7 @@ generatedContextualTyping.ts(282,28): error TS2872: This kind of expression is a function x129(parm: { [n: number]: Base; } = [d1, d2]) { } function x130(parm: {n: Base[]; } = { n: [d1, d2] }) { } function x131(parm: (s: Base[]) => any = n => { var n: Base[]; return null; }) { } - function x132(parm: Genric = { func: n => { return [d1, d2]; } }) { } + function x132(parm: Generic = { func: n => { return [d1, d2]; } }) { } function x133(): () => Base[] { return () => [d1, d2]; } function x134(): () => Base[] { return function() { return [d1, d2] }; } function x135(): () => Base[] { return function named() { return [d1, d2] }; } @@ -181,7 +181,7 @@ generatedContextualTyping.ts(282,28): error TS2872: This kind of expression is a function x141(): { [n: number]: Base; } { return [d1, d2]; } function x142(): {n: Base[]; } { return { n: [d1, d2] }; } function x143(): (s: Base[]) => any { return n => { var n: Base[]; return null; }; } - function x144(): Genric { return { func: n => { return [d1, d2]; } }; } + function x144(): Generic { return { func: n => { return [d1, d2]; } }; } function x145(): () => Base[] { return () => [d1, d2]; return () => [d1, d2]; } function x146(): () => Base[] { return function() { return [d1, d2] }; return function() { return [d1, d2] }; } function x147(): () => Base[] { return function named() { return [d1, d2] }; return function named() { return [d1, d2] }; } @@ -193,7 +193,7 @@ generatedContextualTyping.ts(282,28): error TS2872: This kind of expression is a function x153(): { [n: number]: Base; } { return [d1, d2]; return [d1, d2]; } function x154(): {n: Base[]; } { return { n: [d1, d2] }; return { n: [d1, d2] }; } function x155(): (s: Base[]) => any { return n => { var n: Base[]; return null; }; return n => { var n: Base[]; return null; }; } - function x156(): Genric { return { func: n => { return [d1, d2]; } }; return { func: n => { return [d1, d2]; } }; } + function x156(): Generic { return { func: n => { return [d1, d2]; } }; return { func: n => { return [d1, d2]; } }; } var x157: () => () => Base[] = () => { return () => [d1, d2]; }; var x158: () => () => Base[] = () => { return function() { return [d1, d2] }; }; var x159: () => () => Base[] = () => { return function named() { return [d1, d2] }; }; @@ -205,7 +205,7 @@ generatedContextualTyping.ts(282,28): error TS2872: This kind of expression is a var x165: () => { [n: number]: Base; } = () => { return [d1, d2]; }; var x166: () => {n: Base[]; } = () => { return { n: [d1, d2] }; }; var x167: () => (s: Base[]) => any = () => { return n => { var n: Base[]; return null; }; }; - var x168: () => Genric = () => { return { func: n => { return [d1, d2]; } }; }; + var x168: () => Generic = () => { return { func: n => { return [d1, d2]; } }; }; var x169: () => () => Base[] = function() { return () => [d1, d2]; }; var x170: () => () => Base[] = function() { return function() { return [d1, d2] }; }; var x171: () => () => Base[] = function() { return function named() { return [d1, d2] }; }; @@ -217,7 +217,7 @@ generatedContextualTyping.ts(282,28): error TS2872: This kind of expression is a var x177: () => { [n: number]: Base; } = function() { return [d1, d2]; }; var x178: () => {n: Base[]; } = function() { return { n: [d1, d2] }; }; var x179: () => (s: Base[]) => any = function() { return n => { var n: Base[]; return null; }; }; - var x180: () => Genric = function() { return { func: n => { return [d1, d2]; } }; }; + var x180: () => Generic = function() { return { func: n => { return [d1, d2]; } }; }; namespace x181 { var t: () => Base[] = () => [d1, d2]; } namespace x182 { var t: () => Base[] = function() { return [d1, d2] }; } namespace x183 { var t: () => Base[] = function named() { return [d1, d2] }; } @@ -229,7 +229,7 @@ generatedContextualTyping.ts(282,28): error TS2872: This kind of expression is a namespace x189 { var t: { [n: number]: Base; } = [d1, d2]; } namespace x190 { var t: {n: Base[]; } = { n: [d1, d2] }; } namespace x191 { var t: (s: Base[]) => any = n => { var n: Base[]; return null; }; } - namespace x192 { var t: Genric = { func: n => { return [d1, d2]; } }; } + namespace x192 { var t: Generic = { func: n => { return [d1, d2]; } }; } namespace x193 { export var t: () => Base[] = () => [d1, d2]; } namespace x194 { export var t: () => Base[] = function() { return [d1, d2] }; } namespace x195 { export var t: () => Base[] = function named() { return [d1, d2] }; } @@ -241,7 +241,7 @@ generatedContextualTyping.ts(282,28): error TS2872: This kind of expression is a namespace x201 { export var t: { [n: number]: Base; } = [d1, d2]; } namespace x202 { export var t: {n: Base[]; } = { n: [d1, d2] }; } namespace x203 { export var t: (s: Base[]) => any = n => { var n: Base[]; return null; }; } - namespace x204 { export var t: Genric = { func: n => { return [d1, d2]; } }; } + namespace x204 { export var t: Generic = { func: n => { return [d1, d2]; } }; } var x206 = <() => Base[]>function() { return [d1, d2] }; var x207 = <() => Base[]>function named() { return [d1, d2] }; var x209 = <{ (): Base[]; }>function() { return [d1, d2] }; @@ -250,7 +250,7 @@ generatedContextualTyping.ts(282,28): error TS2872: This kind of expression is a var x212 = >[d1, d2]; var x213 = <{ [n: number]: Base; }>[d1, d2]; var x214 = <{n: Base[]; } >{ n: [d1, d2] }; - var x216 = >{ func: n => { return [d1, d2]; } }; + var x216 = >{ func: n => { return [d1, d2]; } }; var x217 = (<() => Base[]>undefined) || function() { return [d1, d2] }; ~~~~~~~~~~~~~~~~~~~~~~~~~ !!! error TS2873: This kind of expression is always falsy. @@ -286,7 +286,7 @@ generatedContextualTyping.ts(282,28): error TS2872: This kind of expression is a var x233: { [n: number]: Base; }; x233 = [d1, d2]; var x234: {n: Base[]; } ; x234 = { n: [d1, d2] }; var x235: (s: Base[]) => any; x235 = n => { var n: Base[]; return null; }; - var x236: Genric; x236 = { func: n => { return [d1, d2]; } }; + var x236: Generic; x236 = { func: n => { return [d1, d2]; } }; var x237: { n: () => Base[]; } = { n: () => [d1, d2] }; var x238: { n: () => Base[]; } = { n: function() { return [d1, d2] } }; var x239: { n: () => Base[]; } = { n: function named() { return [d1, d2] } }; @@ -298,7 +298,7 @@ generatedContextualTyping.ts(282,28): error TS2872: This kind of expression is a var x245: { n: { [n: number]: Base; }; } = { n: [d1, d2] }; var x246: { n: {n: Base[]; } ; } = { n: { n: [d1, d2] } }; var x247: { n: (s: Base[]) => any; } = { n: n => { var n: Base[]; return null; } }; - var x248: { n: Genric; } = { n: { func: n => { return [d1, d2]; } } }; + var x248: { n: Generic; } = { n: { func: n => { return [d1, d2]; } } }; var x252: { (): Base[]; }[] = [() => [d1, d2]]; var x253: { (): Base[]; }[] = [function() { return [d1, d2] }]; var x254: { (): Base[]; }[] = [function named() { return [d1, d2] }]; @@ -306,7 +306,7 @@ generatedContextualTyping.ts(282,28): error TS2872: This kind of expression is a var x256: Array[] = [[d1, d2]]; var x257: { [n: number]: Base; }[] = [[d1, d2]]; var x258: {n: Base[]; } [] = [{ n: [d1, d2] }]; - var x260: Genric[] = [{ func: n => { return [d1, d2]; } }]; + var x260: Generic[] = [{ func: n => { return [d1, d2]; } }]; var x261: () => Base[] = function() { return [d1, d2] } || undefined; ~~~~~~~~ !!! error TS2872: This kind of expression is always truthy. @@ -390,7 +390,7 @@ generatedContextualTyping.ts(282,28): error TS2872: This kind of expression is a var x293: { [n: number]: Base; } = true ? [d1, d2] : [d1, d2]; var x294: {n: Base[]; } = true ? { n: [d1, d2] } : { n: [d1, d2] }; var x295: (s: Base[]) => any = true ? n => { var n: Base[]; return null; } : n => { var n: Base[]; return null; }; - var x296: Genric = true ? { func: n => { return [d1, d2]; } } : { func: n => { return [d1, d2]; } }; + var x296: Generic = true ? { func: n => { return [d1, d2]; } } : { func: n => { return [d1, d2]; } }; var x297: () => Base[] = true ? undefined : () => [d1, d2]; var x298: () => Base[] = true ? undefined : function() { return [d1, d2] }; var x299: () => Base[] = true ? undefined : function named() { return [d1, d2] }; @@ -402,7 +402,7 @@ generatedContextualTyping.ts(282,28): error TS2872: This kind of expression is a var x305: { [n: number]: Base; } = true ? undefined : [d1, d2]; var x306: {n: Base[]; } = true ? undefined : { n: [d1, d2] }; var x307: (s: Base[]) => any = true ? undefined : n => { var n: Base[]; return null; }; - var x308: Genric = true ? undefined : { func: n => { return [d1, d2]; } }; + var x308: Generic = true ? undefined : { func: n => { return [d1, d2]; } }; var x309: () => Base[] = true ? () => [d1, d2] : undefined; var x310: () => Base[] = true ? function() { return [d1, d2] } : undefined; var x311: () => Base[] = true ? function named() { return [d1, d2] } : undefined; @@ -414,7 +414,7 @@ generatedContextualTyping.ts(282,28): error TS2872: This kind of expression is a var x317: { [n: number]: Base; } = true ? [d1, d2] : undefined; var x318: {n: Base[]; } = true ? { n: [d1, d2] } : undefined; var x319: (s: Base[]) => any = true ? n => { var n: Base[]; return null; } : undefined; - var x320: Genric = true ? { func: n => { return [d1, d2]; } } : undefined; + var x320: Generic = true ? { func: n => { return [d1, d2]; } } : undefined; function x321(n: () => Base[]) { }; x321(() => [d1, d2]); function x322(n: () => Base[]) { }; x322(function() { return [d1, d2] }); function x323(n: () => Base[]) { }; x323(function named() { return [d1, d2] }); @@ -426,7 +426,7 @@ generatedContextualTyping.ts(282,28): error TS2872: This kind of expression is a function x329(n: { [n: number]: Base; }) { }; x329([d1, d2]); function x330(n: {n: Base[]; } ) { }; x330({ n: [d1, d2] }); function x331(n: (s: Base[]) => any) { }; x331(n => { var n: Base[]; return null; }); - function x332(n: Genric) { }; x332({ func: n => { return [d1, d2]; } }); + function x332(n: Generic) { }; x332({ func: n => { return [d1, d2]; } }); var x333 = (n: () => Base[]) => n; x333(() => [d1, d2]); var x334 = (n: () => Base[]) => n; x334(function() { return [d1, d2] }); var x335 = (n: () => Base[]) => n; x335(function named() { return [d1, d2] }); @@ -438,7 +438,7 @@ generatedContextualTyping.ts(282,28): error TS2872: This kind of expression is a var x341 = (n: { [n: number]: Base; }) => n; x341([d1, d2]); var x342 = (n: {n: Base[]; } ) => n; x342({ n: [d1, d2] }); var x343 = (n: (s: Base[]) => any) => n; x343(n => { var n: Base[]; return null; }); - var x344 = (n: Genric) => n; x344({ func: n => { return [d1, d2]; } }); + var x344 = (n: Generic) => n; x344({ func: n => { return [d1, d2]; } }); var x345 = function(n: () => Base[]) { }; x345(() => [d1, d2]); var x346 = function(n: () => Base[]) { }; x346(function() { return [d1, d2] }); var x347 = function(n: () => Base[]) { }; x347(function named() { return [d1, d2] }); @@ -450,4 +450,4 @@ generatedContextualTyping.ts(282,28): error TS2872: This kind of expression is a var x353 = function(n: { [n: number]: Base; }) { }; x353([d1, d2]); var x354 = function(n: {n: Base[]; } ) { }; x354({ n: [d1, d2] }); var x355 = function(n: (s: Base[]) => any) { }; x355(n => { var n: Base[]; return null; }); - var x356 = function(n: Genric) { }; x356({ func: n => { return [d1, d2]; } }); \ No newline at end of file + var x356 = function(n: Generic) { }; x356({ func: n => { return [d1, d2]; } }); \ No newline at end of file diff --git a/tests/baselines/reference/generatedContextualTyping.js b/tests/baselines/reference/generatedContextualTyping.js index 8caff18aaf190..9899a7829901a 100644 --- a/tests/baselines/reference/generatedContextualTyping.js +++ b/tests/baselines/reference/generatedContextualTyping.js @@ -4,7 +4,7 @@ class Base { private p; } class Derived1 extends Base { private m; } class Derived2 extends Base { private n; } -interface Genric { func(n: T[]); } +interface Generic { func(n: T[]); } var b = new Base(), d1 = new Derived1(), d2 = new Derived2(); var x1: () => Base[] = () => [d1, d2]; var x2: () => Base[] = function() { return [d1, d2] }; @@ -17,7 +17,7 @@ var x8: Array = [d1, d2]; var x9: { [n: number]: Base; } = [d1, d2]; var x10: {n: Base[]; } = { n: [d1, d2] }; var x11: (s: Base[]) => any = n => { var n: Base[]; return null; }; -var x12: Genric = { func: n => { return [d1, d2]; } }; +var x12: Generic = { func: n => { return [d1, d2]; } }; class x13 { member: () => Base[] = () => [d1, d2] } class x14 { member: () => Base[] = function() { return [d1, d2] } } class x15 { member: () => Base[] = function named() { return [d1, d2] } } @@ -29,7 +29,7 @@ class x20 { member: Array = [d1, d2] } class x21 { member: { [n: number]: Base; } = [d1, d2] } class x22 { member: {n: Base[]; } = { n: [d1, d2] } } class x23 { member: (s: Base[]) => any = n => { var n: Base[]; return null; } } -class x24 { member: Genric = { func: n => { return [d1, d2]; } } } +class x24 { member: Generic = { func: n => { return [d1, d2]; } } } class x25 { private member: () => Base[] = () => [d1, d2] } class x26 { private member: () => Base[] = function() { return [d1, d2] } } class x27 { private member: () => Base[] = function named() { return [d1, d2] } } @@ -41,7 +41,7 @@ class x32 { private member: Array = [d1, d2] } class x33 { private member: { [n: number]: Base; } = [d1, d2] } class x34 { private member: {n: Base[]; } = { n: [d1, d2] } } class x35 { private member: (s: Base[]) => any = n => { var n: Base[]; return null; } } -class x36 { private member: Genric = { func: n => { return [d1, d2]; } } } +class x36 { private member: Generic = { func: n => { return [d1, d2]; } } } class x37 { public member: () => Base[] = () => [d1, d2] } class x38 { public member: () => Base[] = function() { return [d1, d2] } } class x39 { public member: () => Base[] = function named() { return [d1, d2] } } @@ -53,7 +53,7 @@ class x44 { public member: Array = [d1, d2] } class x45 { public member: { [n: number]: Base; } = [d1, d2] } class x46 { public member: {n: Base[]; } = { n: [d1, d2] } } class x47 { public member: (s: Base[]) => any = n => { var n: Base[]; return null; } } -class x48 { public member: Genric = { func: n => { return [d1, d2]; } } } +class x48 { public member: Generic = { func: n => { return [d1, d2]; } } } class x49 { static member: () => Base[] = () => [d1, d2] } class x50 { static member: () => Base[] = function() { return [d1, d2] } } class x51 { static member: () => Base[] = function named() { return [d1, d2] } } @@ -65,7 +65,7 @@ class x56 { static member: Array = [d1, d2] } class x57 { static member: { [n: number]: Base; } = [d1, d2] } class x58 { static member: {n: Base[]; } = { n: [d1, d2] } } class x59 { static member: (s: Base[]) => any = n => { var n: Base[]; return null; } } -class x60 { static member: Genric = { func: n => { return [d1, d2]; } } } +class x60 { static member: Generic = { func: n => { return [d1, d2]; } } } class x61 { private static member: () => Base[] = () => [d1, d2] } class x62 { private static member: () => Base[] = function() { return [d1, d2] } } class x63 { private static member: () => Base[] = function named() { return [d1, d2] } } @@ -77,7 +77,7 @@ class x68 { private static member: Array = [d1, d2] } class x69 { private static member: { [n: number]: Base; } = [d1, d2] } class x70 { private static member: {n: Base[]; } = { n: [d1, d2] } } class x71 { private static member: (s: Base[]) => any = n => { var n: Base[]; return null; } } -class x72 { private static member: Genric = { func: n => { return [d1, d2]; } } } +class x72 { private static member: Generic = { func: n => { return [d1, d2]; } } } class x73 { public static member: () => Base[] = () => [d1, d2] } class x74 { public static member: () => Base[] = function() { return [d1, d2] } } class x75 { public static member: () => Base[] = function named() { return [d1, d2] } } @@ -89,7 +89,7 @@ class x80 { public static member: Array = [d1, d2] } class x81 { public static member: { [n: number]: Base; } = [d1, d2] } class x82 { public static member: {n: Base[]; } = { n: [d1, d2] } } class x83 { public static member: (s: Base[]) => any = n => { var n: Base[]; return null; } } -class x84 { public static member: Genric = { func: n => { return [d1, d2]; } } } +class x84 { public static member: Generic = { func: n => { return [d1, d2]; } } } class x85 { constructor(parm: () => Base[] = () => [d1, d2]) { } } class x86 { constructor(parm: () => Base[] = function() { return [d1, d2] }) { } } class x87 { constructor(parm: () => Base[] = function named() { return [d1, d2] }) { } } @@ -101,7 +101,7 @@ class x92 { constructor(parm: Array = [d1, d2]) { } } class x93 { constructor(parm: { [n: number]: Base; } = [d1, d2]) { } } class x94 { constructor(parm: {n: Base[]; } = { n: [d1, d2] }) { } } class x95 { constructor(parm: (s: Base[]) => any = n => { var n: Base[]; return null; }) { } } -class x96 { constructor(parm: Genric = { func: n => { return [d1, d2]; } }) { } } +class x96 { constructor(parm: Generic = { func: n => { return [d1, d2]; } }) { } } class x97 { constructor(public parm: () => Base[] = () => [d1, d2]) { } } class x98 { constructor(public parm: () => Base[] = function() { return [d1, d2] }) { } } class x99 { constructor(public parm: () => Base[] = function named() { return [d1, d2] }) { } } @@ -113,7 +113,7 @@ class x104 { constructor(public parm: Array = [d1, d2]) { } } class x105 { constructor(public parm: { [n: number]: Base; } = [d1, d2]) { } } class x106 { constructor(public parm: {n: Base[]; } = { n: [d1, d2] }) { } } class x107 { constructor(public parm: (s: Base[]) => any = n => { var n: Base[]; return null; }) { } } -class x108 { constructor(public parm: Genric = { func: n => { return [d1, d2]; } }) { } } +class x108 { constructor(public parm: Generic = { func: n => { return [d1, d2]; } }) { } } class x109 { constructor(private parm: () => Base[] = () => [d1, d2]) { } } class x110 { constructor(private parm: () => Base[] = function() { return [d1, d2] }) { } } class x111 { constructor(private parm: () => Base[] = function named() { return [d1, d2] }) { } } @@ -125,7 +125,7 @@ class x116 { constructor(private parm: Array = [d1, d2]) { } } class x117 { constructor(private parm: { [n: number]: Base; } = [d1, d2]) { } } class x118 { constructor(private parm: {n: Base[]; } = { n: [d1, d2] }) { } } class x119 { constructor(private parm: (s: Base[]) => any = n => { var n: Base[]; return null; }) { } } -class x120 { constructor(private parm: Genric = { func: n => { return [d1, d2]; } }) { } } +class x120 { constructor(private parm: Generic = { func: n => { return [d1, d2]; } }) { } } function x121(parm: () => Base[] = () => [d1, d2]) { } function x122(parm: () => Base[] = function() { return [d1, d2] }) { } function x123(parm: () => Base[] = function named() { return [d1, d2] }) { } @@ -137,7 +137,7 @@ function x128(parm: Array = [d1, d2]) { } function x129(parm: { [n: number]: Base; } = [d1, d2]) { } function x130(parm: {n: Base[]; } = { n: [d1, d2] }) { } function x131(parm: (s: Base[]) => any = n => { var n: Base[]; return null; }) { } -function x132(parm: Genric = { func: n => { return [d1, d2]; } }) { } +function x132(parm: Generic = { func: n => { return [d1, d2]; } }) { } function x133(): () => Base[] { return () => [d1, d2]; } function x134(): () => Base[] { return function() { return [d1, d2] }; } function x135(): () => Base[] { return function named() { return [d1, d2] }; } @@ -149,7 +149,7 @@ function x140(): Array { return [d1, d2]; } function x141(): { [n: number]: Base; } { return [d1, d2]; } function x142(): {n: Base[]; } { return { n: [d1, d2] }; } function x143(): (s: Base[]) => any { return n => { var n: Base[]; return null; }; } -function x144(): Genric { return { func: n => { return [d1, d2]; } }; } +function x144(): Generic { return { func: n => { return [d1, d2]; } }; } function x145(): () => Base[] { return () => [d1, d2]; return () => [d1, d2]; } function x146(): () => Base[] { return function() { return [d1, d2] }; return function() { return [d1, d2] }; } function x147(): () => Base[] { return function named() { return [d1, d2] }; return function named() { return [d1, d2] }; } @@ -161,7 +161,7 @@ function x152(): Array { return [d1, d2]; return [d1, d2]; } function x153(): { [n: number]: Base; } { return [d1, d2]; return [d1, d2]; } function x154(): {n: Base[]; } { return { n: [d1, d2] }; return { n: [d1, d2] }; } function x155(): (s: Base[]) => any { return n => { var n: Base[]; return null; }; return n => { var n: Base[]; return null; }; } -function x156(): Genric { return { func: n => { return [d1, d2]; } }; return { func: n => { return [d1, d2]; } }; } +function x156(): Generic { return { func: n => { return [d1, d2]; } }; return { func: n => { return [d1, d2]; } }; } var x157: () => () => Base[] = () => { return () => [d1, d2]; }; var x158: () => () => Base[] = () => { return function() { return [d1, d2] }; }; var x159: () => () => Base[] = () => { return function named() { return [d1, d2] }; }; @@ -173,7 +173,7 @@ var x164: () => Array = () => { return [d1, d2]; }; var x165: () => { [n: number]: Base; } = () => { return [d1, d2]; }; var x166: () => {n: Base[]; } = () => { return { n: [d1, d2] }; }; var x167: () => (s: Base[]) => any = () => { return n => { var n: Base[]; return null; }; }; -var x168: () => Genric = () => { return { func: n => { return [d1, d2]; } }; }; +var x168: () => Generic = () => { return { func: n => { return [d1, d2]; } }; }; var x169: () => () => Base[] = function() { return () => [d1, d2]; }; var x170: () => () => Base[] = function() { return function() { return [d1, d2] }; }; var x171: () => () => Base[] = function() { return function named() { return [d1, d2] }; }; @@ -185,7 +185,7 @@ var x176: () => Array = function() { return [d1, d2]; }; var x177: () => { [n: number]: Base; } = function() { return [d1, d2]; }; var x178: () => {n: Base[]; } = function() { return { n: [d1, d2] }; }; var x179: () => (s: Base[]) => any = function() { return n => { var n: Base[]; return null; }; }; -var x180: () => Genric = function() { return { func: n => { return [d1, d2]; } }; }; +var x180: () => Generic = function() { return { func: n => { return [d1, d2]; } }; }; namespace x181 { var t: () => Base[] = () => [d1, d2]; } namespace x182 { var t: () => Base[] = function() { return [d1, d2] }; } namespace x183 { var t: () => Base[] = function named() { return [d1, d2] }; } @@ -197,7 +197,7 @@ namespace x188 { var t: Array = [d1, d2]; } namespace x189 { var t: { [n: number]: Base; } = [d1, d2]; } namespace x190 { var t: {n: Base[]; } = { n: [d1, d2] }; } namespace x191 { var t: (s: Base[]) => any = n => { var n: Base[]; return null; }; } -namespace x192 { var t: Genric = { func: n => { return [d1, d2]; } }; } +namespace x192 { var t: Generic = { func: n => { return [d1, d2]; } }; } namespace x193 { export var t: () => Base[] = () => [d1, d2]; } namespace x194 { export var t: () => Base[] = function() { return [d1, d2] }; } namespace x195 { export var t: () => Base[] = function named() { return [d1, d2] }; } @@ -209,7 +209,7 @@ namespace x200 { export var t: Array = [d1, d2]; } namespace x201 { export var t: { [n: number]: Base; } = [d1, d2]; } namespace x202 { export var t: {n: Base[]; } = { n: [d1, d2] }; } namespace x203 { export var t: (s: Base[]) => any = n => { var n: Base[]; return null; }; } -namespace x204 { export var t: Genric = { func: n => { return [d1, d2]; } }; } +namespace x204 { export var t: Generic = { func: n => { return [d1, d2]; } }; } var x206 = <() => Base[]>function() { return [d1, d2] }; var x207 = <() => Base[]>function named() { return [d1, d2] }; var x209 = <{ (): Base[]; }>function() { return [d1, d2] }; @@ -218,7 +218,7 @@ var x211 = [d1, d2]; var x212 = >[d1, d2]; var x213 = <{ [n: number]: Base; }>[d1, d2]; var x214 = <{n: Base[]; } >{ n: [d1, d2] }; -var x216 = >{ func: n => { return [d1, d2]; } }; +var x216 = >{ func: n => { return [d1, d2]; } }; var x217 = (<() => Base[]>undefined) || function() { return [d1, d2] }; var x218 = (<() => Base[]>undefined) || function named() { return [d1, d2] }; var x219 = (<{ (): Base[]; }>undefined) || function() { return [d1, d2] }; @@ -238,7 +238,7 @@ var x232: Array; x232 = [d1, d2]; var x233: { [n: number]: Base; }; x233 = [d1, d2]; var x234: {n: Base[]; } ; x234 = { n: [d1, d2] }; var x235: (s: Base[]) => any; x235 = n => { var n: Base[]; return null; }; -var x236: Genric; x236 = { func: n => { return [d1, d2]; } }; +var x236: Generic; x236 = { func: n => { return [d1, d2]; } }; var x237: { n: () => Base[]; } = { n: () => [d1, d2] }; var x238: { n: () => Base[]; } = { n: function() { return [d1, d2] } }; var x239: { n: () => Base[]; } = { n: function named() { return [d1, d2] } }; @@ -250,7 +250,7 @@ var x244: { n: Array; } = { n: [d1, d2] }; var x245: { n: { [n: number]: Base; }; } = { n: [d1, d2] }; var x246: { n: {n: Base[]; } ; } = { n: { n: [d1, d2] } }; var x247: { n: (s: Base[]) => any; } = { n: n => { var n: Base[]; return null; } }; -var x248: { n: Genric; } = { n: { func: n => { return [d1, d2]; } } }; +var x248: { n: Generic; } = { n: { func: n => { return [d1, d2]; } } }; var x252: { (): Base[]; }[] = [() => [d1, d2]]; var x253: { (): Base[]; }[] = [function() { return [d1, d2] }]; var x254: { (): Base[]; }[] = [function named() { return [d1, d2] }]; @@ -258,7 +258,7 @@ var x255: Base[][] = [[d1, d2]]; var x256: Array[] = [[d1, d2]]; var x257: { [n: number]: Base; }[] = [[d1, d2]]; var x258: {n: Base[]; } [] = [{ n: [d1, d2] }]; -var x260: Genric[] = [{ func: n => { return [d1, d2]; } }]; +var x260: Generic[] = [{ func: n => { return [d1, d2]; } }]; var x261: () => Base[] = function() { return [d1, d2] } || undefined; var x262: () => Base[] = function named() { return [d1, d2] } || undefined; var x263: { (): Base[]; } = function() { return [d1, d2] } || undefined; @@ -294,7 +294,7 @@ var x292: Array = true ? [d1, d2] : [d1, d2]; var x293: { [n: number]: Base; } = true ? [d1, d2] : [d1, d2]; var x294: {n: Base[]; } = true ? { n: [d1, d2] } : { n: [d1, d2] }; var x295: (s: Base[]) => any = true ? n => { var n: Base[]; return null; } : n => { var n: Base[]; return null; }; -var x296: Genric = true ? { func: n => { return [d1, d2]; } } : { func: n => { return [d1, d2]; } }; +var x296: Generic = true ? { func: n => { return [d1, d2]; } } : { func: n => { return [d1, d2]; } }; var x297: () => Base[] = true ? undefined : () => [d1, d2]; var x298: () => Base[] = true ? undefined : function() { return [d1, d2] }; var x299: () => Base[] = true ? undefined : function named() { return [d1, d2] }; @@ -306,7 +306,7 @@ var x304: Array = true ? undefined : [d1, d2]; var x305: { [n: number]: Base; } = true ? undefined : [d1, d2]; var x306: {n: Base[]; } = true ? undefined : { n: [d1, d2] }; var x307: (s: Base[]) => any = true ? undefined : n => { var n: Base[]; return null; }; -var x308: Genric = true ? undefined : { func: n => { return [d1, d2]; } }; +var x308: Generic = true ? undefined : { func: n => { return [d1, d2]; } }; var x309: () => Base[] = true ? () => [d1, d2] : undefined; var x310: () => Base[] = true ? function() { return [d1, d2] } : undefined; var x311: () => Base[] = true ? function named() { return [d1, d2] } : undefined; @@ -318,7 +318,7 @@ var x316: Array = true ? [d1, d2] : undefined; var x317: { [n: number]: Base; } = true ? [d1, d2] : undefined; var x318: {n: Base[]; } = true ? { n: [d1, d2] } : undefined; var x319: (s: Base[]) => any = true ? n => { var n: Base[]; return null; } : undefined; -var x320: Genric = true ? { func: n => { return [d1, d2]; } } : undefined; +var x320: Generic = true ? { func: n => { return [d1, d2]; } } : undefined; function x321(n: () => Base[]) { }; x321(() => [d1, d2]); function x322(n: () => Base[]) { }; x322(function() { return [d1, d2] }); function x323(n: () => Base[]) { }; x323(function named() { return [d1, d2] }); @@ -330,7 +330,7 @@ function x328(n: Array) { }; x328([d1, d2]); function x329(n: { [n: number]: Base; }) { }; x329([d1, d2]); function x330(n: {n: Base[]; } ) { }; x330({ n: [d1, d2] }); function x331(n: (s: Base[]) => any) { }; x331(n => { var n: Base[]; return null; }); -function x332(n: Genric) { }; x332({ func: n => { return [d1, d2]; } }); +function x332(n: Generic) { }; x332({ func: n => { return [d1, d2]; } }); var x333 = (n: () => Base[]) => n; x333(() => [d1, d2]); var x334 = (n: () => Base[]) => n; x334(function() { return [d1, d2] }); var x335 = (n: () => Base[]) => n; x335(function named() { return [d1, d2] }); @@ -342,7 +342,7 @@ var x340 = (n: Array) => n; x340([d1, d2]); var x341 = (n: { [n: number]: Base; }) => n; x341([d1, d2]); var x342 = (n: {n: Base[]; } ) => n; x342({ n: [d1, d2] }); var x343 = (n: (s: Base[]) => any) => n; x343(n => { var n: Base[]; return null; }); -var x344 = (n: Genric) => n; x344({ func: n => { return [d1, d2]; } }); +var x344 = (n: Generic) => n; x344({ func: n => { return [d1, d2]; } }); var x345 = function(n: () => Base[]) { }; x345(() => [d1, d2]); var x346 = function(n: () => Base[]) { }; x346(function() { return [d1, d2] }); var x347 = function(n: () => Base[]) { }; x347(function named() { return [d1, d2] }); @@ -354,7 +354,7 @@ var x352 = function(n: Array) { }; x352([d1, d2]); var x353 = function(n: { [n: number]: Base; }) { }; x353([d1, d2]); var x354 = function(n: {n: Base[]; } ) { }; x354({ n: [d1, d2] }); var x355 = function(n: (s: Base[]) => any) { }; x355(n => { var n: Base[]; return null; }); -var x356 = function(n: Genric) { }; x356({ func: n => { return [d1, d2]; } }); +var x356 = function(n: Generic) { }; x356({ func: n => { return [d1, d2]; } }); //// [generatedContextualTyping.js] "use strict"; diff --git a/tests/baselines/reference/generatedContextualTyping.symbols b/tests/baselines/reference/generatedContextualTyping.symbols index 01127dc4d2ebf..f92beb95f4312 100644 --- a/tests/baselines/reference/generatedContextualTyping.symbols +++ b/tests/baselines/reference/generatedContextualTyping.symbols @@ -15,10 +15,10 @@ class Derived2 extends Base { private n; } >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0)) >n : Symbol(Derived2.n, Decl(generatedContextualTyping.ts, 2, 29)) -interface Genric { func(n: T[]); } ->Genric : Symbol(Genric, Decl(generatedContextualTyping.ts, 2, 42)) +interface Generic { func(n: T[]); } +>Generic : Symbol(Generic, Decl(generatedContextualTyping.ts, 2, 42)) >T : Symbol(T, Decl(generatedContextualTyping.ts, 3, 17)) ->func : Symbol(Genric.func, Decl(generatedContextualTyping.ts, 3, 21)) +>func : Symbol(Generic.func, Decl(generatedContextualTyping.ts, 3, 21)) >n : Symbol(n, Decl(generatedContextualTyping.ts, 3, 27)) >T : Symbol(T, Decl(generatedContextualTyping.ts, 3, 17)) @@ -104,9 +104,9 @@ var x11: (s: Base[]) => any = n => { var n: Base[]; return null; }; >n : Symbol(n, Decl(generatedContextualTyping.ts, 15, 29), Decl(generatedContextualTyping.ts, 15, 40)) >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0)) -var x12: Genric = { func: n => { return [d1, d2]; } }; +var x12: Generic = { func: n => { return [d1, d2]; } }; >x12 : Symbol(x12, Decl(generatedContextualTyping.ts, 16, 3)) ->Genric : Symbol(Genric, Decl(generatedContextualTyping.ts, 2, 42)) +>Generic : Symbol(Generic, Decl(generatedContextualTyping.ts, 2, 42)) >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0)) >func : Symbol(func, Decl(generatedContextualTyping.ts, 16, 25)) >n : Symbol(n, Decl(generatedContextualTyping.ts, 16, 31)) @@ -198,10 +198,10 @@ class x23 { member: (s: Base[]) => any = n => { var n: Base[]; return null; } } >n : Symbol(n, Decl(generatedContextualTyping.ts, 27, 40), Decl(generatedContextualTyping.ts, 27, 51)) >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0)) -class x24 { member: Genric = { func: n => { return [d1, d2]; } } } +class x24 { member: Generic = { func: n => { return [d1, d2]; } } } >x24 : Symbol(x24, Decl(generatedContextualTyping.ts, 27, 79)) >member : Symbol(x24.member, Decl(generatedContextualTyping.ts, 28, 11)) ->Genric : Symbol(Genric, Decl(generatedContextualTyping.ts, 2, 42)) +>Generic : Symbol(Generic, Decl(generatedContextualTyping.ts, 2, 42)) >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0)) >func : Symbol(func, Decl(generatedContextualTyping.ts, 28, 36)) >n : Symbol(n, Decl(generatedContextualTyping.ts, 28, 42)) @@ -293,10 +293,10 @@ class x35 { private member: (s: Base[]) => any = n => { var n: Base[]; return nu >n : Symbol(n, Decl(generatedContextualTyping.ts, 39, 48), Decl(generatedContextualTyping.ts, 39, 59)) >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0)) -class x36 { private member: Genric = { func: n => { return [d1, d2]; } } } +class x36 { private member: Generic = { func: n => { return [d1, d2]; } } } >x36 : Symbol(x36, Decl(generatedContextualTyping.ts, 39, 87)) >member : Symbol(x36.member, Decl(generatedContextualTyping.ts, 40, 11)) ->Genric : Symbol(Genric, Decl(generatedContextualTyping.ts, 2, 42)) +>Generic : Symbol(Generic, Decl(generatedContextualTyping.ts, 2, 42)) >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0)) >func : Symbol(func, Decl(generatedContextualTyping.ts, 40, 44)) >n : Symbol(n, Decl(generatedContextualTyping.ts, 40, 50)) @@ -388,10 +388,10 @@ class x47 { public member: (s: Base[]) => any = n => { var n: Base[]; return nul >n : Symbol(n, Decl(generatedContextualTyping.ts, 51, 47), Decl(generatedContextualTyping.ts, 51, 58)) >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0)) -class x48 { public member: Genric = { func: n => { return [d1, d2]; } } } +class x48 { public member: Generic = { func: n => { return [d1, d2]; } } } >x48 : Symbol(x48, Decl(generatedContextualTyping.ts, 51, 86)) >member : Symbol(x48.member, Decl(generatedContextualTyping.ts, 52, 11)) ->Genric : Symbol(Genric, Decl(generatedContextualTyping.ts, 2, 42)) +>Generic : Symbol(Generic, Decl(generatedContextualTyping.ts, 2, 42)) >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0)) >func : Symbol(func, Decl(generatedContextualTyping.ts, 52, 43)) >n : Symbol(n, Decl(generatedContextualTyping.ts, 52, 49)) @@ -483,10 +483,10 @@ class x59 { static member: (s: Base[]) => any = n => { var n: Base[]; return nul >n : Symbol(n, Decl(generatedContextualTyping.ts, 63, 47), Decl(generatedContextualTyping.ts, 63, 58)) >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0)) -class x60 { static member: Genric = { func: n => { return [d1, d2]; } } } +class x60 { static member: Generic = { func: n => { return [d1, d2]; } } } >x60 : Symbol(x60, Decl(generatedContextualTyping.ts, 63, 86)) >member : Symbol(x60.member, Decl(generatedContextualTyping.ts, 64, 11)) ->Genric : Symbol(Genric, Decl(generatedContextualTyping.ts, 2, 42)) +>Generic : Symbol(Generic, Decl(generatedContextualTyping.ts, 2, 42)) >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0)) >func : Symbol(func, Decl(generatedContextualTyping.ts, 64, 43)) >n : Symbol(n, Decl(generatedContextualTyping.ts, 64, 49)) @@ -578,10 +578,10 @@ class x71 { private static member: (s: Base[]) => any = n => { var n: Base[]; re >n : Symbol(n, Decl(generatedContextualTyping.ts, 75, 55), Decl(generatedContextualTyping.ts, 75, 66)) >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0)) -class x72 { private static member: Genric = { func: n => { return [d1, d2]; } } } +class x72 { private static member: Generic = { func: n => { return [d1, d2]; } } } >x72 : Symbol(x72, Decl(generatedContextualTyping.ts, 75, 94)) >member : Symbol(x72.member, Decl(generatedContextualTyping.ts, 76, 11)) ->Genric : Symbol(Genric, Decl(generatedContextualTyping.ts, 2, 42)) +>Generic : Symbol(Generic, Decl(generatedContextualTyping.ts, 2, 42)) >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0)) >func : Symbol(func, Decl(generatedContextualTyping.ts, 76, 51)) >n : Symbol(n, Decl(generatedContextualTyping.ts, 76, 57)) @@ -673,10 +673,10 @@ class x83 { public static member: (s: Base[]) => any = n => { var n: Base[]; ret >n : Symbol(n, Decl(generatedContextualTyping.ts, 87, 54), Decl(generatedContextualTyping.ts, 87, 65)) >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0)) -class x84 { public static member: Genric = { func: n => { return [d1, d2]; } } } +class x84 { public static member: Generic = { func: n => { return [d1, d2]; } } } >x84 : Symbol(x84, Decl(generatedContextualTyping.ts, 87, 93)) >member : Symbol(x84.member, Decl(generatedContextualTyping.ts, 88, 11)) ->Genric : Symbol(Genric, Decl(generatedContextualTyping.ts, 2, 42)) +>Generic : Symbol(Generic, Decl(generatedContextualTyping.ts, 2, 42)) >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0)) >func : Symbol(func, Decl(generatedContextualTyping.ts, 88, 50)) >n : Symbol(n, Decl(generatedContextualTyping.ts, 88, 56)) @@ -768,10 +768,10 @@ class x95 { constructor(parm: (s: Base[]) => any = n => { var n: Base[]; return >n : Symbol(n, Decl(generatedContextualTyping.ts, 99, 50), Decl(generatedContextualTyping.ts, 99, 61)) >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0)) -class x96 { constructor(parm: Genric = { func: n => { return [d1, d2]; } }) { } } +class x96 { constructor(parm: Generic = { func: n => { return [d1, d2]; } }) { } } >x96 : Symbol(x96, Decl(generatedContextualTyping.ts, 99, 94)) >parm : Symbol(parm, Decl(generatedContextualTyping.ts, 100, 24)) ->Genric : Symbol(Genric, Decl(generatedContextualTyping.ts, 2, 42)) +>Generic : Symbol(Generic, Decl(generatedContextualTyping.ts, 2, 42)) >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0)) >func : Symbol(func, Decl(generatedContextualTyping.ts, 100, 46)) >n : Symbol(n, Decl(generatedContextualTyping.ts, 100, 52)) @@ -863,10 +863,10 @@ class x107 { constructor(public parm: (s: Base[]) => any = n => { var n: Base[]; >n : Symbol(n, Decl(generatedContextualTyping.ts, 111, 58), Decl(generatedContextualTyping.ts, 111, 69)) >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0)) -class x108 { constructor(public parm: Genric = { func: n => { return [d1, d2]; } }) { } } +class x108 { constructor(public parm: Generic = { func: n => { return [d1, d2]; } }) { } } >x108 : Symbol(x108, Decl(generatedContextualTyping.ts, 111, 102)) >parm : Symbol(x108.parm, Decl(generatedContextualTyping.ts, 112, 25)) ->Genric : Symbol(Genric, Decl(generatedContextualTyping.ts, 2, 42)) +>Generic : Symbol(Generic, Decl(generatedContextualTyping.ts, 2, 42)) >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0)) >func : Symbol(func, Decl(generatedContextualTyping.ts, 112, 54)) >n : Symbol(n, Decl(generatedContextualTyping.ts, 112, 60)) @@ -958,10 +958,10 @@ class x119 { constructor(private parm: (s: Base[]) => any = n => { var n: Base[] >n : Symbol(n, Decl(generatedContextualTyping.ts, 123, 59), Decl(generatedContextualTyping.ts, 123, 70)) >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0)) -class x120 { constructor(private parm: Genric = { func: n => { return [d1, d2]; } }) { } } +class x120 { constructor(private parm: Generic = { func: n => { return [d1, d2]; } }) { } } >x120 : Symbol(x120, Decl(generatedContextualTyping.ts, 123, 103)) >parm : Symbol(x120.parm, Decl(generatedContextualTyping.ts, 124, 25)) ->Genric : Symbol(Genric, Decl(generatedContextualTyping.ts, 2, 42)) +>Generic : Symbol(Generic, Decl(generatedContextualTyping.ts, 2, 42)) >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0)) >func : Symbol(func, Decl(generatedContextualTyping.ts, 124, 55)) >n : Symbol(n, Decl(generatedContextualTyping.ts, 124, 61)) @@ -1053,10 +1053,10 @@ function x131(parm: (s: Base[]) => any = n => { var n: Base[]; return null; }) { >n : Symbol(n, Decl(generatedContextualTyping.ts, 135, 40), Decl(generatedContextualTyping.ts, 135, 51)) >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0)) -function x132(parm: Genric = { func: n => { return [d1, d2]; } }) { } +function x132(parm: Generic = { func: n => { return [d1, d2]; } }) { } >x132 : Symbol(x132, Decl(generatedContextualTyping.ts, 135, 82)) >parm : Symbol(parm, Decl(generatedContextualTyping.ts, 136, 14)) ->Genric : Symbol(Genric, Decl(generatedContextualTyping.ts, 2, 42)) +>Generic : Symbol(Generic, Decl(generatedContextualTyping.ts, 2, 42)) >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0)) >func : Symbol(func, Decl(generatedContextualTyping.ts, 136, 36)) >n : Symbol(n, Decl(generatedContextualTyping.ts, 136, 42)) @@ -1137,9 +1137,9 @@ function x143(): (s: Base[]) => any { return n => { var n: Base[]; return null; >n : Symbol(n, Decl(generatedContextualTyping.ts, 147, 44), Decl(generatedContextualTyping.ts, 147, 55)) >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0)) -function x144(): Genric { return { func: n => { return [d1, d2]; } }; } +function x144(): Generic { return { func: n => { return [d1, d2]; } }; } >x144 : Symbol(x144, Decl(generatedContextualTyping.ts, 147, 84)) ->Genric : Symbol(Genric, Decl(generatedContextualTyping.ts, 2, 42)) +>Generic : Symbol(Generic, Decl(generatedContextualTyping.ts, 2, 42)) >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0)) >func : Symbol(func, Decl(generatedContextualTyping.ts, 148, 40)) >n : Symbol(n, Decl(generatedContextualTyping.ts, 148, 46)) @@ -1246,9 +1246,9 @@ function x155(): (s: Base[]) => any { return n => { var n: Base[]; return null; >n : Symbol(n, Decl(generatedContextualTyping.ts, 159, 89), Decl(generatedContextualTyping.ts, 159, 100)) >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0)) -function x156(): Genric { return { func: n => { return [d1, d2]; } }; return { func: n => { return [d1, d2]; } }; } +function x156(): Generic { return { func: n => { return [d1, d2]; } }; return { func: n => { return [d1, d2]; } }; } >x156 : Symbol(x156, Decl(generatedContextualTyping.ts, 159, 129)) ->Genric : Symbol(Genric, Decl(generatedContextualTyping.ts, 2, 42)) +>Generic : Symbol(Generic, Decl(generatedContextualTyping.ts, 2, 42)) >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0)) >func : Symbol(func, Decl(generatedContextualTyping.ts, 160, 40)) >n : Symbol(n, Decl(generatedContextualTyping.ts, 160, 46)) @@ -1333,9 +1333,9 @@ var x167: () => (s: Base[]) => any = () => { return n => { var n: Base[]; return >n : Symbol(n, Decl(generatedContextualTyping.ts, 171, 51), Decl(generatedContextualTyping.ts, 171, 62)) >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0)) -var x168: () => Genric = () => { return { func: n => { return [d1, d2]; } }; }; +var x168: () => Generic = () => { return { func: n => { return [d1, d2]; } }; }; >x168 : Symbol(x168, Decl(generatedContextualTyping.ts, 172, 3)) ->Genric : Symbol(Genric, Decl(generatedContextualTyping.ts, 2, 42)) +>Generic : Symbol(Generic, Decl(generatedContextualTyping.ts, 2, 42)) >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0)) >func : Symbol(func, Decl(generatedContextualTyping.ts, 172, 47)) >n : Symbol(n, Decl(generatedContextualTyping.ts, 172, 53)) @@ -1416,9 +1416,9 @@ var x179: () => (s: Base[]) => any = function() { return n => { var n: Base[]; r >n : Symbol(n, Decl(generatedContextualTyping.ts, 183, 56), Decl(generatedContextualTyping.ts, 183, 67)) >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0)) -var x180: () => Genric = function() { return { func: n => { return [d1, d2]; } }; }; +var x180: () => Generic = function() { return { func: n => { return [d1, d2]; } }; }; >x180 : Symbol(x180, Decl(generatedContextualTyping.ts, 184, 3)) ->Genric : Symbol(Genric, Decl(generatedContextualTyping.ts, 2, 42)) +>Generic : Symbol(Generic, Decl(generatedContextualTyping.ts, 2, 42)) >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0)) >func : Symbol(func, Decl(generatedContextualTyping.ts, 184, 52)) >n : Symbol(n, Decl(generatedContextualTyping.ts, 184, 58)) @@ -1510,10 +1510,10 @@ namespace x191 { var t: (s: Base[]) => any = n => { var n: Base[]; return null; >n : Symbol(n, Decl(generatedContextualTyping.ts, 195, 44), Decl(generatedContextualTyping.ts, 195, 55)) >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0)) -namespace x192 { var t: Genric = { func: n => { return [d1, d2]; } }; } +namespace x192 { var t: Generic = { func: n => { return [d1, d2]; } }; } >x192 : Symbol(x192, Decl(generatedContextualTyping.ts, 195, 84)) >t : Symbol(t, Decl(generatedContextualTyping.ts, 196, 20)) ->Genric : Symbol(Genric, Decl(generatedContextualTyping.ts, 2, 42)) +>Generic : Symbol(Generic, Decl(generatedContextualTyping.ts, 2, 42)) >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0)) >func : Symbol(func, Decl(generatedContextualTyping.ts, 196, 40)) >n : Symbol(n, Decl(generatedContextualTyping.ts, 196, 46)) @@ -1605,10 +1605,10 @@ namespace x203 { export var t: (s: Base[]) => any = n => { var n: Base[]; return >n : Symbol(n, Decl(generatedContextualTyping.ts, 207, 51), Decl(generatedContextualTyping.ts, 207, 62)) >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0)) -namespace x204 { export var t: Genric = { func: n => { return [d1, d2]; } }; } +namespace x204 { export var t: Generic = { func: n => { return [d1, d2]; } }; } >x204 : Symbol(x204, Decl(generatedContextualTyping.ts, 207, 91)) >t : Symbol(t, Decl(generatedContextualTyping.ts, 208, 27)) ->Genric : Symbol(Genric, Decl(generatedContextualTyping.ts, 2, 42)) +>Generic : Symbol(Generic, Decl(generatedContextualTyping.ts, 2, 42)) >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0)) >func : Symbol(func, Decl(generatedContextualTyping.ts, 208, 47)) >n : Symbol(n, Decl(generatedContextualTyping.ts, 208, 53)) @@ -1669,9 +1669,9 @@ var x214 = <{n: Base[]; } >{ n: [d1, d2] }; >d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19)) >d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40)) -var x216 = >{ func: n => { return [d1, d2]; } }; +var x216 = >{ func: n => { return [d1, d2]; } }; >x216 : Symbol(x216, Decl(generatedContextualTyping.ts, 217, 3)) ->Genric : Symbol(Genric, Decl(generatedContextualTyping.ts, 2, 42)) +>Generic : Symbol(Generic, Decl(generatedContextualTyping.ts, 2, 42)) >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0)) >func : Symbol(func, Decl(generatedContextualTyping.ts, 217, 26)) >n : Symbol(n, Decl(generatedContextualTyping.ts, 217, 32)) @@ -1825,9 +1825,9 @@ var x235: (s: Base[]) => any; x235 = n => { var n: Base[]; return null; }; >n : Symbol(n, Decl(generatedContextualTyping.ts, 236, 36), Decl(generatedContextualTyping.ts, 236, 47)) >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0)) -var x236: Genric; x236 = { func: n => { return [d1, d2]; } }; +var x236: Generic; x236 = { func: n => { return [d1, d2]; } }; >x236 : Symbol(x236, Decl(generatedContextualTyping.ts, 237, 3)) ->Genric : Symbol(Genric, Decl(generatedContextualTyping.ts, 2, 42)) +>Generic : Symbol(Generic, Decl(generatedContextualTyping.ts, 2, 42)) >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0)) >x236 : Symbol(x236, Decl(generatedContextualTyping.ts, 237, 3)) >func : Symbol(func, Decl(generatedContextualTyping.ts, 237, 32)) @@ -1931,10 +1931,10 @@ var x247: { n: (s: Base[]) => any; } = { n: n => { var n: Base[]; return null; } >n : Symbol(n, Decl(generatedContextualTyping.ts, 248, 43), Decl(generatedContextualTyping.ts, 248, 54)) >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0)) -var x248: { n: Genric; } = { n: { func: n => { return [d1, d2]; } } }; +var x248: { n: Generic; } = { n: { func: n => { return [d1, d2]; } } }; >x248 : Symbol(x248, Decl(generatedContextualTyping.ts, 249, 3)) >n : Symbol(n, Decl(generatedContextualTyping.ts, 249, 11)) ->Genric : Symbol(Genric, Decl(generatedContextualTyping.ts, 2, 42)) +>Generic : Symbol(Generic, Decl(generatedContextualTyping.ts, 2, 42)) >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0)) >n : Symbol(n, Decl(generatedContextualTyping.ts, 249, 34)) >func : Symbol(func, Decl(generatedContextualTyping.ts, 249, 39)) @@ -1989,9 +1989,9 @@ var x258: {n: Base[]; } [] = [{ n: [d1, d2] }]; >d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19)) >d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40)) -var x260: Genric[] = [{ func: n => { return [d1, d2]; } }]; +var x260: Generic[] = [{ func: n => { return [d1, d2]; } }]; >x260 : Symbol(x260, Decl(generatedContextualTyping.ts, 257, 3)) ->Genric : Symbol(Genric, Decl(generatedContextualTyping.ts, 2, 42)) +>Generic : Symbol(Generic, Decl(generatedContextualTyping.ts, 2, 42)) >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0)) >func : Symbol(func, Decl(generatedContextualTyping.ts, 257, 29)) >n : Symbol(n, Decl(generatedContextualTyping.ts, 257, 35)) @@ -2295,9 +2295,9 @@ var x295: (s: Base[]) => any = true ? n => { var n: Base[]; return null; } : n = >n : Symbol(n, Decl(generatedContextualTyping.ts, 292, 76), Decl(generatedContextualTyping.ts, 292, 87)) >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0)) -var x296: Genric = true ? { func: n => { return [d1, d2]; } } : { func: n => { return [d1, d2]; } }; +var x296: Generic = true ? { func: n => { return [d1, d2]; } } : { func: n => { return [d1, d2]; } }; >x296 : Symbol(x296, Decl(generatedContextualTyping.ts, 293, 3)) ->Genric : Symbol(Genric, Decl(generatedContextualTyping.ts, 2, 42)) +>Generic : Symbol(Generic, Decl(generatedContextualTyping.ts, 2, 42)) >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0)) >func : Symbol(func, Decl(generatedContextualTyping.ts, 293, 33)) >n : Symbol(n, Decl(generatedContextualTyping.ts, 293, 39)) @@ -2393,9 +2393,9 @@ var x307: (s: Base[]) => any = true ? undefined : n => { var n: Base[]; return n >n : Symbol(n, Decl(generatedContextualTyping.ts, 304, 49), Decl(generatedContextualTyping.ts, 304, 60)) >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0)) -var x308: Genric = true ? undefined : { func: n => { return [d1, d2]; } }; +var x308: Generic = true ? undefined : { func: n => { return [d1, d2]; } }; >x308 : Symbol(x308, Decl(generatedContextualTyping.ts, 305, 3)) ->Genric : Symbol(Genric, Decl(generatedContextualTyping.ts, 2, 42)) +>Generic : Symbol(Generic, Decl(generatedContextualTyping.ts, 2, 42)) >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0)) >undefined : Symbol(undefined) >func : Symbol(func, Decl(generatedContextualTyping.ts, 305, 45)) @@ -2488,9 +2488,9 @@ var x319: (s: Base[]) => any = true ? n => { var n: Base[]; return null; } : und >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0)) >undefined : Symbol(undefined) -var x320: Genric = true ? { func: n => { return [d1, d2]; } } : undefined; +var x320: Generic = true ? { func: n => { return [d1, d2]; } } : undefined; >x320 : Symbol(x320, Decl(generatedContextualTyping.ts, 317, 3)) ->Genric : Symbol(Genric, Decl(generatedContextualTyping.ts, 2, 42)) +>Generic : Symbol(Generic, Decl(generatedContextualTyping.ts, 2, 42)) >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0)) >func : Symbol(func, Decl(generatedContextualTyping.ts, 317, 33)) >n : Symbol(n, Decl(generatedContextualTyping.ts, 317, 39)) @@ -2594,10 +2594,10 @@ function x331(n: (s: Base[]) => any) { }; x331(n => { var n: Base[]; return null >n : Symbol(n, Decl(generatedContextualTyping.ts, 328, 47), Decl(generatedContextualTyping.ts, 328, 57)) >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0)) -function x332(n: Genric) { }; x332({ func: n => { return [d1, d2]; } }); +function x332(n: Generic) { }; x332({ func: n => { return [d1, d2]; } }); >x332 : Symbol(x332, Decl(generatedContextualTyping.ts, 328, 85)) >n : Symbol(n, Decl(generatedContextualTyping.ts, 329, 14)) ->Genric : Symbol(Genric, Decl(generatedContextualTyping.ts, 2, 42)) +>Generic : Symbol(Generic, Decl(generatedContextualTyping.ts, 2, 42)) >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0)) >x332 : Symbol(x332, Decl(generatedContextualTyping.ts, 328, 85)) >func : Symbol(func, Decl(generatedContextualTyping.ts, 329, 42)) @@ -2712,10 +2712,10 @@ var x343 = (n: (s: Base[]) => any) => n; x343(n => { var n: Base[]; return null; >n : Symbol(n, Decl(generatedContextualTyping.ts, 340, 46), Decl(generatedContextualTyping.ts, 340, 56)) >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0)) -var x344 = (n: Genric) => n; x344({ func: n => { return [d1, d2]; } }); +var x344 = (n: Generic) => n; x344({ func: n => { return [d1, d2]; } }); >x344 : Symbol(x344, Decl(generatedContextualTyping.ts, 341, 3)) >n : Symbol(n, Decl(generatedContextualTyping.ts, 341, 12)) ->Genric : Symbol(Genric, Decl(generatedContextualTyping.ts, 2, 42)) +>Generic : Symbol(Generic, Decl(generatedContextualTyping.ts, 2, 42)) >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0)) >n : Symbol(n, Decl(generatedContextualTyping.ts, 341, 12)) >x344 : Symbol(x344, Decl(generatedContextualTyping.ts, 341, 3)) @@ -2820,10 +2820,10 @@ var x355 = function(n: (s: Base[]) => any) { }; x355(n => { var n: Base[]; retur >n : Symbol(n, Decl(generatedContextualTyping.ts, 352, 53), Decl(generatedContextualTyping.ts, 352, 63)) >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0)) -var x356 = function(n: Genric) { }; x356({ func: n => { return [d1, d2]; } }); +var x356 = function(n: Generic) { }; x356({ func: n => { return [d1, d2]; } }); >x356 : Symbol(x356, Decl(generatedContextualTyping.ts, 353, 3)) >n : Symbol(n, Decl(generatedContextualTyping.ts, 353, 20)) ->Genric : Symbol(Genric, Decl(generatedContextualTyping.ts, 2, 42)) +>Generic : Symbol(Generic, Decl(generatedContextualTyping.ts, 2, 42)) >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0)) >x356 : Symbol(x356, Decl(generatedContextualTyping.ts, 353, 3)) >func : Symbol(func, Decl(generatedContextualTyping.ts, 353, 48)) diff --git a/tests/baselines/reference/generatedContextualTyping.types b/tests/baselines/reference/generatedContextualTyping.types index cd80fc28cebf0..0a1b316b3f54e 100644 --- a/tests/baselines/reference/generatedContextualTyping.types +++ b/tests/baselines/reference/generatedContextualTyping.types @@ -26,7 +26,7 @@ class Derived2 extends Base { private n; } >n : any > : ^^^ -interface Genric { func(n: T[]); } +interface Generic { func(n: T[]); } >func : (n: T[]) => any > : ^ ^^ ^^^^^^^^ >n : T[] @@ -188,8 +188,8 @@ var x11: (s: Base[]) => any = n => { var n: Base[]; return null; }; >n : Base[] > : ^^^^^^ -var x12: Genric = { func: n => { return [d1, d2]; } }; ->x12 : Genric +var x12: Generic = { func: n => { return [d1, d2]; } }; +>x12 : Generic > : ^^^^^^^^^^^^ >{ func: n => { return [d1, d2]; } } : { func: (n: Base[]) => (Derived1 | Derived2)[]; } > : ^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -364,10 +364,10 @@ class x23 { member: (s: Base[]) => any = n => { var n: Base[]; return null; } } >n : Base[] > : ^^^^^^ -class x24 { member: Genric = { func: n => { return [d1, d2]; } } } +class x24 { member: Generic = { func: n => { return [d1, d2]; } } } >x24 : x24 > : ^^^ ->member : Genric +>member : Generic > : ^^^^^^^^^^^^ >{ func: n => { return [d1, d2]; } } : { func: (n: Base[]) => (Derived1 | Derived2)[]; } > : ^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -542,10 +542,10 @@ class x35 { private member: (s: Base[]) => any = n => { var n: Base[]; return nu >n : Base[] > : ^^^^^^ -class x36 { private member: Genric = { func: n => { return [d1, d2]; } } } +class x36 { private member: Generic = { func: n => { return [d1, d2]; } } } >x36 : x36 > : ^^^ ->member : Genric +>member : Generic > : ^^^^^^^^^^^^ >{ func: n => { return [d1, d2]; } } : { func: (n: Base[]) => (Derived1 | Derived2)[]; } > : ^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -720,10 +720,10 @@ class x47 { public member: (s: Base[]) => any = n => { var n: Base[]; return nul >n : Base[] > : ^^^^^^ -class x48 { public member: Genric = { func: n => { return [d1, d2]; } } } +class x48 { public member: Generic = { func: n => { return [d1, d2]; } } } >x48 : x48 > : ^^^ ->member : Genric +>member : Generic > : ^^^^^^^^^^^^ >{ func: n => { return [d1, d2]; } } : { func: (n: Base[]) => (Derived1 | Derived2)[]; } > : ^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -898,10 +898,10 @@ class x59 { static member: (s: Base[]) => any = n => { var n: Base[]; return nul >n : Base[] > : ^^^^^^ -class x60 { static member: Genric = { func: n => { return [d1, d2]; } } } +class x60 { static member: Generic = { func: n => { return [d1, d2]; } } } >x60 : x60 > : ^^^ ->member : Genric +>member : Generic > : ^^^^^^^^^^^^ >{ func: n => { return [d1, d2]; } } : { func: (n: Base[]) => (Derived1 | Derived2)[]; } > : ^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1076,10 +1076,10 @@ class x71 { private static member: (s: Base[]) => any = n => { var n: Base[]; re >n : Base[] > : ^^^^^^ -class x72 { private static member: Genric = { func: n => { return [d1, d2]; } } } +class x72 { private static member: Generic = { func: n => { return [d1, d2]; } } } >x72 : x72 > : ^^^ ->member : Genric +>member : Generic > : ^^^^^^^^^^^^ >{ func: n => { return [d1, d2]; } } : { func: (n: Base[]) => (Derived1 | Derived2)[]; } > : ^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1254,10 +1254,10 @@ class x83 { public static member: (s: Base[]) => any = n => { var n: Base[]; ret >n : Base[] > : ^^^^^^ -class x84 { public static member: Genric = { func: n => { return [d1, d2]; } } } +class x84 { public static member: Generic = { func: n => { return [d1, d2]; } } } >x84 : x84 > : ^^^ ->member : Genric +>member : Generic > : ^^^^^^^^^^^^ >{ func: n => { return [d1, d2]; } } : { func: (n: Base[]) => (Derived1 | Derived2)[]; } > : ^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1432,10 +1432,10 @@ class x95 { constructor(parm: (s: Base[]) => any = n => { var n: Base[]; return >n : Base[] > : ^^^^^^ -class x96 { constructor(parm: Genric = { func: n => { return [d1, d2]; } }) { } } +class x96 { constructor(parm: Generic = { func: n => { return [d1, d2]; } }) { } } >x96 : x96 > : ^^^ ->parm : Genric +>parm : Generic > : ^^^^^^^^^^^^ >{ func: n => { return [d1, d2]; } } : { func: (n: Base[]) => (Derived1 | Derived2)[]; } > : ^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1610,10 +1610,10 @@ class x107 { constructor(public parm: (s: Base[]) => any = n => { var n: Base[]; >n : Base[] > : ^^^^^^ -class x108 { constructor(public parm: Genric = { func: n => { return [d1, d2]; } }) { } } +class x108 { constructor(public parm: Generic = { func: n => { return [d1, d2]; } }) { } } >x108 : x108 > : ^^^^ ->parm : Genric +>parm : Generic > : ^^^^^^^^^^^^ >{ func: n => { return [d1, d2]; } } : { func: (n: Base[]) => (Derived1 | Derived2)[]; } > : ^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1788,10 +1788,10 @@ class x119 { constructor(private parm: (s: Base[]) => any = n => { var n: Base[] >n : Base[] > : ^^^^^^ -class x120 { constructor(private parm: Genric = { func: n => { return [d1, d2]; } }) { } } +class x120 { constructor(private parm: Generic = { func: n => { return [d1, d2]; } }) { } } >x120 : x120 > : ^^^^ ->parm : Genric +>parm : Generic > : ^^^^^^^^^^^^ >{ func: n => { return [d1, d2]; } } : { func: (n: Base[]) => (Derived1 | Derived2)[]; } > : ^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1966,10 +1966,10 @@ function x131(parm: (s: Base[]) => any = n => { var n: Base[]; return null; }) { >n : Base[] > : ^^^^^^ -function x132(parm: Genric = { func: n => { return [d1, d2]; } }) { } ->x132 : (parm?: Genric) => void +function x132(parm: Generic = { func: n => { return [d1, d2]; } }) { } +>x132 : (parm?: Generic) => void > : ^ ^^^ ^^^^^^^^^ ->parm : Genric +>parm : Generic > : ^^^^^^^^^^^^ >{ func: n => { return [d1, d2]; } } : { func: (n: Base[]) => (Derived1 | Derived2)[]; } > : ^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -2122,8 +2122,8 @@ function x143(): (s: Base[]) => any { return n => { var n: Base[]; return null; >n : Base[] > : ^^^^^^ -function x144(): Genric { return { func: n => { return [d1, d2]; } }; } ->x144 : () => Genric +function x144(): Generic { return { func: n => { return [d1, d2]; } }; } +>x144 : () => Generic > : ^^^^^^ >{ func: n => { return [d1, d2]; } } : { func: (n: Base[]) => (Derived1 | Derived2)[]; } > : ^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -2362,8 +2362,8 @@ function x155(): (s: Base[]) => any { return n => { var n: Base[]; return null; >n : Base[] > : ^^^^^^ -function x156(): Genric { return { func: n => { return [d1, d2]; } }; return { func: n => { return [d1, d2]; } }; } ->x156 : () => Genric +function x156(): Generic { return { func: n => { return [d1, d2]; } }; return { func: n => { return [d1, d2]; } }; } +>x156 : () => Generic > : ^^^^^^ >{ func: n => { return [d1, d2]; } } : { func: (n: Base[]) => (Derived1 | Derived2)[]; } > : ^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -2552,8 +2552,8 @@ var x167: () => (s: Base[]) => any = () => { return n => { var n: Base[]; return >n : Base[] > : ^^^^^^ -var x168: () => Genric = () => { return { func: n => { return [d1, d2]; } }; }; ->x168 : () => Genric +var x168: () => Generic = () => { return { func: n => { return [d1, d2]; } }; }; +>x168 : () => Generic > : ^^^^^^ >() => { return { func: n => { return [d1, d2]; } }; } : () => { func: (n: Base[]) => (Derived1 | Derived2)[]; } > : ^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -2730,8 +2730,8 @@ var x179: () => (s: Base[]) => any = function() { return n => { var n: Base[]; r >n : Base[] > : ^^^^^^ -var x180: () => Genric = function() { return { func: n => { return [d1, d2]; } }; }; ->x180 : () => Genric +var x180: () => Generic = function() { return { func: n => { return [d1, d2]; } }; }; +>x180 : () => Generic > : ^^^^^^ >function() { return { func: n => { return [d1, d2]; } }; } : () => { func: (n: Base[]) => (Derived1 | Derived2)[]; } > : ^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -2908,10 +2908,10 @@ namespace x191 { var t: (s: Base[]) => any = n => { var n: Base[]; return null; >n : Base[] > : ^^^^^^ -namespace x192 { var t: Genric = { func: n => { return [d1, d2]; } }; } +namespace x192 { var t: Generic = { func: n => { return [d1, d2]; } }; } >x192 : typeof x192 > : ^^^^^^^^^^^ ->t : Genric +>t : Generic > : ^^^^^^^^^^^^ >{ func: n => { return [d1, d2]; } } : { func: (n: Base[]) => (Derived1 | Derived2)[]; } > : ^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -3086,10 +3086,10 @@ namespace x203 { export var t: (s: Base[]) => any = n => { var n: Base[]; return >n : Base[] > : ^^^^^^ -namespace x204 { export var t: Genric = { func: n => { return [d1, d2]; } }; } +namespace x204 { export var t: Generic = { func: n => { return [d1, d2]; } }; } >x204 : typeof x204 > : ^^^^^^^^^^^ ->t : Genric +>t : Generic > : ^^^^^^^^^^^^ >{ func: n => { return [d1, d2]; } } : { func: (n: Base[]) => (Derived1 | Derived2)[]; } > : ^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -3222,10 +3222,10 @@ var x214 = <{n: Base[]; } >{ n: [d1, d2] }; >d2 : Derived2 > : ^^^^^^^^ -var x216 = >{ func: n => { return [d1, d2]; } }; ->x216 : Genric +var x216 = >{ func: n => { return [d1, d2]; } }; +>x216 : Generic > : ^^^^^^^^^^^^ ->>{ func: n => { return [d1, d2]; } } : Genric +>>{ func: n => { return [d1, d2]; } } : Generic > : ^^^^^^^^^^^^ >{ func: n => { return [d1, d2]; } } : { func: (n: Base[]) => (Derived1 | Derived2)[]; } > : ^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -3586,12 +3586,12 @@ var x235: (s: Base[]) => any; x235 = n => { var n: Base[]; return null; }; >n : Base[] > : ^^^^^^ -var x236: Genric; x236 = { func: n => { return [d1, d2]; } }; ->x236 : Genric +var x236: Generic; x236 = { func: n => { return [d1, d2]; } }; +>x236 : Generic > : ^^^^^^^^^^^^ >x236 = { func: n => { return [d1, d2]; } } : { func: (n: Base[]) => (Derived1 | Derived2)[]; } > : ^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ->x236 : Genric +>x236 : Generic > : ^^^^^^^^^^^^ >{ func: n => { return [d1, d2]; } } : { func: (n: Base[]) => (Derived1 | Derived2)[]; } > : ^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -3810,10 +3810,10 @@ var x247: { n: (s: Base[]) => any; } = { n: n => { var n: Base[]; return null; } >n : Base[] > : ^^^^^^ -var x248: { n: Genric; } = { n: { func: n => { return [d1, d2]; } } }; ->x248 : { n: Genric; } +var x248: { n: Generic; } = { n: { func: n => { return [d1, d2]; } } }; +>x248 : { n: Generic; } > : ^^^^^ ^^^ ->n : Genric +>n : Generic > : ^^^^^^^^^^^^ >{ n: { func: n => { return [d1, d2]; } } } : { n: { func: (n: Base[]) => (Derived1 | Derived2)[]; }; } > : ^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -3934,8 +3934,8 @@ var x258: {n: Base[]; } [] = [{ n: [d1, d2] }]; >d2 : Derived2 > : ^^^^^^^^ -var x260: Genric[] = [{ func: n => { return [d1, d2]; } }]; ->x260 : Genric[] +var x260: Generic[] = [{ func: n => { return [d1, d2]; } }]; +>x260 : Generic[] > : ^^^^^^^^^^^^^^ >[{ func: n => { return [d1, d2]; } }] : { func: (n: Base[]) => (Derived1 | Derived2)[]; }[] > : ^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -4664,8 +4664,8 @@ var x295: (s: Base[]) => any = true ? n => { var n: Base[]; return null; } : n = >n : Base[] > : ^^^^^^ -var x296: Genric = true ? { func: n => { return [d1, d2]; } } : { func: n => { return [d1, d2]; } }; ->x296 : Genric +var x296: Generic = true ? { func: n => { return [d1, d2]; } } : { func: n => { return [d1, d2]; } }; +>x296 : Generic > : ^^^^^^^^^^^^ >true ? { func: n => { return [d1, d2]; } } : { func: n => { return [d1, d2]; } } : { func: (n: Base[]) => (Derived1 | Derived2)[]; } > : ^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -4902,8 +4902,8 @@ var x307: (s: Base[]) => any = true ? undefined : n => { var n: Base[]; return n >n : Base[] > : ^^^^^^ -var x308: Genric = true ? undefined : { func: n => { return [d1, d2]; } }; ->x308 : Genric +var x308: Generic = true ? undefined : { func: n => { return [d1, d2]; } }; +>x308 : Generic > : ^^^^^^^^^^^^ >true ? undefined : { func: n => { return [d1, d2]; } } : { func: (n: Base[]) => (Derived1 | Derived2)[]; } > : ^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -5128,8 +5128,8 @@ var x319: (s: Base[]) => any = true ? n => { var n: Base[]; return null; } : und >undefined : undefined > : ^^^^^^^^^ -var x320: Genric = true ? { func: n => { return [d1, d2]; } } : undefined; ->x320 : Genric +var x320: Generic = true ? { func: n => { return [d1, d2]; } } : undefined; +>x320 : Generic > : ^^^^^^^^^^^^ >true ? { func: n => { return [d1, d2]; } } : undefined : { func: (n: Base[]) => (Derived1 | Derived2)[]; } > : ^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -5354,14 +5354,14 @@ function x331(n: (s: Base[]) => any) { }; x331(n => { var n: Base[]; return null >n : Base[] > : ^^^^^^ -function x332(n: Genric) { }; x332({ func: n => { return [d1, d2]; } }); ->x332 : (n: Genric) => void +function x332(n: Generic) { }; x332({ func: n => { return [d1, d2]; } }); +>x332 : (n: Generic) => void > : ^ ^^ ^^^^^^^^^ ->n : Genric +>n : Generic > : ^^^^^^^^^^^^ >x332({ func: n => { return [d1, d2]; } }) : void > : ^^^^ ->x332 : (n: Genric) => void +>x332 : (n: Generic) => void > : ^ ^^ ^^^^^^^^^ >{ func: n => { return [d1, d2]; } } : { func: (n: Base[]) => (Derived1 | Derived2)[]; } > : ^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -5624,18 +5624,18 @@ var x343 = (n: (s: Base[]) => any) => n; x343(n => { var n: Base[]; return null; >n : Base[] > : ^^^^^^ -var x344 = (n: Genric) => n; x344({ func: n => { return [d1, d2]; } }); ->x344 : (n: Genric) => Genric +var x344 = (n: Generic) => n; x344({ func: n => { return [d1, d2]; } }); +>x344 : (n: Generic) => Generic > : ^ ^^ ^^^^^^^^^^^^^^^^^ ->(n: Genric) => n : (n: Genric) => Genric +>(n: Generic) => n : (n: Generic) => Generic > : ^ ^^ ^^^^^^^^^^^^^^^^^ ->n : Genric +>n : Generic > : ^^^^^^^^^^^^ ->n : Genric +>n : Generic > : ^^^^^^^^^^^^ ->x344({ func: n => { return [d1, d2]; } }) : Genric +>x344({ func: n => { return [d1, d2]; } }) : Generic > : ^^^^^^^^^^^^ ->x344 : (n: Genric) => Genric +>x344 : (n: Generic) => Generic > : ^ ^^ ^^^^^^^^^^^^^^^^^ >{ func: n => { return [d1, d2]; } } : { func: (n: Base[]) => (Derived1 | Derived2)[]; } > : ^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -5876,16 +5876,16 @@ var x355 = function(n: (s: Base[]) => any) { }; x355(n => { var n: Base[]; retur >n : Base[] > : ^^^^^^ -var x356 = function(n: Genric) { }; x356({ func: n => { return [d1, d2]; } }); ->x356 : (n: Genric) => void +var x356 = function(n: Generic) { }; x356({ func: n => { return [d1, d2]; } }); +>x356 : (n: Generic) => void > : ^ ^^ ^^^^^^^^^ ->function(n: Genric) { } : (n: Genric) => void +>function(n: Generic) { } : (n: Generic) => void > : ^ ^^ ^^^^^^^^^ ->n : Genric +>n : Generic > : ^^^^^^^^^^^^ >x356({ func: n => { return [d1, d2]; } }) : void > : ^^^^ ->x356 : (n: Genric) => void +>x356 : (n: Generic) => void > : ^ ^^ ^^^^^^^^^ >{ func: n => { return [d1, d2]; } } : { func: (n: Base[]) => (Derived1 | Derived2)[]; } > : ^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints.errors.txt b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints.errors.txt index e9303c7ffa161..ea4fdf59a55a3 100644 --- a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints.errors.txt +++ b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints.errors.txt @@ -7,7 +7,7 @@ genericCallWithObjectTypeArgsAndConstraints.ts(29,12): error TS2454: Variable 'x ==== genericCallWithObjectTypeArgsAndConstraints.ts (6 errors) ==== - // Generic call with constraints infering type parameter from object member properties + // Generic call with constraints inferring type parameter from object member properties // No errors expected class C { diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints.js b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints.js index b2ce2561f6fda..e290331f8690e 100644 --- a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints.js +++ b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints.js @@ -1,7 +1,7 @@ //// [tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints.ts] //// //// [genericCallWithObjectTypeArgsAndConstraints.ts] -// Generic call with constraints infering type parameter from object member properties +// Generic call with constraints inferring type parameter from object member properties // No errors expected class C { @@ -37,7 +37,7 @@ var r2 = foo2(c1, c1); //// [genericCallWithObjectTypeArgsAndConstraints.js] "use strict"; -// Generic call with constraints infering type parameter from object member properties +// Generic call with constraints inferring type parameter from object member properties // No errors expected class C { } diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints.symbols b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints.symbols index 95197303eabb8..b5ef143afb68e 100644 --- a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints.symbols +++ b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints.symbols @@ -1,7 +1,7 @@ //// [tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints.ts] //// === genericCallWithObjectTypeArgsAndConstraints.ts === -// Generic call with constraints infering type parameter from object member properties +// Generic call with constraints inferring type parameter from object member properties // No errors expected class C { diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints.types b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints.types index 9ae1727521f8c..c25f3bbf7c133 100644 --- a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints.types +++ b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints.types @@ -1,7 +1,7 @@ //// [tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints.ts] //// === genericCallWithObjectTypeArgsAndConstraints.ts === -// Generic call with constraints infering type parameter from object member properties +// Generic call with constraints inferring type parameter from object member properties // No errors expected class C { diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints2.errors.txt b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints2.errors.txt index 7de9c600e475d..9286ebf58d762 100644 --- a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints2.errors.txt +++ b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints2.errors.txt @@ -10,7 +10,7 @@ genericCallWithObjectTypeArgsAndConstraints2.ts(37,13): error TS2345: Argument o ==== genericCallWithObjectTypeArgsAndConstraints2.ts (8 errors) ==== - // Generic call with constraints infering type parameter from object member properties + // Generic call with constraints inferring type parameter from object member properties // No errors expected class Base { diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints2.js b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints2.js index b8e609ecad5b7..2789fef522ce9 100644 --- a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints2.js +++ b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints2.js @@ -1,7 +1,7 @@ //// [tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints2.ts] //// //// [genericCallWithObjectTypeArgsAndConstraints2.ts] -// Generic call with constraints infering type parameter from object member properties +// Generic call with constraints inferring type parameter from object member properties // No errors expected class Base { @@ -42,7 +42,7 @@ var r7 = f3(null, x => x); // any //// [genericCallWithObjectTypeArgsAndConstraints2.js] "use strict"; -// Generic call with constraints infering type parameter from object member properties +// Generic call with constraints inferring type parameter from object member properties // No errors expected class Base { } diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints2.symbols b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints2.symbols index aa6b50e09ea40..c7eb130e854b6 100644 --- a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints2.symbols +++ b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints2.symbols @@ -1,7 +1,7 @@ //// [tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints2.ts] //// === genericCallWithObjectTypeArgsAndConstraints2.ts === -// Generic call with constraints infering type parameter from object member properties +// Generic call with constraints inferring type parameter from object member properties // No errors expected class Base { diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints2.types b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints2.types index 4ae6291e54dfd..e0f3070503da7 100644 --- a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints2.types +++ b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints2.types @@ -1,7 +1,7 @@ //// [tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints2.ts] //// === genericCallWithObjectTypeArgsAndConstraints2.ts === -// Generic call with constraints infering type parameter from object member properties +// Generic call with constraints inferring type parameter from object member properties // No errors expected class Base { diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints3.errors.txt b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints3.errors.txt index 5aa65bf9f2b9d..563b7af3d103c 100644 --- a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints3.errors.txt +++ b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints3.errors.txt @@ -8,7 +8,7 @@ genericCallWithObjectTypeArgsAndConstraints3.ts(36,21): error TS2345: Argument o ==== genericCallWithObjectTypeArgsAndConstraints3.ts (6 errors) ==== - // Generic call with constraints infering type parameter from object member properties + // Generic call with constraints inferring type parameter from object member properties class Base { x: string; diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints3.js b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints3.js index 9f70c541848c2..1195b3b43c4e0 100644 --- a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints3.js +++ b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints3.js @@ -1,7 +1,7 @@ //// [tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints3.ts] //// //// [genericCallWithObjectTypeArgsAndConstraints3.ts] -// Generic call with constraints infering type parameter from object member properties +// Generic call with constraints inferring type parameter from object member properties class Base { x: string; @@ -41,7 +41,7 @@ var r6 = f3(x => x, null); //// [genericCallWithObjectTypeArgsAndConstraints3.js] "use strict"; -// Generic call with constraints infering type parameter from object member properties +// Generic call with constraints inferring type parameter from object member properties class Base { } class Derived extends Base { diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints3.symbols b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints3.symbols index d9dd512dab412..cdd4510d30c36 100644 --- a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints3.symbols +++ b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints3.symbols @@ -1,7 +1,7 @@ //// [tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints3.ts] //// === genericCallWithObjectTypeArgsAndConstraints3.ts === -// Generic call with constraints infering type parameter from object member properties +// Generic call with constraints inferring type parameter from object member properties class Base { >Base : Symbol(Base, Decl(genericCallWithObjectTypeArgsAndConstraints3.ts, 0, 0)) diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints3.types b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints3.types index cf44e55bef475..d802156e6c6b4 100644 --- a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints3.types +++ b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints3.types @@ -1,7 +1,7 @@ //// [tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints3.ts] //// === genericCallWithObjectTypeArgsAndConstraints3.ts === -// Generic call with constraints infering type parameter from object member properties +// Generic call with constraints inferring type parameter from object member properties class Base { >Base : Base diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints4.errors.txt b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints4.errors.txt index 479fbf3364744..385e9fdce0807 100644 --- a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints4.errors.txt +++ b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints4.errors.txt @@ -10,7 +10,7 @@ genericCallWithObjectTypeArgsAndConstraints4.ts(30,24): error TS2345: Argument o ==== genericCallWithObjectTypeArgsAndConstraints4.ts (7 errors) ==== - // Generic call with constraints infering type parameter from object member properties + // Generic call with constraints inferring type parameter from object member properties class C { x: string; diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints4.js b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints4.js index 4d1fdf4a0a477..a0e2dab8b658f 100644 --- a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints4.js +++ b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints4.js @@ -1,7 +1,7 @@ //// [tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints4.ts] //// //// [genericCallWithObjectTypeArgsAndConstraints4.ts] -// Generic call with constraints infering type parameter from object member properties +// Generic call with constraints inferring type parameter from object member properties class C { x: string; @@ -37,7 +37,7 @@ function other() { //// [genericCallWithObjectTypeArgsAndConstraints4.js] "use strict"; -// Generic call with constraints infering type parameter from object member properties +// Generic call with constraints inferring type parameter from object member properties class C { } class D { diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints4.symbols b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints4.symbols index 7029185a0a153..23db8d40c97fd 100644 --- a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints4.symbols +++ b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints4.symbols @@ -1,7 +1,7 @@ //// [tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints4.ts] //// === genericCallWithObjectTypeArgsAndConstraints4.ts === -// Generic call with constraints infering type parameter from object member properties +// Generic call with constraints inferring type parameter from object member properties class C { >C : Symbol(C, Decl(genericCallWithObjectTypeArgsAndConstraints4.ts, 0, 0)) diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints4.types b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints4.types index 4658dd1c4abf3..8e6f095283c6b 100644 --- a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints4.types +++ b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints4.types @@ -1,7 +1,7 @@ //// [tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints4.ts] //// === genericCallWithObjectTypeArgsAndConstraints4.ts === -// Generic call with constraints infering type parameter from object member properties +// Generic call with constraints inferring type parameter from object member properties class C { >C : C diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints5.errors.txt b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints5.errors.txt index 41ed7ebe58288..3160cd2bafb5a 100644 --- a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints5.errors.txt +++ b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints5.errors.txt @@ -10,7 +10,7 @@ genericCallWithObjectTypeArgsAndConstraints5.ts(22,24): error TS2345: Argument o ==== genericCallWithObjectTypeArgsAndConstraints5.ts (6 errors) ==== - // Generic call with constraints infering type parameter from object member properties + // Generic call with constraints inferring type parameter from object member properties class C { x: string; diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints5.js b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints5.js index c272f86936441..26e10bbbd52be 100644 --- a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints5.js +++ b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints5.js @@ -1,7 +1,7 @@ //// [tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints5.ts] //// //// [genericCallWithObjectTypeArgsAndConstraints5.ts] -// Generic call with constraints infering type parameter from object member properties +// Generic call with constraints inferring type parameter from object member properties class C { x: string; @@ -28,7 +28,7 @@ function other() { //// [genericCallWithObjectTypeArgsAndConstraints5.js] "use strict"; -// Generic call with constraints infering type parameter from object member properties +// Generic call with constraints inferring type parameter from object member properties class C { } class D { diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints5.symbols b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints5.symbols index 37649123bceff..79347553090d1 100644 --- a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints5.symbols +++ b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints5.symbols @@ -1,7 +1,7 @@ //// [tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints5.ts] //// === genericCallWithObjectTypeArgsAndConstraints5.ts === -// Generic call with constraints infering type parameter from object member properties +// Generic call with constraints inferring type parameter from object member properties class C { >C : Symbol(C, Decl(genericCallWithObjectTypeArgsAndConstraints5.ts, 0, 0)) diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints5.types b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints5.types index 2ffd2e34651d6..90fd2e998c411 100644 --- a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints5.types +++ b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints5.types @@ -1,7 +1,7 @@ //// [tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints5.ts] //// === genericCallWithObjectTypeArgsAndConstraints5.ts === -// Generic call with constraints infering type parameter from object member properties +// Generic call with constraints inferring type parameter from object member properties class C { >C : C diff --git a/tests/baselines/reference/genericClassWithObjectTypeArgsAndConstraints.errors.txt b/tests/baselines/reference/genericClassWithObjectTypeArgsAndConstraints.errors.txt index 8f47c1a77ff1b..241835f063466 100644 --- a/tests/baselines/reference/genericClassWithObjectTypeArgsAndConstraints.errors.txt +++ b/tests/baselines/reference/genericClassWithObjectTypeArgsAndConstraints.errors.txt @@ -15,7 +15,7 @@ genericClassWithObjectTypeArgsAndConstraints.ts(59,14): error TS2454: Variable ' ==== genericClassWithObjectTypeArgsAndConstraints.ts (14 errors) ==== - // Generic call with constraints infering type parameter from object member properties + // Generic call with constraints inferring type parameter from object member properties // No errors expected class C { diff --git a/tests/baselines/reference/genericClassWithObjectTypeArgsAndConstraints.js b/tests/baselines/reference/genericClassWithObjectTypeArgsAndConstraints.js index c31cd166a028d..971ed255d2bdb 100644 --- a/tests/baselines/reference/genericClassWithObjectTypeArgsAndConstraints.js +++ b/tests/baselines/reference/genericClassWithObjectTypeArgsAndConstraints.js @@ -1,7 +1,7 @@ //// [tests/cases/conformance/types/typeRelationships/typeInference/genericClassWithObjectTypeArgsAndConstraints.ts] //// //// [genericClassWithObjectTypeArgsAndConstraints.ts] -// Generic call with constraints infering type parameter from object member properties +// Generic call with constraints inferring type parameter from object member properties // No errors expected class C { @@ -64,7 +64,7 @@ namespace Interface { //// [genericClassWithObjectTypeArgsAndConstraints.js] "use strict"; -// Generic call with constraints infering type parameter from object member properties +// Generic call with constraints inferring type parameter from object member properties // No errors expected class C { } diff --git a/tests/baselines/reference/genericClassWithObjectTypeArgsAndConstraints.symbols b/tests/baselines/reference/genericClassWithObjectTypeArgsAndConstraints.symbols index 0e1a77be675b2..d772a8a360e32 100644 --- a/tests/baselines/reference/genericClassWithObjectTypeArgsAndConstraints.symbols +++ b/tests/baselines/reference/genericClassWithObjectTypeArgsAndConstraints.symbols @@ -1,7 +1,7 @@ //// [tests/cases/conformance/types/typeRelationships/typeInference/genericClassWithObjectTypeArgsAndConstraints.ts] //// === genericClassWithObjectTypeArgsAndConstraints.ts === -// Generic call with constraints infering type parameter from object member properties +// Generic call with constraints inferring type parameter from object member properties // No errors expected class C { diff --git a/tests/baselines/reference/genericClassWithObjectTypeArgsAndConstraints.types b/tests/baselines/reference/genericClassWithObjectTypeArgsAndConstraints.types index ce8c43fe25e41..818b49c52c6fd 100644 --- a/tests/baselines/reference/genericClassWithObjectTypeArgsAndConstraints.types +++ b/tests/baselines/reference/genericClassWithObjectTypeArgsAndConstraints.types @@ -1,7 +1,7 @@ //// [tests/cases/conformance/types/typeRelationships/typeInference/genericClassWithObjectTypeArgsAndConstraints.ts] //// === genericClassWithObjectTypeArgsAndConstraints.ts === -// Generic call with constraints infering type parameter from object member properties +// Generic call with constraints inferring type parameter from object member properties // No errors expected class C { diff --git a/tests/baselines/reference/genericDefaults.errors.txt b/tests/baselines/reference/genericDefaults.errors.txt index aaacdfc385589..361cd364a9238 100644 --- a/tests/baselines/reference/genericDefaults.errors.txt +++ b/tests/baselines/reference/genericDefaults.errors.txt @@ -42,7 +42,7 @@ genericDefaults.ts(427,19): error TS2744: Type parameter defaults can only refer f01(); f01(a); - // function with a type paramter with a default + // function with a type parameter with a default declare function f02(a?: T): T; // inference f02(); @@ -68,7 +68,7 @@ genericDefaults.ts(427,19): error TS2744: Type parameter defaults can only refer f03(); f03(b); - // function with a type paramter without a default and a type parameter with a default + // function with a type parameter without a default and a type parameter with a default declare function f04(a?: T, b?: U): [T, U]; // inference f04(); diff --git a/tests/baselines/reference/genericDefaults.js b/tests/baselines/reference/genericDefaults.js index 2cf19e035c9b4..b307a704e2027 100644 --- a/tests/baselines/reference/genericDefaults.js +++ b/tests/baselines/reference/genericDefaults.js @@ -31,7 +31,7 @@ f01(a); f01(); f01(a); -// function with a type paramter with a default +// function with a type parameter with a default declare function f02(a?: T): T; // inference f02(); @@ -55,7 +55,7 @@ f03(a); f03(); f03(b); -// function with a type paramter without a default and a type parameter with a default +// function with a type parameter without a default and a type parameter with a default declare function f04(a?: T, b?: U): [T, U]; // inference f04(); diff --git a/tests/baselines/reference/genericDefaults.symbols b/tests/baselines/reference/genericDefaults.symbols index 185437f5db722..cd0fc7cf1a94a 100644 --- a/tests/baselines/reference/genericDefaults.symbols +++ b/tests/baselines/reference/genericDefaults.symbols @@ -95,7 +95,7 @@ f01(a); >A : Symbol(A, Decl(genericDefaults.ts, 0, 0)) >a : Symbol(a, Decl(genericDefaults.ts, 7, 13)) -// function with a type paramter with a default +// function with a type parameter with a default declare function f02(a?: T): T; >f02 : Symbol(f02, Decl(genericDefaults.ts, 28, 10)) >T : Symbol(T, Decl(genericDefaults.ts, 31, 21)) @@ -175,7 +175,7 @@ f03(b); >B : Symbol(B, Decl(genericDefaults.ts, 0, 26)) >b : Symbol(b, Decl(genericDefaults.ts, 8, 13)) -// function with a type paramter without a default and a type parameter with a default +// function with a type parameter without a default and a type parameter with a default declare function f04(a?: T, b?: U): [T, U]; >f04 : Symbol(f04, Decl(genericDefaults.ts, 52, 10)) >T : Symbol(T, Decl(genericDefaults.ts, 55, 21)) diff --git a/tests/baselines/reference/genericDefaults.types b/tests/baselines/reference/genericDefaults.types index 0dc4eae2c2b74..585cd98d8e179 100644 --- a/tests/baselines/reference/genericDefaults.types +++ b/tests/baselines/reference/genericDefaults.types @@ -116,7 +116,7 @@ f01(a); >a : A > : ^ -// function with a type paramter with a default +// function with a type parameter with a default declare function f02(a?: T): T; >f02 : (a?: T) => T > : ^ ^^^^^^ ^^^ ^^^^^ @@ -234,7 +234,7 @@ f03(b); >b : B > : ^ -// function with a type paramter without a default and a type parameter with a default +// function with a type parameter without a default and a type parameter with a default declare function f04(a?: T, b?: U): [T, U]; >f04 : (a?: T, b?: U) => [T, U] > : ^ ^^ ^^^^^^ ^^^ ^^ ^^^ ^^^^^ diff --git a/tests/baselines/reference/genericFunctionInference2.js b/tests/baselines/reference/genericFunctionInference2.js index 367933d6fab78..4ce632945db94 100644 --- a/tests/baselines/reference/genericFunctionInference2.js +++ b/tests/baselines/reference/genericFunctionInference2.js @@ -19,13 +19,13 @@ const myReducer2 = combineReducers({ // Repro from #30942 -declare function withH(handlerCreators: HandleCreatorsFactory): U; +declare function with(handlerCreators: HandleCreatorsFactory): U; type Props = { out: number } type HandleCreatorsFactory = (initialProps: T) => { [P in keyof U]: (props: T) => U[P] }; -const enhancer4 = withH((props: Props) => ({ +const enhancer4 = with((props: Props) => ({ onChange: (props) => (e: any) => {}, onSubmit: (props) => (e: any) => {}, })); @@ -42,7 +42,7 @@ const myReducer1 = combineReducers({ const myReducer2 = combineReducers({ combined: combineReducers({ foo }), }); -const enhancer4 = withH((props) => ({ +const enhancer4 = with((props) => ({ onChange: (props) => (e) => { }, onSubmit: (props) => (e) => { }, })); diff --git a/tests/baselines/reference/genericFunctionInference2.symbols b/tests/baselines/reference/genericFunctionInference2.symbols index 2cbbfba13e794..33d72246bc1b6 100644 --- a/tests/baselines/reference/genericFunctionInference2.symbols +++ b/tests/baselines/reference/genericFunctionInference2.symbols @@ -58,8 +58,8 @@ const myReducer2 = combineReducers({ // Repro from #30942 -declare function withH(handlerCreators: HandleCreatorsFactory): U; ->withH : Symbol(withH, Decl(genericFunctionInference2.ts, 14, 3)) +declare function with(handlerCreators: HandleCreatorsFactory): U; +>with : Symbol(with, Decl(genericFunctionInference2.ts, 14, 3)) >T : Symbol(T, Decl(genericFunctionInference2.ts, 18, 23)) >U : Symbol(U, Decl(genericFunctionInference2.ts, 18, 25)) >handlerCreators : Symbol(handlerCreators, Decl(genericFunctionInference2.ts, 18, 29)) @@ -85,9 +85,9 @@ type HandleCreatorsFactory = (initialProps: T) => { [P in keyof U]: (props >U : Symbol(U, Decl(genericFunctionInference2.ts, 22, 29)) >P : Symbol(P, Decl(genericFunctionInference2.ts, 22, 59)) -const enhancer4 = withH((props: Props) => ({ +const enhancer4 = with((props: Props) => ({ >enhancer4 : Symbol(enhancer4, Decl(genericFunctionInference2.ts, 24, 5)) ->withH : Symbol(withH, Decl(genericFunctionInference2.ts, 14, 3)) +>with : Symbol(with, Decl(genericFunctionInference2.ts, 14, 3)) >props : Symbol(props, Decl(genericFunctionInference2.ts, 24, 25)) >Props : Symbol(Props, Decl(genericFunctionInference2.ts, 18, 78)) diff --git a/tests/baselines/reference/genericFunctionInference2.types b/tests/baselines/reference/genericFunctionInference2.types index eba493b6fa58f..05842cceca628 100644 --- a/tests/baselines/reference/genericFunctionInference2.types +++ b/tests/baselines/reference/genericFunctionInference2.types @@ -77,8 +77,8 @@ const myReducer2 = combineReducers({ // Repro from #30942 -declare function withH(handlerCreators: HandleCreatorsFactory): U; ->withH : (handlerCreators: HandleCreatorsFactory) => U +declare function with(handlerCreators: HandleCreatorsFactory): U; +>with : (handlerCreators: HandleCreatorsFactory) => U > : ^ ^^ ^^ ^^ ^^^^^ >handlerCreators : HandleCreatorsFactory > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -97,12 +97,12 @@ type HandleCreatorsFactory = (initialProps: T) => { [P in keyof U]: (props >props : T > : ^ -const enhancer4 = withH((props: Props) => ({ +const enhancer4 = with((props: Props) => ({ >enhancer4 : { onChange: (e: any) => void; onSubmit: (e: any) => void; } > : ^^^^^^^^^^^^^ ^^ ^^^^^^^^^^^^^^^^^^^^^^ ^^ ^^^^^^^^^^^^ ->withH((props: Props) => ({ onChange: (props) => (e: any) => {}, onSubmit: (props) => (e: any) => {},})) : { onChange: (e: any) => void; onSubmit: (e: any) => void; } +>with((props: Props) => ({ onChange: (props) => (e: any) => {}, onSubmit: (props) => (e: any) => {},})) : { onChange: (e: any) => void; onSubmit: (e: any) => void; } > : ^^^^^^^^^^^^^ ^^ ^^^^^^^^^^^^^^^^^^^^^^ ^^ ^^^^^^^^^^^^ ->withH : (handlerCreators: HandleCreatorsFactory) => U +>with : (handlerCreators: HandleCreatorsFactory) => U > : ^ ^^ ^^ ^^ ^^^^^ >(props: Props) => ({ onChange: (props) => (e: any) => {}, onSubmit: (props) => (e: any) => {},}) : (props: Props) => { onChange: (props: Props) => (e: any) => void; onSubmit: (props: Props) => (e: any) => void; } > : ^ ^^ ^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^ ^^ ^^^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^ ^^ ^^^^^^^^^^^^ diff --git a/tests/baselines/reference/genericSpecializations1.errors.txt b/tests/baselines/reference/genericSpecializations1.errors.txt index 75084e651020a..094db7a8a0b8f 100644 --- a/tests/baselines/reference/genericSpecializations1.errors.txt +++ b/tests/baselines/reference/genericSpecializations1.errors.txt @@ -14,7 +14,7 @@ genericSpecializations1.ts(14,23): error TS2322: Type 'null' is not assignable t ==== genericSpecializations1.ts (5 errors) ==== interface IFoo { - foo(x: T): T; // no error on implementors because IFoo's T is different from foo's T + foo(x: T): T; // no error on implementers because IFoo's T is different from foo's T } class IntFooBad implements IFoo { diff --git a/tests/baselines/reference/genericSpecializations1.js b/tests/baselines/reference/genericSpecializations1.js index ce24a91b3c345..8c06a3a44356a 100644 --- a/tests/baselines/reference/genericSpecializations1.js +++ b/tests/baselines/reference/genericSpecializations1.js @@ -2,7 +2,7 @@ //// [genericSpecializations1.ts] interface IFoo { - foo(x: T): T; // no error on implementors because IFoo's T is different from foo's T + foo(x: T): T; // no error on implementers because IFoo's T is different from foo's T } class IntFooBad implements IFoo { diff --git a/tests/baselines/reference/genericSpecializations1.symbols b/tests/baselines/reference/genericSpecializations1.symbols index 915b9fcf7faa5..35819b41d2728 100644 --- a/tests/baselines/reference/genericSpecializations1.symbols +++ b/tests/baselines/reference/genericSpecializations1.symbols @@ -5,7 +5,7 @@ interface IFoo { >IFoo : Symbol(IFoo, Decl(genericSpecializations1.ts, 0, 0)) >T : Symbol(T, Decl(genericSpecializations1.ts, 0, 15)) - foo(x: T): T; // no error on implementors because IFoo's T is different from foo's T + foo(x: T): T; // no error on implementers because IFoo's T is different from foo's T >foo : Symbol(IFoo.foo, Decl(genericSpecializations1.ts, 0, 19)) >T : Symbol(T, Decl(genericSpecializations1.ts, 1, 8)) >x : Symbol(x, Decl(genericSpecializations1.ts, 1, 11)) diff --git a/tests/baselines/reference/genericSpecializations1.types b/tests/baselines/reference/genericSpecializations1.types index a02d89ea2a38a..2a6edd27583fb 100644 --- a/tests/baselines/reference/genericSpecializations1.types +++ b/tests/baselines/reference/genericSpecializations1.types @@ -2,7 +2,7 @@ === genericSpecializations1.ts === interface IFoo { - foo(x: T): T; // no error on implementors because IFoo's T is different from foo's T + foo(x: T): T; // no error on implementers because IFoo's T is different from foo's T >foo : (x: T) => T > : ^ ^^ ^^ ^^^^^ >x : T diff --git a/tests/baselines/reference/genericSpecializations2.errors.txt b/tests/baselines/reference/genericSpecializations2.errors.txt index 62ff389571c09..b92dafe1efda7 100644 --- a/tests/baselines/reference/genericSpecializations2.errors.txt +++ b/tests/baselines/reference/genericSpecializations2.errors.txt @@ -18,7 +18,7 @@ genericSpecializations2.ts(16,23): error TS2322: Type 'null' is not assignable t ==== genericSpecializations2.ts (8 errors) ==== class IFoo { - foo(x: T): T { // no error on implementors because IFoo's T is different from foo's T + foo(x: T): T { // no error on implementers because IFoo's T is different from foo's T return null; ~~~~~~ !!! error TS2322: Type 'null' is not assignable to type 'T'. diff --git a/tests/baselines/reference/genericSpecializations2.js b/tests/baselines/reference/genericSpecializations2.js index 3e7a67203e72e..d550800d232bf 100644 --- a/tests/baselines/reference/genericSpecializations2.js +++ b/tests/baselines/reference/genericSpecializations2.js @@ -2,7 +2,7 @@ //// [genericSpecializations2.ts] class IFoo { - foo(x: T): T { // no error on implementors because IFoo's T is different from foo's T + foo(x: T): T { // no error on implementers because IFoo's T is different from foo's T return null; } } diff --git a/tests/baselines/reference/genericSpecializations2.symbols b/tests/baselines/reference/genericSpecializations2.symbols index b36fdb92bef28..9e295d10946f0 100644 --- a/tests/baselines/reference/genericSpecializations2.symbols +++ b/tests/baselines/reference/genericSpecializations2.symbols @@ -5,7 +5,7 @@ class IFoo { >IFoo : Symbol(IFoo, Decl(genericSpecializations2.ts, 0, 0)) >T : Symbol(T, Decl(genericSpecializations2.ts, 0, 11)) - foo(x: T): T { // no error on implementors because IFoo's T is different from foo's T + foo(x: T): T { // no error on implementers because IFoo's T is different from foo's T >foo : Symbol(IFoo.foo, Decl(genericSpecializations2.ts, 0, 15)) >T : Symbol(T, Decl(genericSpecializations2.ts, 1, 8)) >x : Symbol(x, Decl(genericSpecializations2.ts, 1, 11)) diff --git a/tests/baselines/reference/genericSpecializations2.types b/tests/baselines/reference/genericSpecializations2.types index 4010f9acb93ff..f98563d7c30c8 100644 --- a/tests/baselines/reference/genericSpecializations2.types +++ b/tests/baselines/reference/genericSpecializations2.types @@ -5,7 +5,7 @@ class IFoo { >IFoo : IFoo > : ^^^^^^^ - foo(x: T): T { // no error on implementors because IFoo's T is different from foo's T + foo(x: T): T { // no error on implementers because IFoo's T is different from foo's T >foo : (x: T) => T > : ^ ^^ ^^ ^^^^^ >x : T diff --git a/tests/baselines/reference/getOccurrencesReturn.baseline.jsonc b/tests/baselines/reference/getOccurrencesReturn.baseline.jsonc index 138aa54abf6c7..ce13760b3d191 100644 --- a/tests/baselines/reference/getOccurrencesReturn.baseline.jsonc +++ b/tests/baselines/reference/getOccurrencesReturn.baseline.jsonc @@ -10,7 +10,7 @@ // --- (line: 12) skipped --- // -// var unusued = [1, 2, 3, 4].map(x => { return 4 }) +// var unused = [1, 2, 3, 4].map(x => { return 4 }) // // [|{| kind: "none" |}return|]; // [|{| kind: "none" |}return|] true; @@ -30,7 +30,7 @@ // --- (line: 12) skipped --- // -// var unusued = [1, 2, 3, 4].map(x => { return 4 }) +// var unused = [1, 2, 3, 4].map(x => { return 4 }) // // /*HIGHLIGHTS*/[|{| kind: "none" |}return|]; // [|{| kind: "none" |}return|] true; @@ -50,7 +50,7 @@ // --- (line: 12) skipped --- // -// var unusued = [1, 2, 3, 4].map(x => { return 4 }) +// var unused = [1, 2, 3, 4].map(x => { return 4 }) // // [|{| kind: "none" |}return|]; // /*HIGHLIGHTS*/[|{| kind: "none" |}return|] true; diff --git a/tests/baselines/reference/getOccurrencesReturn3.baseline.jsonc b/tests/baselines/reference/getOccurrencesReturn3.baseline.jsonc index 1917f50bb9aca..04a51765ade3e 100644 --- a/tests/baselines/reference/getOccurrencesReturn3.baseline.jsonc +++ b/tests/baselines/reference/getOccurrencesReturn3.baseline.jsonc @@ -4,7 +4,7 @@ // })() || true; // } // -// var unusued = [1, 2, 3, 4].map(x => { /*HIGHLIGHTS*/[|{| kind: "none" |}return|] 4 }) +// var unused = [1, 2, 3, 4].map(x => { /*HIGHLIGHTS*/[|{| kind: "none" |}return|] 4 }) // // return; // return true; diff --git a/tests/baselines/reference/getOccurrencesReturn4.baseline.jsonc b/tests/baselines/reference/getOccurrencesReturn4.baseline.jsonc index 309cf9a6cb491..668104c6d212f 100644 --- a/tests/baselines/reference/getOccurrencesReturn4.baseline.jsonc +++ b/tests/baselines/reference/getOccurrencesReturn4.baseline.jsonc @@ -76,7 +76,7 @@ // })() || true; // } // -// var unusued = [1, 2, 3, 4].map(x => { [|{| kind: "none" |}return|]/*HIGHLIGHTS*/ 4 }) +// var unused = [1, 2, 3, 4].map(x => { [|{| kind: "none" |}return|]/*HIGHLIGHTS*/ 4 }) // // return; // return true; @@ -96,7 +96,7 @@ // --- (line: 12) skipped --- // -// var unusued = [1, 2, 3, 4].map(x => { return 4 }) +// var unused = [1, 2, 3, 4].map(x => { return 4 }) // // [|{| kind: "none" |}return|]/*HIGHLIGHTS*/; // [|{| kind: "none" |}return|] true; @@ -116,7 +116,7 @@ // --- (line: 12) skipped --- // -// var unusued = [1, 2, 3, 4].map(x => { return 4 }) +// var unused = [1, 2, 3, 4].map(x => { return 4 }) // // [|{| kind: "none" |}return|]; // [|{| kind: "none" |}return|]/*HIGHLIGHTS*/ true; diff --git a/tests/baselines/reference/getOccurrencesReturnBroken.baseline.jsonc b/tests/baselines/reference/getOccurrencesReturnBroken.baseline.jsonc index 638dcc807507d..13685aa4f1ed0 100644 --- a/tests/baselines/reference/getOccurrencesReturnBroken.baseline.jsonc +++ b/tests/baselines/reference/getOccurrencesReturnBroken.baseline.jsonc @@ -125,7 +125,7 @@ // --- (line: 14) skipped --- // -// var unusued = [1, 2, 3, 4].map(x => { return 4 }) +// var unused = [1, 2, 3, 4].map(x => { return 4 }) // // [|{| kind: "none" |}return|]; // [|{| kind: "none" |}return|] true; diff --git a/tests/baselines/reference/getOccurrencesSwitchCaseDefaultBroken.baseline.jsonc b/tests/baselines/reference/getOccurrencesSwitchCaseDefaultBroken.baseline.jsonc index c3aefffd2761b..d0355421c5eb3 100644 --- a/tests/baselines/reference/getOccurrencesSwitchCaseDefaultBroken.baseline.jsonc +++ b/tests/baselines/reference/getOccurrencesSwitchCaseDefaultBroken.baseline.jsonc @@ -6,7 +6,7 @@ // [|{| kind: "none" |}case|] 4: // [|{| kind: "none" |}case|] 8: // [|{| kind: "none" |}case|] 0xBEEF: -// defult: +// default: // [|{| kind: "none" |}break|]; // cas 16: // [|{| kind: "none" |}case|] 12: @@ -25,7 +25,7 @@ // [|{| kind: "none" |}c/*HIGHLIGHTS*/ase|] 4: // [|{| kind: "none" |}case|] 8: // [|{| kind: "none" |}case|] 0xBEEF: -// defult: +// default: // [|{| kind: "none" |}break|]; // cas 16: // [|{| kind: "none" |}case|] 12: @@ -55,7 +55,7 @@ // === /tests/cases/fourslash/getOccurrencesSwitchCaseDefaultBroken.ts === // --- (line: 5) skipped --- // case 0xBEEF: -// defult: +// default: // break; // /*HIGHLIGHTS*/cas 16: // case 12: @@ -73,7 +73,7 @@ // [|{| kind: "none" |}case|] 4: // [|{| kind: "none" |}case|] 8: // [|{| kind: "none" |}case|] 0xBEEF: -// defult: +// default: // [|{| kind: "none" |}break|]; // cas 16: // [|{| kind: "none" |}c/*HIGHLIGHTS*/ase|] 12: diff --git a/tests/baselines/reference/getOccurrencesThrow.baseline.jsonc b/tests/baselines/reference/getOccurrencesThrow.baseline.jsonc index 9ea4cb15b7ad7..fa75ab476d71b 100644 --- a/tests/baselines/reference/getOccurrencesThrow.baseline.jsonc +++ b/tests/baselines/reference/getOccurrencesThrow.baseline.jsonc @@ -29,7 +29,7 @@ // // [|{| kind: "none" |}throw|] 10; // -// var unusued = [1, 2, 3, 4].map(x => { throw 4 }) +// var unused = [1, 2, 3, 4].map(x => { throw 4 }) // // [|{| kind: "none" |}return|]; // [|{| kind: "none" |}return|] true; @@ -69,7 +69,7 @@ // // [|{| kind: "none" |}throw|] 10; // -// var unusued = [1, 2, 3, 4].map(x => { throw 4 }) +// var unused = [1, 2, 3, 4].map(x => { throw 4 }) // // [|{| kind: "none" |}return|]; // [|{| kind: "none" |}return|] true; @@ -109,7 +109,7 @@ // // [|{| kind: "none" |}throw|] 10; // -// var unusued = [1, 2, 3, 4].map(x => { throw 4 }) +// var unused = [1, 2, 3, 4].map(x => { throw 4 }) // // [|{| kind: "none" |}return|]; // [|{| kind: "none" |}return|] true; @@ -149,7 +149,7 @@ // // [|{| kind: "none" |}throw|] 10; // -// var unusued = [1, 2, 3, 4].map(x => { throw 4 }) +// var unused = [1, 2, 3, 4].map(x => { throw 4 }) // // [|{| kind: "none" |}return|]; // [|{| kind: "none" |}return|] true; @@ -189,7 +189,7 @@ // // /*HIGHLIGHTS*/[|{| kind: "none" |}throw|] 10; // -// var unusued = [1, 2, 3, 4].map(x => { throw 4 }) +// var unused = [1, 2, 3, 4].map(x => { throw 4 }) // // [|{| kind: "none" |}return|]; // [|{| kind: "none" |}return|] true; @@ -229,7 +229,7 @@ // // [|{| kind: "none" |}throw|] 10; // -// var unusued = [1, 2, 3, 4].map(x => { throw 4 }) +// var unused = [1, 2, 3, 4].map(x => { throw 4 }) // // /*HIGHLIGHTS*/[|{| kind: "none" |}return|]; // [|{| kind: "none" |}return|] true; @@ -269,7 +269,7 @@ // // [|{| kind: "none" |}throw|] 10; // -// var unusued = [1, 2, 3, 4].map(x => { throw 4 }) +// var unused = [1, 2, 3, 4].map(x => { throw 4 }) // // [|{| kind: "none" |}return|]; // /*HIGHLIGHTS*/[|{| kind: "none" |}return|] true; @@ -309,7 +309,7 @@ // // [|{| kind: "none" |}throw|] 10; // -// var unusued = [1, 2, 3, 4].map(x => { throw 4 }) +// var unused = [1, 2, 3, 4].map(x => { throw 4 }) // // [|{| kind: "none" |}return|]; // [|{| kind: "none" |}return|] true; diff --git a/tests/baselines/reference/getOccurrencesThrow5.baseline.jsonc b/tests/baselines/reference/getOccurrencesThrow5.baseline.jsonc index d02d0668bf101..faac1df89da35 100644 --- a/tests/baselines/reference/getOccurrencesThrow5.baseline.jsonc +++ b/tests/baselines/reference/getOccurrencesThrow5.baseline.jsonc @@ -4,7 +4,7 @@ // // throw 10; // -// var unusued = [1, 2, 3, 4].map(x => { /*HIGHLIGHTS*/[|{| kind: "none" |}throw|] 4 }) +// var unused = [1, 2, 3, 4].map(x => { /*HIGHLIGHTS*/[|{| kind: "none" |}throw|] 4 }) // // return; // return true; diff --git a/tests/baselines/reference/goToDefinitionAlias.baseline.jsonc b/tests/baselines/reference/goToDefinitionAlias.baseline.jsonc index a3df24cf32b7c..6143f099c25bf 100644 --- a/tests/baselines/reference/goToDefinitionAlias.baseline.jsonc +++ b/tests/baselines/reference/goToDefinitionAlias.baseline.jsonc @@ -9,7 +9,7 @@ // var t1: /*GOTO DEF*/alias1.IFoo; // var t2: Module.alias2.IFoo; // -// // Value posistion +// // Value position // var v1 = new alias1.Foo(); // var v2 = new Module.alias2.Foo(); @@ -39,7 +39,7 @@ // var t1: alias1.IFoo; // var t2: Module.alias2.IFoo; // -// // Value posistion +// // Value position // var v1 = new /*GOTO DEF*/alias1.Foo(); // var v2 = new Module.alias2.Foo(); @@ -69,7 +69,7 @@ // var t1: alias1.IFoo; // var t2: Module./*GOTO DEF*/alias2.IFoo; // -// // Value posistion +// // Value position // var v1 = new alias1.Foo(); // var v2 = new Module.alias2.Foo(); @@ -99,7 +99,7 @@ // var t1: alias1.IFoo; // var t2: Module.alias2.IFoo; // -// // Value posistion +// // Value position // var v1 = new alias1.Foo(); // var v2 = new Module./*GOTO DEF*/alias2.Foo(); diff --git a/tests/baselines/reference/goToDefinitionMultipleDefinitions.baseline.jsonc b/tests/baselines/reference/goToDefinitionMultipleDefinitions.baseline.jsonc index 7e5d13994c0e5..14d4b105d792b 100644 --- a/tests/baselines/reference/goToDefinitionMultipleDefinitions.baseline.jsonc +++ b/tests/baselines/reference/goToDefinitionMultipleDefinitions.baseline.jsonc @@ -63,7 +63,7 @@ // }|> // === /tests/cases/fourslash/e.ts === -// [|Modul/*GOTO DEF*/e|]; +// [|Module/*GOTO DEF*/e|]; // === Details === [ diff --git a/tests/baselines/reference/goToDefinitionRest.baseline.jsonc b/tests/baselines/reference/goToDefinitionRest.baseline.jsonc index 68f0909365181..4eb7eeef281b4 100644 --- a/tests/baselines/reference/goToDefinitionRest.baseline.jsonc +++ b/tests/baselines/reference/goToDefinitionRest.baseline.jsonc @@ -3,7 +3,7 @@ // interface Gen { // x: number; // <|[|parent|]: Gen;|> -// millenial: string; +// millennial: string; // } // let t: Gen; // var { x, ...rest } = t; diff --git a/tests/baselines/reference/goToTypeDefinition_arrayType.baseline.jsonc b/tests/baselines/reference/goToTypeDefinition_arrayType.baseline.jsonc index 0330ae276a185..f9d8df244a8ac 100644 --- a/tests/baselines/reference/goToTypeDefinition_arrayType.baseline.jsonc +++ b/tests/baselines/reference/goToTypeDefinition_arrayType.baseline.jsonc @@ -88,7 +88,7 @@ // * Removes elements from an array and, if necessary, inserts new elements in their place, returning the deleted elements. // * @param start The zero-based location in the array from which to start removing elements. // * @param deleteCount The number of elements to remove. Omitting this argument will remove all elements from the start -// * paramater location to end of the array. If value of this argument is either a negative number, zero, undefined, or a type +// * parameter location to end of the array. If value of this argument is either a negative number, zero, undefined, or a type // * that cannot be converted to an integer, the function will evaluate the argument as zero and not remove any elements. // * @returns An array containing the elements that were deleted. // */ @@ -345,7 +345,7 @@ // * Removes elements from an array and, if necessary, inserts new elements in their place, returning the deleted elements. // * @param start The zero-based location in the array from which to start removing elements. // * @param deleteCount The number of elements to remove. Omitting this argument will remove all elements from the start -// * paramater location to end of the array. If value of this argument is either a negative number, zero, undefined, or a type +// * parameter location to end of the array. If value of this argument is either a negative number, zero, undefined, or a type // * that cannot be converted to an integer, the function will evaluate the argument as zero and not remove any elements. // * @returns An array containing the elements that were deleted. // */ diff --git a/tests/baselines/reference/implicitAnyInAmbientDeclaration2.d.errors.txt b/tests/baselines/reference/implicitAnyInAmbientDeclaration2.d.errors.txt index e15f3185ff0a6..0406e450b5316 100644 --- a/tests/baselines/reference/implicitAnyInAmbientDeclaration2.d.errors.txt +++ b/tests/baselines/reference/implicitAnyInAmbientDeclaration2.d.errors.txt @@ -13,7 +13,7 @@ implicitAnyInAmbientDeclaration2.d.ts(13,24): error TS7006: Parameter 'publicCon !!! error TS7010: 'foo', which lacks return-type annotation, implicitly has an 'any' return type. ~ !!! error TS7006: Parameter 'x' implicitly has an 'any' type. - declare var bar; // this should be be an erro + declare var bar; // this should be be an error ~~~ !!! error TS7005: Variable 'bar' implicitly has an 'any' type. declare class C { diff --git a/tests/baselines/reference/implicitAnyInAmbientDeclaration2.d.symbols b/tests/baselines/reference/implicitAnyInAmbientDeclaration2.d.symbols index e3e122f56106c..8b11bfdb49f04 100644 --- a/tests/baselines/reference/implicitAnyInAmbientDeclaration2.d.symbols +++ b/tests/baselines/reference/implicitAnyInAmbientDeclaration2.d.symbols @@ -5,7 +5,7 @@ declare function foo(x); // this should be an error >foo : Symbol(foo, Decl(implicitAnyInAmbientDeclaration2.d.ts, 0, 0)) >x : Symbol(x, Decl(implicitAnyInAmbientDeclaration2.d.ts, 0, 21)) -declare var bar; // this should be be an erro +declare var bar; // this should be be an error >bar : Symbol(bar, Decl(implicitAnyInAmbientDeclaration2.d.ts, 1, 11)) declare class C { diff --git a/tests/baselines/reference/implicitAnyInAmbientDeclaration2.d.types b/tests/baselines/reference/implicitAnyInAmbientDeclaration2.d.types index cf8ce6fa80e07..0eedbd79a4b01 100644 --- a/tests/baselines/reference/implicitAnyInAmbientDeclaration2.d.types +++ b/tests/baselines/reference/implicitAnyInAmbientDeclaration2.d.types @@ -7,7 +7,7 @@ declare function foo(x); // this should be an error >x : any > : ^^^ -declare var bar; // this should be be an erro +declare var bar; // this should be be an error >bar : any > : ^^^ diff --git a/tests/baselines/reference/importCallExpressionAsyncES5AMD(target=es5).js b/tests/baselines/reference/importCallExpressionAsyncES5AMD(target=es5).js index f5080bd001cf7..8dad145893fe1 100644 --- a/tests/baselines/reference/importCallExpressionAsyncES5AMD(target=es5).js +++ b/tests/baselines/reference/importCallExpressionAsyncES5AMD(target=es5).js @@ -74,7 +74,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge }); }; var __generator = (this && this.__generator) || function (thisArg, body) { - var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); + var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, tries: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; function verb(n) { return function (v) { return step([n, v]); }; } function step(op) { @@ -86,14 +86,14 @@ var __generator = (this && this.__generator) || function (thisArg, body) { case 0: case 1: t = op; break; case 4: _.label++; return { value: op[1], done: false }; case 5: _.label++; y = op[1]; op = [0]; continue; - case 7: op = _.ops.pop(); _.trys.pop(); continue; + case 7: op = _.ops.pop(); _.tries.pop(); continue; default: - if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } + if (!(t = _.tries, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } if (t[2]) _.ops.pop(); - _.trys.pop(); continue; + _.tries.pop(); continue; } op = body.call(thisArg, _); } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } diff --git a/tests/baselines/reference/importCallExpressionAsyncES5CJS(target=es5).js b/tests/baselines/reference/importCallExpressionAsyncES5CJS(target=es5).js index d4709a9e0c997..26954e925638c 100644 --- a/tests/baselines/reference/importCallExpressionAsyncES5CJS(target=es5).js +++ b/tests/baselines/reference/importCallExpressionAsyncES5CJS(target=es5).js @@ -75,7 +75,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge }); }; var __generator = (this && this.__generator) || function (thisArg, body) { - var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); + var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, tries: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; function verb(n) { return function (v) { return step([n, v]); }; } function step(op) { @@ -87,14 +87,14 @@ var __generator = (this && this.__generator) || function (thisArg, body) { case 0: case 1: t = op; break; case 4: _.label++; return { value: op[1], done: false }; case 5: _.label++; y = op[1]; op = [0]; continue; - case 7: op = _.ops.pop(); _.trys.pop(); continue; + case 7: op = _.ops.pop(); _.tries.pop(); continue; default: - if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } + if (!(t = _.tries, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } if (t[2]) _.ops.pop(); - _.trys.pop(); continue; + _.tries.pop(); continue; } op = body.call(thisArg, _); } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } diff --git a/tests/baselines/reference/importCallExpressionAsyncES5System(target=es5).js b/tests/baselines/reference/importCallExpressionAsyncES5System(target=es5).js index 352be31696e94..052acc6404453 100644 --- a/tests/baselines/reference/importCallExpressionAsyncES5System(target=es5).js +++ b/tests/baselines/reference/importCallExpressionAsyncES5System(target=es5).js @@ -43,7 +43,7 @@ System.register([], function (exports_1, context_1) { }); }; var __generator = (this && this.__generator) || function (thisArg, body) { - var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); + var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, tries: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; function verb(n) { return function (v) { return step([n, v]); }; } function step(op) { @@ -55,14 +55,14 @@ System.register([], function (exports_1, context_1) { case 0: case 1: t = op; break; case 4: _.label++; return { value: op[1], done: false }; case 5: _.label++; y = op[1]; op = [0]; continue; - case 7: op = _.ops.pop(); _.trys.pop(); continue; + case 7: op = _.ops.pop(); _.tries.pop(); continue; default: - if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } + if (!(t = _.tries, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } if (t[2]) _.ops.pop(); - _.trys.pop(); continue; + _.tries.pop(); continue; } op = body.call(thisArg, _); } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } diff --git a/tests/baselines/reference/importCallExpressionAsyncES5UMD(target=es5).js b/tests/baselines/reference/importCallExpressionAsyncES5UMD(target=es5).js index f3a87b1619c3d..6085a156ad5ed 100644 --- a/tests/baselines/reference/importCallExpressionAsyncES5UMD(target=es5).js +++ b/tests/baselines/reference/importCallExpressionAsyncES5UMD(target=es5).js @@ -74,7 +74,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge }); }; var __generator = (this && this.__generator) || function (thisArg, body) { - var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); + var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, tries: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; function verb(n) { return function (v) { return step([n, v]); }; } function step(op) { @@ -86,14 +86,14 @@ var __generator = (this && this.__generator) || function (thisArg, body) { case 0: case 1: t = op; break; case 4: _.label++; return { value: op[1], done: false }; case 5: _.label++; y = op[1]; op = [0]; continue; - case 7: op = _.ops.pop(); _.trys.pop(); continue; + case 7: op = _.ops.pop(); _.tries.pop(); continue; default: - if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } + if (!(t = _.tries, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } if (t[2]) _.ops.pop(); - _.trys.pop(); continue; + _.tries.pop(); continue; } op = body.call(thisArg, _); } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } diff --git a/tests/baselines/reference/importCallExpressionNestedAMD2(target=es5).js b/tests/baselines/reference/importCallExpressionNestedAMD2(target=es5).js index 4233883352412..a657249980840 100644 --- a/tests/baselines/reference/importCallExpressionNestedAMD2(target=es5).js +++ b/tests/baselines/reference/importCallExpressionNestedAMD2(target=es5).js @@ -58,7 +58,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge }); }; var __generator = (this && this.__generator) || function (thisArg, body) { - var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); + var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, tries: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; function verb(n) { return function (v) { return step([n, v]); }; } function step(op) { @@ -70,14 +70,14 @@ var __generator = (this && this.__generator) || function (thisArg, body) { case 0: case 1: t = op; break; case 4: _.label++; return { value: op[1], done: false }; case 5: _.label++; y = op[1]; op = [0]; continue; - case 7: op = _.ops.pop(); _.trys.pop(); continue; + case 7: op = _.ops.pop(); _.tries.pop(); continue; default: - if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } + if (!(t = _.tries, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } if (t[2]) _.ops.pop(); - _.trys.pop(); continue; + _.tries.pop(); continue; } op = body.call(thisArg, _); } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } diff --git a/tests/baselines/reference/importCallExpressionNestedCJS2(target=es5).js b/tests/baselines/reference/importCallExpressionNestedCJS2(target=es5).js index e6597f3467482..1d18275e35bb3 100644 --- a/tests/baselines/reference/importCallExpressionNestedCJS2(target=es5).js +++ b/tests/baselines/reference/importCallExpressionNestedCJS2(target=es5).js @@ -57,7 +57,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge }); }; var __generator = (this && this.__generator) || function (thisArg, body) { - var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); + var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, tries: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; function verb(n) { return function (v) { return step([n, v]); }; } function step(op) { @@ -69,14 +69,14 @@ var __generator = (this && this.__generator) || function (thisArg, body) { case 0: case 1: t = op; break; case 4: _.label++; return { value: op[1], done: false }; case 5: _.label++; y = op[1]; op = [0]; continue; - case 7: op = _.ops.pop(); _.trys.pop(); continue; + case 7: op = _.ops.pop(); _.tries.pop(); continue; default: - if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } + if (!(t = _.tries, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } if (t[2]) _.ops.pop(); - _.trys.pop(); continue; + _.tries.pop(); continue; } op = body.call(thisArg, _); } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } diff --git a/tests/baselines/reference/importCallExpressionNestedES20152(target=es5).js b/tests/baselines/reference/importCallExpressionNestedES20152(target=es5).js index 0993ae6f7b17e..034450a86330e 100644 --- a/tests/baselines/reference/importCallExpressionNestedES20152(target=es5).js +++ b/tests/baselines/reference/importCallExpressionNestedES20152(target=es5).js @@ -22,7 +22,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge }); }; var __generator = (this && this.__generator) || function (thisArg, body) { - var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); + var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, tries: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; function verb(n) { return function (v) { return step([n, v]); }; } function step(op) { @@ -34,14 +34,14 @@ var __generator = (this && this.__generator) || function (thisArg, body) { case 0: case 1: t = op; break; case 4: _.label++; return { value: op[1], done: false }; case 5: _.label++; y = op[1]; op = [0]; continue; - case 7: op = _.ops.pop(); _.trys.pop(); continue; + case 7: op = _.ops.pop(); _.tries.pop(); continue; default: - if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } + if (!(t = _.tries, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } if (t[2]) _.ops.pop(); - _.trys.pop(); continue; + _.tries.pop(); continue; } op = body.call(thisArg, _); } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } diff --git a/tests/baselines/reference/importCallExpressionNestedES20202(target=es5).js b/tests/baselines/reference/importCallExpressionNestedES20202(target=es5).js index 132484ba7ee27..62a1a1c35fa03 100644 --- a/tests/baselines/reference/importCallExpressionNestedES20202(target=es5).js +++ b/tests/baselines/reference/importCallExpressionNestedES20202(target=es5).js @@ -23,7 +23,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge }); }; var __generator = (this && this.__generator) || function (thisArg, body) { - var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); + var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, tries: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; function verb(n) { return function (v) { return step([n, v]); }; } function step(op) { @@ -35,14 +35,14 @@ var __generator = (this && this.__generator) || function (thisArg, body) { case 0: case 1: t = op; break; case 4: _.label++; return { value: op[1], done: false }; case 5: _.label++; y = op[1]; op = [0]; continue; - case 7: op = _.ops.pop(); _.trys.pop(); continue; + case 7: op = _.ops.pop(); _.tries.pop(); continue; default: - if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } + if (!(t = _.tries, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } if (t[2]) _.ops.pop(); - _.trys.pop(); continue; + _.tries.pop(); continue; } op = body.call(thisArg, _); } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } diff --git a/tests/baselines/reference/importCallExpressionNestedSystem2(target=es5).js b/tests/baselines/reference/importCallExpressionNestedSystem2(target=es5).js index 3ed469c696e07..75121e4b67f2d 100644 --- a/tests/baselines/reference/importCallExpressionNestedSystem2(target=es5).js +++ b/tests/baselines/reference/importCallExpressionNestedSystem2(target=es5).js @@ -32,7 +32,7 @@ System.register([], function (exports_1, context_1) { }); }; var __generator = (this && this.__generator) || function (thisArg, body) { - var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); + var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, tries: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; function verb(n) { return function (v) { return step([n, v]); }; } function step(op) { @@ -44,14 +44,14 @@ System.register([], function (exports_1, context_1) { case 0: case 1: t = op; break; case 4: _.label++; return { value: op[1], done: false }; case 5: _.label++; y = op[1]; op = [0]; continue; - case 7: op = _.ops.pop(); _.trys.pop(); continue; + case 7: op = _.ops.pop(); _.tries.pop(); continue; default: - if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } + if (!(t = _.tries, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } if (t[2]) _.ops.pop(); - _.trys.pop(); continue; + _.tries.pop(); continue; } op = body.call(thisArg, _); } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } diff --git a/tests/baselines/reference/importCallExpressionNestedUMD2(target=es5).js b/tests/baselines/reference/importCallExpressionNestedUMD2(target=es5).js index 38d7d108c974e..13c17a5a2ea4a 100644 --- a/tests/baselines/reference/importCallExpressionNestedUMD2(target=es5).js +++ b/tests/baselines/reference/importCallExpressionNestedUMD2(target=es5).js @@ -66,7 +66,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge }); }; var __generator = (this && this.__generator) || function (thisArg, body) { - var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); + var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, tries: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; function verb(n) { return function (v) { return step([n, v]); }; } function step(op) { @@ -78,14 +78,14 @@ var __generator = (this && this.__generator) || function (thisArg, body) { case 0: case 1: t = op; break; case 4: _.label++; return { value: op[1], done: false }; case 5: _.label++; y = op[1]; op = [0]; continue; - case 7: op = _.ops.pop(); _.trys.pop(); continue; + case 7: op = _.ops.pop(); _.tries.pop(); continue; default: - if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } + if (!(t = _.tries, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } if (t[2]) _.ops.pop(); - _.trys.pop(); continue; + _.tries.pop(); continue; } op = body.call(thisArg, _); } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } diff --git a/tests/baselines/reference/importDeferComments.errors.txt b/tests/baselines/reference/importDeferComments.errors.txt index 56b486f8344d7..2452c6420b8b0 100644 --- a/tests/baselines/reference/importDeferComments.errors.txt +++ b/tests/baselines/reference/importDeferComments.errors.txt @@ -5,7 +5,7 @@ b.ts(1,70): error TS2307: Cannot find module 'a' or its corresponding type decla export {}; ==== b.ts (1 errors) ==== - /*1*/ import /*2*/ defer /*3*/ * /*4*/ as /*5*/ aNs /*6*/ from /*7*/ "a" /*8*/; + /*1*/ import /*2*/ defer /*3*/ * /*4*/ as /*5*/ and /*6*/ from /*7*/ "a" /*8*/; ~~~ !!! error TS2307: Cannot find module 'a' or its corresponding type declarations. \ No newline at end of file diff --git a/tests/baselines/reference/importDeferComments.js b/tests/baselines/reference/importDeferComments.js index 3e7980dbc1665..33b6a8718010c 100644 --- a/tests/baselines/reference/importDeferComments.js +++ b/tests/baselines/reference/importDeferComments.js @@ -4,7 +4,7 @@ export {}; //// [b.ts] -/*1*/ import /*2*/ defer /*3*/ * /*4*/ as /*5*/ aNs /*6*/ from /*7*/ "a" /*8*/; +/*1*/ import /*2*/ defer /*3*/ * /*4*/ as /*5*/ and /*6*/ from /*7*/ "a" /*8*/; //// [a.js] diff --git a/tests/baselines/reference/importDeferComments.symbols b/tests/baselines/reference/importDeferComments.symbols index fec1187392018..bfacb82c307cf 100644 --- a/tests/baselines/reference/importDeferComments.symbols +++ b/tests/baselines/reference/importDeferComments.symbols @@ -5,6 +5,6 @@ export {}; === b.ts === -/*1*/ import /*2*/ defer /*3*/ * /*4*/ as /*5*/ aNs /*6*/ from /*7*/ "a" /*8*/; ->aNs : Symbol(aNs, Decl(b.ts, 0, 24)) +/*1*/ import /*2*/ defer /*3*/ * /*4*/ as /*5*/ and /*6*/ from /*7*/ "a" /*8*/; +>and : Symbol(and, Decl(b.ts, 0, 24)) diff --git a/tests/baselines/reference/importDeferComments.types b/tests/baselines/reference/importDeferComments.types index 36fb5b224a91a..1ac19026b7c0d 100644 --- a/tests/baselines/reference/importDeferComments.types +++ b/tests/baselines/reference/importDeferComments.types @@ -5,7 +5,7 @@ export {}; === b.ts === -/*1*/ import /*2*/ defer /*3*/ * /*4*/ as /*5*/ aNs /*6*/ from /*7*/ "a" /*8*/; ->aNs : any +/*1*/ import /*2*/ defer /*3*/ * /*4*/ as /*5*/ and /*6*/ from /*7*/ "a" /*8*/; +>and : any > : ^^^ diff --git a/tests/baselines/reference/importDeferNamespace(module=commonjs).errors.txt b/tests/baselines/reference/importDeferNamespace(module=commonjs).errors.txt index 74c011b13a035..bee8cefb7238b 100644 --- a/tests/baselines/reference/importDeferNamespace(module=commonjs).errors.txt +++ b/tests/baselines/reference/importDeferNamespace(module=commonjs).errors.txt @@ -7,8 +7,8 @@ b.ts(1,8): error TS18060: Deferred imports are only supported when the '--module } ==== b.ts (1 errors) ==== - import defer * as aNs from "./a.js"; + import defer * as and from "./a.js"; ~~~~~~~~~~~~~~ !!! error TS18060: Deferred imports are only supported when the '--module' flag is set to 'esnext' or 'preserve'. - aNs.foo(); \ No newline at end of file + and.foo(); \ No newline at end of file diff --git a/tests/baselines/reference/importDeferNamespace(module=commonjs).js b/tests/baselines/reference/importDeferNamespace(module=commonjs).js index 95cd4ac60d5dd..a87dcf988b812 100644 --- a/tests/baselines/reference/importDeferNamespace(module=commonjs).js +++ b/tests/baselines/reference/importDeferNamespace(module=commonjs).js @@ -6,9 +6,9 @@ export function foo() { } //// [b.ts] -import defer * as aNs from "./a.js"; +import defer * as and from "./a.js"; -aNs.foo(); +and.foo(); //// [a.js] "use strict"; @@ -53,5 +53,5 @@ var __importStar = (this && this.__importStar) || (function () { }; })(); Object.defineProperty(exports, "__esModule", { value: true }); -const aNs = __importStar(require("./a.js")); -aNs.foo(); +const and = __importStar(require("./a.js")); +and.foo(); diff --git a/tests/baselines/reference/importDeferNamespace(module=commonjs).symbols b/tests/baselines/reference/importDeferNamespace(module=commonjs).symbols index eca0a04a77633..711f4fd5ca46f 100644 --- a/tests/baselines/reference/importDeferNamespace(module=commonjs).symbols +++ b/tests/baselines/reference/importDeferNamespace(module=commonjs).symbols @@ -11,11 +11,11 @@ export function foo() { } === b.ts === -import defer * as aNs from "./a.js"; ->aNs : Symbol(aNs, Decl(b.ts, 0, 12)) +import defer * as and from "./a.js"; +>and : Symbol(and, Decl(b.ts, 0, 12)) -aNs.foo(); ->aNs.foo : Symbol(aNs.foo, Decl(a.ts, 0, 0)) ->aNs : Symbol(aNs, Decl(b.ts, 0, 12)) ->foo : Symbol(aNs.foo, Decl(a.ts, 0, 0)) +and.foo(); +>and.foo : Symbol(and.foo, Decl(a.ts, 0, 0)) +>and : Symbol(and, Decl(b.ts, 0, 12)) +>foo : Symbol(and.foo, Decl(a.ts, 0, 0)) diff --git a/tests/baselines/reference/importDeferNamespace(module=commonjs).types b/tests/baselines/reference/importDeferNamespace(module=commonjs).types index 3f99c7848a284..574aa460bc623 100644 --- a/tests/baselines/reference/importDeferNamespace(module=commonjs).types +++ b/tests/baselines/reference/importDeferNamespace(module=commonjs).types @@ -19,16 +19,16 @@ export function foo() { } === b.ts === -import defer * as aNs from "./a.js"; ->aNs : typeof aNs +import defer * as and from "./a.js"; +>and : typeof and > : ^^^^^^^^^^ -aNs.foo(); ->aNs.foo() : void +and.foo(); +>and.foo() : void > : ^^^^ ->aNs.foo : () => void +>and.foo : () => void > : ^^^^^^^^^^ ->aNs : typeof aNs +>and : typeof and > : ^^^^^^^^^^ >foo : () => void > : ^^^^^^^^^^ diff --git a/tests/baselines/reference/importDeferNamespace(module=es2015).errors.txt b/tests/baselines/reference/importDeferNamespace(module=es2015).errors.txt index 74c011b13a035..bee8cefb7238b 100644 --- a/tests/baselines/reference/importDeferNamespace(module=es2015).errors.txt +++ b/tests/baselines/reference/importDeferNamespace(module=es2015).errors.txt @@ -7,8 +7,8 @@ b.ts(1,8): error TS18060: Deferred imports are only supported when the '--module } ==== b.ts (1 errors) ==== - import defer * as aNs from "./a.js"; + import defer * as and from "./a.js"; ~~~~~~~~~~~~~~ !!! error TS18060: Deferred imports are only supported when the '--module' flag is set to 'esnext' or 'preserve'. - aNs.foo(); \ No newline at end of file + and.foo(); \ No newline at end of file diff --git a/tests/baselines/reference/importDeferNamespace(module=es2015).js b/tests/baselines/reference/importDeferNamespace(module=es2015).js index 29d60657fd306..ebd02a7857718 100644 --- a/tests/baselines/reference/importDeferNamespace(module=es2015).js +++ b/tests/baselines/reference/importDeferNamespace(module=es2015).js @@ -6,14 +6,14 @@ export function foo() { } //// [b.ts] -import defer * as aNs from "./a.js"; +import defer * as and from "./a.js"; -aNs.foo(); +and.foo(); //// [a.js] export function foo() { console.log("foo from a"); } //// [b.js] -import defer * as aNs from "./a.js"; -aNs.foo(); +import defer * as and from "./a.js"; +and.foo(); diff --git a/tests/baselines/reference/importDeferNamespace(module=es2015).symbols b/tests/baselines/reference/importDeferNamespace(module=es2015).symbols index eca0a04a77633..711f4fd5ca46f 100644 --- a/tests/baselines/reference/importDeferNamespace(module=es2015).symbols +++ b/tests/baselines/reference/importDeferNamespace(module=es2015).symbols @@ -11,11 +11,11 @@ export function foo() { } === b.ts === -import defer * as aNs from "./a.js"; ->aNs : Symbol(aNs, Decl(b.ts, 0, 12)) +import defer * as and from "./a.js"; +>and : Symbol(and, Decl(b.ts, 0, 12)) -aNs.foo(); ->aNs.foo : Symbol(aNs.foo, Decl(a.ts, 0, 0)) ->aNs : Symbol(aNs, Decl(b.ts, 0, 12)) ->foo : Symbol(aNs.foo, Decl(a.ts, 0, 0)) +and.foo(); +>and.foo : Symbol(and.foo, Decl(a.ts, 0, 0)) +>and : Symbol(and, Decl(b.ts, 0, 12)) +>foo : Symbol(and.foo, Decl(a.ts, 0, 0)) diff --git a/tests/baselines/reference/importDeferNamespace(module=es2015).types b/tests/baselines/reference/importDeferNamespace(module=es2015).types index 3f99c7848a284..574aa460bc623 100644 --- a/tests/baselines/reference/importDeferNamespace(module=es2015).types +++ b/tests/baselines/reference/importDeferNamespace(module=es2015).types @@ -19,16 +19,16 @@ export function foo() { } === b.ts === -import defer * as aNs from "./a.js"; ->aNs : typeof aNs +import defer * as and from "./a.js"; +>and : typeof and > : ^^^^^^^^^^ -aNs.foo(); ->aNs.foo() : void +and.foo(); +>and.foo() : void > : ^^^^ ->aNs.foo : () => void +>and.foo : () => void > : ^^^^^^^^^^ ->aNs : typeof aNs +>and : typeof and > : ^^^^^^^^^^ >foo : () => void > : ^^^^^^^^^^ diff --git a/tests/baselines/reference/importDeferNamespace(module=es2020).errors.txt b/tests/baselines/reference/importDeferNamespace(module=es2020).errors.txt index 74c011b13a035..bee8cefb7238b 100644 --- a/tests/baselines/reference/importDeferNamespace(module=es2020).errors.txt +++ b/tests/baselines/reference/importDeferNamespace(module=es2020).errors.txt @@ -7,8 +7,8 @@ b.ts(1,8): error TS18060: Deferred imports are only supported when the '--module } ==== b.ts (1 errors) ==== - import defer * as aNs from "./a.js"; + import defer * as and from "./a.js"; ~~~~~~~~~~~~~~ !!! error TS18060: Deferred imports are only supported when the '--module' flag is set to 'esnext' or 'preserve'. - aNs.foo(); \ No newline at end of file + and.foo(); \ No newline at end of file diff --git a/tests/baselines/reference/importDeferNamespace(module=es2020).js b/tests/baselines/reference/importDeferNamespace(module=es2020).js index 29d60657fd306..ebd02a7857718 100644 --- a/tests/baselines/reference/importDeferNamespace(module=es2020).js +++ b/tests/baselines/reference/importDeferNamespace(module=es2020).js @@ -6,14 +6,14 @@ export function foo() { } //// [b.ts] -import defer * as aNs from "./a.js"; +import defer * as and from "./a.js"; -aNs.foo(); +and.foo(); //// [a.js] export function foo() { console.log("foo from a"); } //// [b.js] -import defer * as aNs from "./a.js"; -aNs.foo(); +import defer * as and from "./a.js"; +and.foo(); diff --git a/tests/baselines/reference/importDeferNamespace(module=es2020).symbols b/tests/baselines/reference/importDeferNamespace(module=es2020).symbols index eca0a04a77633..711f4fd5ca46f 100644 --- a/tests/baselines/reference/importDeferNamespace(module=es2020).symbols +++ b/tests/baselines/reference/importDeferNamespace(module=es2020).symbols @@ -11,11 +11,11 @@ export function foo() { } === b.ts === -import defer * as aNs from "./a.js"; ->aNs : Symbol(aNs, Decl(b.ts, 0, 12)) +import defer * as and from "./a.js"; +>and : Symbol(and, Decl(b.ts, 0, 12)) -aNs.foo(); ->aNs.foo : Symbol(aNs.foo, Decl(a.ts, 0, 0)) ->aNs : Symbol(aNs, Decl(b.ts, 0, 12)) ->foo : Symbol(aNs.foo, Decl(a.ts, 0, 0)) +and.foo(); +>and.foo : Symbol(and.foo, Decl(a.ts, 0, 0)) +>and : Symbol(and, Decl(b.ts, 0, 12)) +>foo : Symbol(and.foo, Decl(a.ts, 0, 0)) diff --git a/tests/baselines/reference/importDeferNamespace(module=es2020).types b/tests/baselines/reference/importDeferNamespace(module=es2020).types index 3f99c7848a284..574aa460bc623 100644 --- a/tests/baselines/reference/importDeferNamespace(module=es2020).types +++ b/tests/baselines/reference/importDeferNamespace(module=es2020).types @@ -19,16 +19,16 @@ export function foo() { } === b.ts === -import defer * as aNs from "./a.js"; ->aNs : typeof aNs +import defer * as and from "./a.js"; +>and : typeof and > : ^^^^^^^^^^ -aNs.foo(); ->aNs.foo() : void +and.foo(); +>and.foo() : void > : ^^^^ ->aNs.foo : () => void +>and.foo : () => void > : ^^^^^^^^^^ ->aNs : typeof aNs +>and : typeof and > : ^^^^^^^^^^ >foo : () => void > : ^^^^^^^^^^ diff --git a/tests/baselines/reference/importDeferNamespace(module=esnext).js b/tests/baselines/reference/importDeferNamespace(module=esnext).js index 29d60657fd306..ebd02a7857718 100644 --- a/tests/baselines/reference/importDeferNamespace(module=esnext).js +++ b/tests/baselines/reference/importDeferNamespace(module=esnext).js @@ -6,14 +6,14 @@ export function foo() { } //// [b.ts] -import defer * as aNs from "./a.js"; +import defer * as and from "./a.js"; -aNs.foo(); +and.foo(); //// [a.js] export function foo() { console.log("foo from a"); } //// [b.js] -import defer * as aNs from "./a.js"; -aNs.foo(); +import defer * as and from "./a.js"; +and.foo(); diff --git a/tests/baselines/reference/importDeferNamespace(module=esnext).symbols b/tests/baselines/reference/importDeferNamespace(module=esnext).symbols index eca0a04a77633..711f4fd5ca46f 100644 --- a/tests/baselines/reference/importDeferNamespace(module=esnext).symbols +++ b/tests/baselines/reference/importDeferNamespace(module=esnext).symbols @@ -11,11 +11,11 @@ export function foo() { } === b.ts === -import defer * as aNs from "./a.js"; ->aNs : Symbol(aNs, Decl(b.ts, 0, 12)) +import defer * as and from "./a.js"; +>and : Symbol(and, Decl(b.ts, 0, 12)) -aNs.foo(); ->aNs.foo : Symbol(aNs.foo, Decl(a.ts, 0, 0)) ->aNs : Symbol(aNs, Decl(b.ts, 0, 12)) ->foo : Symbol(aNs.foo, Decl(a.ts, 0, 0)) +and.foo(); +>and.foo : Symbol(and.foo, Decl(a.ts, 0, 0)) +>and : Symbol(and, Decl(b.ts, 0, 12)) +>foo : Symbol(and.foo, Decl(a.ts, 0, 0)) diff --git a/tests/baselines/reference/importDeferNamespace(module=esnext).types b/tests/baselines/reference/importDeferNamespace(module=esnext).types index 3f99c7848a284..574aa460bc623 100644 --- a/tests/baselines/reference/importDeferNamespace(module=esnext).types +++ b/tests/baselines/reference/importDeferNamespace(module=esnext).types @@ -19,16 +19,16 @@ export function foo() { } === b.ts === -import defer * as aNs from "./a.js"; ->aNs : typeof aNs +import defer * as and from "./a.js"; +>and : typeof and > : ^^^^^^^^^^ -aNs.foo(); ->aNs.foo() : void +and.foo(); +>and.foo() : void > : ^^^^ ->aNs.foo : () => void +>and.foo : () => void > : ^^^^^^^^^^ ->aNs : typeof aNs +>and : typeof and > : ^^^^^^^^^^ >foo : () => void > : ^^^^^^^^^^ diff --git a/tests/baselines/reference/importDeferNamespace(module=nodenext).errors.txt b/tests/baselines/reference/importDeferNamespace(module=nodenext).errors.txt index 74c011b13a035..bee8cefb7238b 100644 --- a/tests/baselines/reference/importDeferNamespace(module=nodenext).errors.txt +++ b/tests/baselines/reference/importDeferNamespace(module=nodenext).errors.txt @@ -7,8 +7,8 @@ b.ts(1,8): error TS18060: Deferred imports are only supported when the '--module } ==== b.ts (1 errors) ==== - import defer * as aNs from "./a.js"; + import defer * as and from "./a.js"; ~~~~~~~~~~~~~~ !!! error TS18060: Deferred imports are only supported when the '--module' flag is set to 'esnext' or 'preserve'. - aNs.foo(); \ No newline at end of file + and.foo(); \ No newline at end of file diff --git a/tests/baselines/reference/importDeferNamespace(module=nodenext).js b/tests/baselines/reference/importDeferNamespace(module=nodenext).js index 95cd4ac60d5dd..a87dcf988b812 100644 --- a/tests/baselines/reference/importDeferNamespace(module=nodenext).js +++ b/tests/baselines/reference/importDeferNamespace(module=nodenext).js @@ -6,9 +6,9 @@ export function foo() { } //// [b.ts] -import defer * as aNs from "./a.js"; +import defer * as and from "./a.js"; -aNs.foo(); +and.foo(); //// [a.js] "use strict"; @@ -53,5 +53,5 @@ var __importStar = (this && this.__importStar) || (function () { }; })(); Object.defineProperty(exports, "__esModule", { value: true }); -const aNs = __importStar(require("./a.js")); -aNs.foo(); +const and = __importStar(require("./a.js")); +and.foo(); diff --git a/tests/baselines/reference/importDeferNamespace(module=nodenext).symbols b/tests/baselines/reference/importDeferNamespace(module=nodenext).symbols index eca0a04a77633..711f4fd5ca46f 100644 --- a/tests/baselines/reference/importDeferNamespace(module=nodenext).symbols +++ b/tests/baselines/reference/importDeferNamespace(module=nodenext).symbols @@ -11,11 +11,11 @@ export function foo() { } === b.ts === -import defer * as aNs from "./a.js"; ->aNs : Symbol(aNs, Decl(b.ts, 0, 12)) +import defer * as and from "./a.js"; +>and : Symbol(and, Decl(b.ts, 0, 12)) -aNs.foo(); ->aNs.foo : Symbol(aNs.foo, Decl(a.ts, 0, 0)) ->aNs : Symbol(aNs, Decl(b.ts, 0, 12)) ->foo : Symbol(aNs.foo, Decl(a.ts, 0, 0)) +and.foo(); +>and.foo : Symbol(and.foo, Decl(a.ts, 0, 0)) +>and : Symbol(and, Decl(b.ts, 0, 12)) +>foo : Symbol(and.foo, Decl(a.ts, 0, 0)) diff --git a/tests/baselines/reference/importDeferNamespace(module=nodenext).types b/tests/baselines/reference/importDeferNamespace(module=nodenext).types index 3f99c7848a284..574aa460bc623 100644 --- a/tests/baselines/reference/importDeferNamespace(module=nodenext).types +++ b/tests/baselines/reference/importDeferNamespace(module=nodenext).types @@ -19,16 +19,16 @@ export function foo() { } === b.ts === -import defer * as aNs from "./a.js"; ->aNs : typeof aNs +import defer * as and from "./a.js"; +>and : typeof and > : ^^^^^^^^^^ -aNs.foo(); ->aNs.foo() : void +and.foo(); +>and.foo() : void > : ^^^^ ->aNs.foo : () => void +>and.foo : () => void > : ^^^^^^^^^^ ->aNs : typeof aNs +>and : typeof and > : ^^^^^^^^^^ >foo : () => void > : ^^^^^^^^^^ diff --git a/tests/baselines/reference/importDeferNamespace(module=preserve).js b/tests/baselines/reference/importDeferNamespace(module=preserve).js index 29d60657fd306..ebd02a7857718 100644 --- a/tests/baselines/reference/importDeferNamespace(module=preserve).js +++ b/tests/baselines/reference/importDeferNamespace(module=preserve).js @@ -6,14 +6,14 @@ export function foo() { } //// [b.ts] -import defer * as aNs from "./a.js"; +import defer * as and from "./a.js"; -aNs.foo(); +and.foo(); //// [a.js] export function foo() { console.log("foo from a"); } //// [b.js] -import defer * as aNs from "./a.js"; -aNs.foo(); +import defer * as and from "./a.js"; +and.foo(); diff --git a/tests/baselines/reference/importDeferNamespace(module=preserve).symbols b/tests/baselines/reference/importDeferNamespace(module=preserve).symbols index eca0a04a77633..711f4fd5ca46f 100644 --- a/tests/baselines/reference/importDeferNamespace(module=preserve).symbols +++ b/tests/baselines/reference/importDeferNamespace(module=preserve).symbols @@ -11,11 +11,11 @@ export function foo() { } === b.ts === -import defer * as aNs from "./a.js"; ->aNs : Symbol(aNs, Decl(b.ts, 0, 12)) +import defer * as and from "./a.js"; +>and : Symbol(and, Decl(b.ts, 0, 12)) -aNs.foo(); ->aNs.foo : Symbol(aNs.foo, Decl(a.ts, 0, 0)) ->aNs : Symbol(aNs, Decl(b.ts, 0, 12)) ->foo : Symbol(aNs.foo, Decl(a.ts, 0, 0)) +and.foo(); +>and.foo : Symbol(and.foo, Decl(a.ts, 0, 0)) +>and : Symbol(and, Decl(b.ts, 0, 12)) +>foo : Symbol(and.foo, Decl(a.ts, 0, 0)) diff --git a/tests/baselines/reference/importDeferNamespace(module=preserve).types b/tests/baselines/reference/importDeferNamespace(module=preserve).types index 3f99c7848a284..574aa460bc623 100644 --- a/tests/baselines/reference/importDeferNamespace(module=preserve).types +++ b/tests/baselines/reference/importDeferNamespace(module=preserve).types @@ -19,16 +19,16 @@ export function foo() { } === b.ts === -import defer * as aNs from "./a.js"; ->aNs : typeof aNs +import defer * as and from "./a.js"; +>and : typeof and > : ^^^^^^^^^^ -aNs.foo(); ->aNs.foo() : void +and.foo(); +>and.foo() : void > : ^^^^ ->aNs.foo : () => void +>and.foo : () => void > : ^^^^^^^^^^ ->aNs : typeof aNs +>and : typeof and > : ^^^^^^^^^^ >foo : () => void > : ^^^^^^^^^^ diff --git a/tests/baselines/reference/importExportInternalComments.js b/tests/baselines/reference/importExportInternalComments.js index c48d7a5ecf942..5000b5b708cad 100644 --- a/tests/baselines/reference/importExportInternalComments.js +++ b/tests/baselines/reference/importExportInternalComments.js @@ -10,7 +10,7 @@ declare module "foo"; /*1*/ import /*2*/ D /*3*/, /*4*/ { /*5*/ A /*6*/, /*7*/ B /*8*/ as /*9*/ C /*10*/ } /*11*/ from /*12*/ "foo"; /*1*/ import /*2*/ * /*3*/ as /*4*/ foo /*5*/ from /*6*/ "foo"; -void D, A, C, foo; // Use the variables to prevent ellision +void D, A, C, foo; // Use the variables to prevent elision /*1*/ export /*2*/ { /*3*/ A /*4*/, /*5*/ B /*6*/ as /*7*/ C /*8*/ } /*9*/ from /*10*/ "foo"; /*1*/ export /*2*/ * /*3*/ from /*4*/ "foo" @@ -20,6 +20,6 @@ void D, A, C, foo; // Use the variables to prevent ellision //// [index.js] /*1*/ import /*2*/ D /*3*/, /*4*/ { /*5*/ A /*6*/, /*7*/ B /*8*/ as /*9*/ C /*10*/ } /*11*/ from /*12*/ "foo"; /*1*/ import /*2*/ * /*3*/ as /*4*/ foo /*5*/ from /*6*/ "foo"; -void D, A, C, foo; // Use the variables to prevent ellision +void D, A, C, foo; // Use the variables to prevent elision /*1*/ export /*2*/ { /*3*/ A /*4*/, /*5*/ B /*6*/ as /*7*/ C /*8*/ } /*9*/ from /*10*/ "foo"; /*1*/ export /*2*/ * /*3*/ from /*4*/ "foo"; diff --git a/tests/baselines/reference/importExportInternalComments.symbols b/tests/baselines/reference/importExportInternalComments.symbols index 6955f1e989650..3dde3ad504ef4 100644 --- a/tests/baselines/reference/importExportInternalComments.symbols +++ b/tests/baselines/reference/importExportInternalComments.symbols @@ -18,7 +18,7 @@ declare module "foo"; /*1*/ import /*2*/ * /*3*/ as /*4*/ foo /*5*/ from /*6*/ "foo"; >foo : Symbol(foo, Decl(index.ts, 1, 12)) -void D, A, C, foo; // Use the variables to prevent ellision +void D, A, C, foo; // Use the variables to prevent elision >D : Symbol(D, Decl(index.ts, 0, 12)) >A : Symbol(A, Decl(index.ts, 0, 35)) >C : Symbol(C, Decl(index.ts, 0, 50)) diff --git a/tests/baselines/reference/importExportInternalComments.types b/tests/baselines/reference/importExportInternalComments.types index 34354be3a0619..590a900b7ff69 100644 --- a/tests/baselines/reference/importExportInternalComments.types +++ b/tests/baselines/reference/importExportInternalComments.types @@ -23,7 +23,7 @@ declare module "foo"; /*1*/ import /*2*/ * /*3*/ as /*4*/ foo /*5*/ from /*6*/ "foo"; >foo : any -void D, A, C, foo; // Use the variables to prevent ellision +void D, A, C, foo; // Use the variables to prevent elision >void D, A, C, foo : any >void D, A, C : any >void D, A : any diff --git a/tests/baselines/reference/importMeta(module=commonjs,target=es5).js b/tests/baselines/reference/importMeta(module=commonjs,target=es5).js index 6d5e4033ca07c..101bb096f165d 100644 --- a/tests/baselines/reference/importMeta(module=commonjs,target=es5).js +++ b/tests/baselines/reference/importMeta(module=commonjs,target=es5).js @@ -50,7 +50,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge }); }; var __generator = (this && this.__generator) || function (thisArg, body) { - var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); + var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, tries: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; function verb(n) { return function (v) { return step([n, v]); }; } function step(op) { @@ -62,14 +62,14 @@ var __generator = (this && this.__generator) || function (thisArg, body) { case 0: case 1: t = op; break; case 4: _.label++; return { value: op[1], done: false }; case 5: _.label++; y = op[1]; op = [0]; continue; - case 7: op = _.ops.pop(); _.trys.pop(); continue; + case 7: op = _.ops.pop(); _.tries.pop(); continue; default: - if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } + if (!(t = _.tries, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } if (t[2]) _.ops.pop(); - _.trys.pop(); continue; + _.tries.pop(); continue; } op = body.call(thisArg, _); } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } diff --git a/tests/baselines/reference/importMeta(module=es2020,target=es5).js b/tests/baselines/reference/importMeta(module=es2020,target=es5).js index 03e7011012f38..d4a9c0ed5ac8d 100644 --- a/tests/baselines/reference/importMeta(module=es2020,target=es5).js +++ b/tests/baselines/reference/importMeta(module=es2020,target=es5).js @@ -49,7 +49,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge }); }; var __generator = (this && this.__generator) || function (thisArg, body) { - var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); + var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, tries: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; function verb(n) { return function (v) { return step([n, v]); }; } function step(op) { @@ -61,14 +61,14 @@ var __generator = (this && this.__generator) || function (thisArg, body) { case 0: case 1: t = op; break; case 4: _.label++; return { value: op[1], done: false }; case 5: _.label++; y = op[1]; op = [0]; continue; - case 7: op = _.ops.pop(); _.trys.pop(); continue; + case 7: op = _.ops.pop(); _.tries.pop(); continue; default: - if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } + if (!(t = _.tries, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } if (t[2]) _.ops.pop(); - _.trys.pop(); continue; + _.tries.pop(); continue; } op = body.call(thisArg, _); } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } diff --git a/tests/baselines/reference/importMeta(module=esnext,target=es5).js b/tests/baselines/reference/importMeta(module=esnext,target=es5).js index 03e7011012f38..d4a9c0ed5ac8d 100644 --- a/tests/baselines/reference/importMeta(module=esnext,target=es5).js +++ b/tests/baselines/reference/importMeta(module=esnext,target=es5).js @@ -49,7 +49,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge }); }; var __generator = (this && this.__generator) || function (thisArg, body) { - var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); + var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, tries: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; function verb(n) { return function (v) { return step([n, v]); }; } function step(op) { @@ -61,14 +61,14 @@ var __generator = (this && this.__generator) || function (thisArg, body) { case 0: case 1: t = op; break; case 4: _.label++; return { value: op[1], done: false }; case 5: _.label++; y = op[1]; op = [0]; continue; - case 7: op = _.ops.pop(); _.trys.pop(); continue; + case 7: op = _.ops.pop(); _.tries.pop(); continue; default: - if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } + if (!(t = _.tries, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } if (t[2]) _.ops.pop(); - _.trys.pop(); continue; + _.tries.pop(); continue; } op = body.call(thisArg, _); } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } diff --git a/tests/baselines/reference/importMeta(module=system,target=es5).js b/tests/baselines/reference/importMeta(module=system,target=es5).js index b854483f66f5c..b44966b598cfc 100644 --- a/tests/baselines/reference/importMeta(module=system,target=es5).js +++ b/tests/baselines/reference/importMeta(module=system,target=es5).js @@ -51,7 +51,7 @@ System.register([], function (exports_1, context_1) { }); }; var __generator = (this && this.__generator) || function (thisArg, body) { - var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); + var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, tries: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; function verb(n) { return function (v) { return step([n, v]); }; } function step(op) { @@ -63,14 +63,14 @@ System.register([], function (exports_1, context_1) { case 0: case 1: t = op; break; case 4: _.label++; return { value: op[1], done: false }; case 5: _.label++; y = op[1]; op = [0]; continue; - case 7: op = _.ops.pop(); _.trys.pop(); continue; + case 7: op = _.ops.pop(); _.tries.pop(); continue; default: - if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } + if (!(t = _.tries, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } if (t[2]) _.ops.pop(); - _.trys.pop(); continue; + _.tries.pop(); continue; } op = body.call(thisArg, _); } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } diff --git a/tests/baselines/reference/importTypeNestedNoRef.errors.txt b/tests/baselines/reference/importTypeNestedNoRef.errors.txt index edfb3497c7645..b501ca8d29e25 100644 --- a/tests/baselines/reference/importTypeNestedNoRef.errors.txt +++ b/tests/baselines/reference/importTypeNestedNoRef.errors.txt @@ -2,7 +2,7 @@ chainer.ts(1,24): error TS1141: String literal expected. ==== chainer.ts (1 errors) ==== - export const x: import(import("./a").LookAt).Value = "yes"; // expect outter import to fail, since b.d.ts isn't in the build + export const x: import(import("./a").LookAt).Value = "yes"; // expect outer import to fail, since b.d.ts isn't in the build ~~~~~~~~~~~~~~~~~~~~ !!! error TS1141: String literal expected. diff --git a/tests/baselines/reference/importTypeNestedNoRef.js b/tests/baselines/reference/importTypeNestedNoRef.js index 2508c075430c5..7edf8bab3e840 100644 --- a/tests/baselines/reference/importTypeNestedNoRef.js +++ b/tests/baselines/reference/importTypeNestedNoRef.js @@ -5,11 +5,11 @@ export type LookAt = "./b"; //// [b.d.ts] export type Value = "yes"; //// [chainer.ts] -export const x: import(import("./a").LookAt).Value = "yes"; // expect outter import to fail, since b.d.ts isn't in the build +export const x: import(import("./a").LookAt).Value = "yes"; // expect outer import to fail, since b.d.ts isn't in the build //// [chainer.js] -export const x = "yes"; // expect outter import to fail, since b.d.ts isn't in the build +export const x = "yes"; // expect outer import to fail, since b.d.ts isn't in the build //// [chainer.d.ts] diff --git a/tests/baselines/reference/importTypeNestedNoRef.symbols b/tests/baselines/reference/importTypeNestedNoRef.symbols index 54e46ee51a306..f5b0372ab8523 100644 --- a/tests/baselines/reference/importTypeNestedNoRef.symbols +++ b/tests/baselines/reference/importTypeNestedNoRef.symbols @@ -1,7 +1,7 @@ //// [tests/cases/conformance/types/import/importTypeNestedNoRef.ts] //// === chainer.ts === -export const x: import(import("./a").LookAt).Value = "yes"; // expect outter import to fail, since b.d.ts isn't in the build +export const x: import(import("./a").LookAt).Value = "yes"; // expect outer import to fail, since b.d.ts isn't in the build >x : Symbol(x, Decl(chainer.ts, 0, 12)) >LookAt : Symbol(LookAt, Decl(a.d.ts, 0, 0)) diff --git a/tests/baselines/reference/importTypeNestedNoRef.types b/tests/baselines/reference/importTypeNestedNoRef.types index fa44ccd4ccd74..ffd603fd266be 100644 --- a/tests/baselines/reference/importTypeNestedNoRef.types +++ b/tests/baselines/reference/importTypeNestedNoRef.types @@ -1,7 +1,7 @@ //// [tests/cases/conformance/types/import/importTypeNestedNoRef.ts] //// === chainer.ts === -export const x: import(import("./a").LookAt).Value = "yes"; // expect outter import to fail, since b.d.ts isn't in the build +export const x: import(import("./a").LookAt).Value = "yes"; // expect outer import to fail, since b.d.ts isn't in the build >x : any > : ^^^ >"yes" : "yes" diff --git a/tests/baselines/reference/inDoesNotOperateOnPrimitiveTypes.errors.txt b/tests/baselines/reference/inDoesNotOperateOnPrimitiveTypes.errors.txt index 2ebe1d567b70e..d69423aa825e6 100644 --- a/tests/baselines/reference/inDoesNotOperateOnPrimitiveTypes.errors.txt +++ b/tests/baselines/reference/inDoesNotOperateOnPrimitiveTypes.errors.txt @@ -102,7 +102,7 @@ inDoesNotOperateOnPrimitiveTypes.ts(64,12): error TS2322: Type 'T & (0 | 1 | 2)' // and it adds a lot of complexity to distinguish between a `T | U` where // one constraint is non-primitive and the other is primitive and a `T | U` // like this where both constraints have primitive and non-primitive - // constitutents. Also, the strictly sound behavior would be to error + // constituents. Also, the strictly sound behavior would be to error // here, which is what's happening, so "fixing" this by suppressing the // error seems very low-value. "key" in p; @@ -123,7 +123,7 @@ inDoesNotOperateOnPrimitiveTypes.ts(64,12): error TS2322: Type 'T & (0 | 1 | 2)' } function intersection2(thing: T & (0 | 1 | 2)) { - "key" in thing; // Error (because all possible instantations are errors) + "key" in thing; // Error (because all possible instantiations are errors) ~~~~~ !!! error TS2322: Type 'T & (0 | 1 | 2)' is not assignable to type 'object'. !!! error TS2322: Type 'T & 0' is not assignable to type 'object'. diff --git a/tests/baselines/reference/inDoesNotOperateOnPrimitiveTypes.js b/tests/baselines/reference/inDoesNotOperateOnPrimitiveTypes.js index 52dcc45304086..e10f1675c329e 100644 --- a/tests/baselines/reference/inDoesNotOperateOnPrimitiveTypes.js +++ b/tests/baselines/reference/inDoesNotOperateOnPrimitiveTypes.js @@ -50,7 +50,7 @@ function union5(p: T | U) // and it adds a lot of complexity to distinguish between a `T | U` where // one constraint is non-primitive and the other is primitive and a `T | U` // like this where both constraints have primitive and non-primitive - // constitutents. Also, the strictly sound behavior would be to error + // constituents. Also, the strictly sound behavior would be to error // here, which is what's happening, so "fixing" this by suppressing the // error seems very low-value. "key" in p; @@ -64,7 +64,7 @@ function intersection1(thing: T & U) { } function intersection2(thing: T & (0 | 1 | 2)) { - "key" in thing; // Error (because all possible instantations are errors) + "key" in thing; // Error (because all possible instantiations are errors) } @@ -103,7 +103,7 @@ function union5(p) { // and it adds a lot of complexity to distinguish between a `T | U` where // one constraint is non-primitive and the other is primitive and a `T | U` // like this where both constraints have primitive and non-primitive - // constitutents. Also, the strictly sound behavior would be to error + // constituents. Also, the strictly sound behavior would be to error // here, which is what's happening, so "fixing" this by suppressing the // error seems very low-value. "key" in p; @@ -115,5 +115,5 @@ function intersection1(thing) { "key" in thing; // Error (because all possible instantiations are errors) } function intersection2(thing) { - "key" in thing; // Error (because all possible instantations are errors) + "key" in thing; // Error (because all possible instantiations are errors) } diff --git a/tests/baselines/reference/inDoesNotOperateOnPrimitiveTypes.symbols b/tests/baselines/reference/inDoesNotOperateOnPrimitiveTypes.symbols index 1914ab1617303..1710766b7c888 100644 --- a/tests/baselines/reference/inDoesNotOperateOnPrimitiveTypes.symbols +++ b/tests/baselines/reference/inDoesNotOperateOnPrimitiveTypes.symbols @@ -126,7 +126,7 @@ function union5(p: T | U) // and it adds a lot of complexity to distinguish between a `T | U` where // one constraint is non-primitive and the other is primitive and a `T | U` // like this where both constraints have primitive and non-primitive - // constitutents. Also, the strictly sound behavior would be to error + // constituents. Also, the strictly sound behavior would be to error // here, which is what's happening, so "fixing" this by suppressing the // error seems very low-value. "key" in p; @@ -158,7 +158,7 @@ function intersection2(thing: T & (0 | 1 | 2)) { >thing : Symbol(thing, Decl(inDoesNotOperateOnPrimitiveTypes.ts, 62, 26)) >T : Symbol(T, Decl(inDoesNotOperateOnPrimitiveTypes.ts, 62, 23)) - "key" in thing; // Error (because all possible instantations are errors) + "key" in thing; // Error (because all possible instantiations are errors) >thing : Symbol(thing, Decl(inDoesNotOperateOnPrimitiveTypes.ts, 62, 26)) } diff --git a/tests/baselines/reference/inDoesNotOperateOnPrimitiveTypes.types b/tests/baselines/reference/inDoesNotOperateOnPrimitiveTypes.types index 21c427bfcf690..40d0077cf5294 100644 --- a/tests/baselines/reference/inDoesNotOperateOnPrimitiveTypes.types +++ b/tests/baselines/reference/inDoesNotOperateOnPrimitiveTypes.types @@ -192,7 +192,7 @@ function union5(p: T | U) // and it adds a lot of complexity to distinguish between a `T | U` where // one constraint is non-primitive and the other is primitive and a `T | U` // like this where both constraints have primitive and non-primitive - // constitutents. Also, the strictly sound behavior would be to error + // constituents. Also, the strictly sound behavior would be to error // here, which is what's happening, so "fixing" this by suppressing the // error seems very low-value. "key" in p; @@ -244,7 +244,7 @@ function intersection2(thing: T & (0 | 1 | 2)) { >thing : T & (0 | 1 | 2) > : ^^^^^^^^^^^^^^^ - "key" in thing; // Error (because all possible instantations are errors) + "key" in thing; // Error (because all possible instantiations are errors) >"key" in thing : boolean > : ^^^^^^^ >"key" : "key" diff --git a/tests/baselines/reference/incrementOperatorWithAnyOtherType.js b/tests/baselines/reference/incrementOperatorWithAnyOtherType.js index a149e7acf4b66..62a3ff7bfe847 100644 --- a/tests/baselines/reference/incrementOperatorWithAnyOtherType.js +++ b/tests/baselines/reference/incrementOperatorWithAnyOtherType.js @@ -35,7 +35,7 @@ var ResultIsNumber11 = obj.y++; var ResultIsNumber12 = objA.a++; var ResultIsNumber13 = M.n++; -// miss assignment opertors +// miss assignment operators ++ANY; ++ANY1; ++ANY2[0]; @@ -79,7 +79,7 @@ var ResultIsNumber10 = obj.x++; var ResultIsNumber11 = obj.y++; var ResultIsNumber12 = objA.a++; var ResultIsNumber13 = M.n++; -// miss assignment opertors +// miss assignment operators ++ANY; ++ANY1; ++ANY2[0]; diff --git a/tests/baselines/reference/incrementOperatorWithAnyOtherType.symbols b/tests/baselines/reference/incrementOperatorWithAnyOtherType.symbols index 2b9553aeef498..c8c907d5fddae 100644 --- a/tests/baselines/reference/incrementOperatorWithAnyOtherType.symbols +++ b/tests/baselines/reference/incrementOperatorWithAnyOtherType.symbols @@ -107,7 +107,7 @@ var ResultIsNumber13 = M.n++; >M : Symbol(M, Decl(incrementOperatorWithAnyOtherType.ts, 8, 1)) >n : Symbol(M.n, Decl(incrementOperatorWithAnyOtherType.ts, 10, 14)) -// miss assignment opertors +// miss assignment operators ++ANY; >ANY : Symbol(ANY, Decl(incrementOperatorWithAnyOtherType.ts, 2, 3)) diff --git a/tests/baselines/reference/incrementOperatorWithAnyOtherType.types b/tests/baselines/reference/incrementOperatorWithAnyOtherType.types index 8724dcb0de128..c85c8e0f0b0ac 100644 --- a/tests/baselines/reference/incrementOperatorWithAnyOtherType.types +++ b/tests/baselines/reference/incrementOperatorWithAnyOtherType.types @@ -195,7 +195,7 @@ var ResultIsNumber13 = M.n++; >n : any > : ^^^ -// miss assignment opertors +// miss assignment operators ++ANY; >++ANY : number > : ^^^^^^ diff --git a/tests/baselines/reference/indexSignatures1.types b/tests/baselines/reference/indexSignatures1.types index 8dff518b5679a..7ebcd41973e3c 100644 --- a/tests/baselines/reference/indexSignatures1.types +++ b/tests/baselines/reference/indexSignatures1.types @@ -1266,7 +1266,7 @@ plugins[system][SomeSytePlugin] = () => console.log('awsome'); > : ^^^^^^^ >log : (...data: any[]) => void > : ^^^^ ^^ ^^^^^ ->'awsome' : "awsome" +>'awesome' : "awesome" > : ^^^^^^^^ plugins[system][SomeSytePlugin](); diff --git a/tests/baselines/reference/inferSetterParamType.errors.txt b/tests/baselines/reference/inferSetterParamType.errors.txt index 40dcb2634566f..aec0c81ac2f0d 100644 --- a/tests/baselines/reference/inferSetterParamType.errors.txt +++ b/tests/baselines/reference/inferSetterParamType.errors.txt @@ -14,7 +14,7 @@ inferSetterParamType.ts(13,9): error TS2322: Type 'number' is not assignable to class Foo2 { get bar() { - return 0; // should be an error - can't coerce infered return type to match setter annotated type + return 0; // should be an error - can't coerce inferred return type to match setter annotated type ~~~~~~ !!! error TS2322: Type 'number' is not assignable to type 'string'. } diff --git a/tests/baselines/reference/inferSetterParamType.js b/tests/baselines/reference/inferSetterParamType.js index d8dd587a6392f..1573256bb216e 100644 --- a/tests/baselines/reference/inferSetterParamType.js +++ b/tests/baselines/reference/inferSetterParamType.js @@ -13,7 +13,7 @@ class Foo { class Foo2 { get bar() { - return 0; // should be an error - can't coerce infered return type to match setter annotated type + return 0; // should be an error - can't coerce inferred return type to match setter annotated type } set bar(n:string) { } @@ -31,7 +31,7 @@ class Foo { } class Foo2 { get bar() { - return 0; // should be an error - can't coerce infered return type to match setter annotated type + return 0; // should be an error - can't coerce inferred return type to match setter annotated type } set bar(n) { } diff --git a/tests/baselines/reference/inferSetterParamType.symbols b/tests/baselines/reference/inferSetterParamType.symbols index 95bd4fc75e166..aa450bf7d4d7a 100644 --- a/tests/baselines/reference/inferSetterParamType.symbols +++ b/tests/baselines/reference/inferSetterParamType.symbols @@ -21,7 +21,7 @@ class Foo2 { get bar() { >bar : Symbol(Foo2.bar, Decl(inferSetterParamType.ts, 9, 12), Decl(inferSetterParamType.ts, 13, 5)) - return 0; // should be an error - can't coerce infered return type to match setter annotated type + return 0; // should be an error - can't coerce inferred return type to match setter annotated type } set bar(n:string) { >bar : Symbol(Foo2.bar, Decl(inferSetterParamType.ts, 9, 12), Decl(inferSetterParamType.ts, 13, 5)) diff --git a/tests/baselines/reference/inferSetterParamType.types b/tests/baselines/reference/inferSetterParamType.types index a85f38afd3596..90799ddddefbe 100644 --- a/tests/baselines/reference/inferSetterParamType.types +++ b/tests/baselines/reference/inferSetterParamType.types @@ -29,7 +29,7 @@ class Foo2 { >bar : string > : ^^^^^^ - return 0; // should be an error - can't coerce infered return type to match setter annotated type + return 0; // should be an error - can't coerce inferred return type to match setter annotated type >0 : 0 > : ^ } diff --git a/tests/baselines/reference/infiniteExpansionThroughTypeInference.js b/tests/baselines/reference/infiniteExpansionThroughTypeInference.js index 19a00977255f9..0529163a813fb 100644 --- a/tests/baselines/reference/infiniteExpansionThroughTypeInference.js +++ b/tests/baselines/reference/infiniteExpansionThroughTypeInference.js @@ -7,7 +7,7 @@ interface G { } function ff(g: G): void { - ff(g) // when infering T here we need to make sure to not descend into the structure of G infinitely + ff(g) // when inferring T here we need to make sure to not descend into the structure of G infinitely } @@ -15,5 +15,5 @@ function ff(g: G): void { //// [infiniteExpansionThroughTypeInference.js] "use strict"; function ff(g) { - ff(g); // when infering T here we need to make sure to not descend into the structure of G infinitely + ff(g); // when inferring T here we need to make sure to not descend into the structure of G infinitely } diff --git a/tests/baselines/reference/infiniteExpansionThroughTypeInference.symbols b/tests/baselines/reference/infiniteExpansionThroughTypeInference.symbols index 56eac0b99339f..f05ab7a400208 100644 --- a/tests/baselines/reference/infiniteExpansionThroughTypeInference.symbols +++ b/tests/baselines/reference/infiniteExpansionThroughTypeInference.symbols @@ -23,7 +23,7 @@ function ff(g: G): void { >G : Symbol(G, Decl(infiniteExpansionThroughTypeInference.ts, 0, 0)) >T : Symbol(T, Decl(infiniteExpansionThroughTypeInference.ts, 5, 12)) - ff(g) // when infering T here we need to make sure to not descend into the structure of G infinitely + ff(g) // when inferring T here we need to make sure to not descend into the structure of G infinitely >ff : Symbol(ff, Decl(infiniteExpansionThroughTypeInference.ts, 3, 1)) >g : Symbol(g, Decl(infiniteExpansionThroughTypeInference.ts, 5, 15)) } diff --git a/tests/baselines/reference/infiniteExpansionThroughTypeInference.types b/tests/baselines/reference/infiniteExpansionThroughTypeInference.types index 8e6650bc24c07..67a8755aeaa88 100644 --- a/tests/baselines/reference/infiniteExpansionThroughTypeInference.types +++ b/tests/baselines/reference/infiniteExpansionThroughTypeInference.types @@ -17,7 +17,7 @@ function ff(g: G): void { >g : G > : ^^^^ - ff(g) // when infering T here we need to make sure to not descend into the structure of G infinitely + ff(g) // when inferring T here we need to make sure to not descend into the structure of G infinitely >ff(g) : void > : ^^^^ >ff : (g: G) => void diff --git a/tests/baselines/reference/infinitelyExpandingOverloads.errors.txt b/tests/baselines/reference/infinitelyExpandingOverloads.errors.txt index 206ed9aa67784..a67520db14394 100644 --- a/tests/baselines/reference/infinitelyExpandingOverloads.errors.txt +++ b/tests/baselines/reference/infinitelyExpandingOverloads.errors.txt @@ -24,7 +24,7 @@ infinitelyExpandingOverloads.ts(24,9): error TS2322: Type 'null' is not assignab public validationPlacements: Array> = new Array>(); } class Widget { - constructor(viewModelType: new () => ViewModel); // Shouldnt error on this overload + constructor(viewModelType: new () => ViewModel); // Shouldn't error on this overload constructor(viewModelType: new () => ViewModel) { } public get options(): ViewModel { diff --git a/tests/baselines/reference/infinitelyExpandingOverloads.js b/tests/baselines/reference/infinitelyExpandingOverloads.js index b58bbed840f65..7c703235644b7 100644 --- a/tests/baselines/reference/infinitelyExpandingOverloads.js +++ b/tests/baselines/reference/infinitelyExpandingOverloads.js @@ -20,7 +20,7 @@ class ViewModel { public validationPlacements: Array> = new Array>(); } class Widget { - constructor(viewModelType: new () => ViewModel); // Shouldnt error on this overload + constructor(viewModelType: new () => ViewModel); // Shouldn't error on this overload constructor(viewModelType: new () => ViewModel) { } public get options(): ViewModel { diff --git a/tests/baselines/reference/infinitelyExpandingOverloads.symbols b/tests/baselines/reference/infinitelyExpandingOverloads.symbols index ec41b6659a69a..8a3a3d6462d4b 100644 --- a/tests/baselines/reference/infinitelyExpandingOverloads.symbols +++ b/tests/baselines/reference/infinitelyExpandingOverloads.symbols @@ -70,7 +70,7 @@ class Widget { >Widget : Symbol(Widget, Decl(infinitelyExpandingOverloads.ts, 17, 1)) >TValue : Symbol(TValue, Decl(infinitelyExpandingOverloads.ts, 18, 13)) - constructor(viewModelType: new () => ViewModel); // Shouldnt error on this overload + constructor(viewModelType: new () => ViewModel); // Shouldn't error on this overload >viewModelType : Symbol(viewModelType, Decl(infinitelyExpandingOverloads.ts, 19, 16)) >ViewModel : Symbol(ViewModel, Decl(infinitelyExpandingOverloads.ts, 14, 1)) >TValue : Symbol(TValue, Decl(infinitelyExpandingOverloads.ts, 18, 13)) diff --git a/tests/baselines/reference/infinitelyExpandingOverloads.types b/tests/baselines/reference/infinitelyExpandingOverloads.types index 34afb8600d035..f88f81a209ddd 100644 --- a/tests/baselines/reference/infinitelyExpandingOverloads.types +++ b/tests/baselines/reference/infinitelyExpandingOverloads.types @@ -55,7 +55,7 @@ class Widget { >Widget : Widget > : ^^^^^^^^^^^^^^ - constructor(viewModelType: new () => ViewModel); // Shouldnt error on this overload + constructor(viewModelType: new () => ViewModel); // Shouldn't error on this overload >viewModelType : new () => ViewModel > : ^^^^^^^^^^ diff --git a/tests/baselines/reference/interfaceMergedUnconstrainedNoErrorIrrespectiveOfOrder.js b/tests/baselines/reference/interfaceMergedUnconstrainedNoErrorIrrespectiveOfOrder.js index f971586c1ca96..1492f6d735f7d 100644 --- a/tests/baselines/reference/interfaceMergedUnconstrainedNoErrorIrrespectiveOfOrder.js +++ b/tests/baselines/reference/interfaceMergedUnconstrainedNoErrorIrrespectiveOfOrder.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/interfaceMergedUnconstrainedNoErrorIrrespectiveOfOrder.ts] //// //// [working.ts] -// minmal samples from #33395 +// minimal samples from #33395 export namespace ns { interface Function any> { throttle(): Function; diff --git a/tests/baselines/reference/interfaceMergedUnconstrainedNoErrorIrrespectiveOfOrder.symbols b/tests/baselines/reference/interfaceMergedUnconstrainedNoErrorIrrespectiveOfOrder.symbols index 04bd7279d1464..713e91ee0bfaf 100644 --- a/tests/baselines/reference/interfaceMergedUnconstrainedNoErrorIrrespectiveOfOrder.symbols +++ b/tests/baselines/reference/interfaceMergedUnconstrainedNoErrorIrrespectiveOfOrder.symbols @@ -1,7 +1,7 @@ //// [tests/cases/compiler/interfaceMergedUnconstrainedNoErrorIrrespectiveOfOrder.ts] //// === working.ts === -// minmal samples from #33395 +// minimal samples from #33395 export namespace ns { >ns : Symbol(ns, Decl(working.ts, 0, 0)) diff --git a/tests/baselines/reference/interfaceMergedUnconstrainedNoErrorIrrespectiveOfOrder.types b/tests/baselines/reference/interfaceMergedUnconstrainedNoErrorIrrespectiveOfOrder.types index 2b91851cbd756..316dc94078f84 100644 --- a/tests/baselines/reference/interfaceMergedUnconstrainedNoErrorIrrespectiveOfOrder.types +++ b/tests/baselines/reference/interfaceMergedUnconstrainedNoErrorIrrespectiveOfOrder.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/interfaceMergedUnconstrainedNoErrorIrrespectiveOfOrder.ts] //// === working.ts === -// minmal samples from #33395 +// minimal samples from #33395 export namespace ns { interface Function any> { >args : any diff --git a/tests/baselines/reference/jsEmitIntersectionProperty.js b/tests/baselines/reference/jsEmitIntersectionProperty.js index 0eb73246e1613..6b0bc52df61a5 100644 --- a/tests/baselines/reference/jsEmitIntersectionProperty.js +++ b/tests/baselines/reference/jsEmitIntersectionProperty.js @@ -3,14 +3,14 @@ //// [globals.d.ts] declare class CoreObject { static extend< - Statics, + Statistics, Instance extends B1, T1, B1 >( - this: Statics & { new(): Instance }, + this: Statistics & { new(): Instance }, arg1: T1 - ): Readonly & { new(): T1 & Instance }; + ): Readonly & { new(): T1 & Instance }; toString(): string; } diff --git a/tests/baselines/reference/jsdocPropertyTagInvalid.errors.txt b/tests/baselines/reference/jsdocPropertyTagInvalid.errors.txt index e265271517327..3ecc4dff9a566 100644 --- a/tests/baselines/reference/jsdocPropertyTagInvalid.errors.txt +++ b/tests/baselines/reference/jsdocPropertyTagInvalid.errors.txt @@ -4,7 +4,7 @@ ==== /a.js (1 errors) ==== /** * @typedef MyType - * @property {sting} [x] + * @property {string} [x] ~~~~~ !!! error TS2552: Cannot find name 'sting'. Did you mean 'string'? */ diff --git a/tests/baselines/reference/jsdocPropertyTagInvalid.symbols b/tests/baselines/reference/jsdocPropertyTagInvalid.symbols index 6e1d52ce2cb9e..c21989c57503f 100644 --- a/tests/baselines/reference/jsdocPropertyTagInvalid.symbols +++ b/tests/baselines/reference/jsdocPropertyTagInvalid.symbols @@ -3,7 +3,7 @@ === /a.js === /** * @typedef MyType - * @property {sting} [x] + * @property {string} [x] */ /** @param {MyType} p */ diff --git a/tests/baselines/reference/jsdocPropertyTagInvalid.types b/tests/baselines/reference/jsdocPropertyTagInvalid.types index f94958fab563f..0213686537547 100644 --- a/tests/baselines/reference/jsdocPropertyTagInvalid.types +++ b/tests/baselines/reference/jsdocPropertyTagInvalid.types @@ -3,7 +3,7 @@ === /a.js === /** * @typedef MyType - * @property {sting} [x] + * @property {string} [x] */ /** @param {MyType} p */ diff --git a/tests/baselines/reference/jsdocTemplateTagDefault.errors.txt b/tests/baselines/reference/jsdocTemplateTagDefault.errors.txt index ef3db758ce84c..1f6ae46303e0f 100644 --- a/tests/baselines/reference/jsdocTemplateTagDefault.errors.txt +++ b/tests/baselines/reference/jsdocTemplateTagDefault.errors.txt @@ -22,7 +22,7 @@ file.js(60,17): error TS2744: Type parameter defaults can only reference previou /** @type {A} */ // ok, `T` is provided for `A` const aString = [""]; /** @type {A} */ // ok, `T` is provided for `A` - const aNumber = [0]; + const a number = [0]; /** * @template T diff --git a/tests/baselines/reference/jsdocTemplateTagDefault.js b/tests/baselines/reference/jsdocTemplateTagDefault.js index 18ac7e26cb7e2..0ec9f9809dd7d 100644 --- a/tests/baselines/reference/jsdocTemplateTagDefault.js +++ b/tests/baselines/reference/jsdocTemplateTagDefault.js @@ -13,7 +13,7 @@ const aDefault2 = [0]; /** @type {A} */ // ok, `T` is provided for `A` const aString = [""]; /** @type {A} */ // ok, `T` is provided for `A` -const aNumber = [0]; +const a number = [0]; /** * @template T @@ -81,7 +81,7 @@ const aDefault2 = [0]; /** @type {A} */ // ok, `T` is provided for `A` const aString = [""]; /** @type {A} */ // ok, `T` is provided for `A` -const aNumber = [0]; +const a number = [0]; /** * @template T * @template [U=T] - ok: default can reference earlier type parameter @@ -180,7 +180,7 @@ declare function f3(a: T, b: U): void; /** @type {A} */ declare const aDefault1: A; /** @type {A} */ declare const aDefault2: A; /** @type {A} */ declare const aString: A; -/** @type {A} */ declare const aNumber: A; +/** @type {A} */ declare const a number: A; type B = [T, U]; type C = [T]; type D = [T]; diff --git a/tests/baselines/reference/jsdocTemplateTagDefault.symbols b/tests/baselines/reference/jsdocTemplateTagDefault.symbols index 98d9cea4158b0..668bf3b103da7 100644 --- a/tests/baselines/reference/jsdocTemplateTagDefault.symbols +++ b/tests/baselines/reference/jsdocTemplateTagDefault.symbols @@ -19,8 +19,8 @@ const aString = [""]; >aString : Symbol(aString, Decl(file.js, 10, 5)) /** @type {A} */ // ok, `T` is provided for `A` -const aNumber = [0]; ->aNumber : Symbol(aNumber, Decl(file.js, 12, 5)) +const a number = [0]; +>a number : Symbol(a number, Decl(file.js, 12, 5)) /** * @template T diff --git a/tests/baselines/reference/jsdocTemplateTagDefault.types b/tests/baselines/reference/jsdocTemplateTagDefault.types index 5c8aea32481be..dc6e810c50ae8 100644 --- a/tests/baselines/reference/jsdocTemplateTagDefault.types +++ b/tests/baselines/reference/jsdocTemplateTagDefault.types @@ -34,8 +34,8 @@ const aString = [""]; > : ^^ /** @type {A} */ // ok, `T` is provided for `A` -const aNumber = [0]; ->aNumber : A +const a number = [0]; +>a number : A > : ^^^^^^^^^ >[0] : [number] > : ^^^^^^^^ diff --git a/tests/baselines/reference/jsxIntrinsicElementsTypeArgumentErrors.errors.txt b/tests/baselines/reference/jsxIntrinsicElementsTypeArgumentErrors.errors.txt index 1b4342381c8d9..40a36bafc00a5 100644 --- a/tests/baselines/reference/jsxIntrinsicElementsTypeArgumentErrors.errors.txt +++ b/tests/baselines/reference/jsxIntrinsicElementsTypeArgumentErrors.errors.txt @@ -37,7 +37,7 @@ jsxIntrinsicElementsTypeArgumentErrors.tsx(28,16): error TS2558: Expected 0 type ~ !!! error TS1009: Trailing comma not allowed. - const c = >
; // nonexistant type args + const c = >
; // nonexistent type args ~~~~~~~ !!! error TS2304: Cannot find name 'Missing'. ~~~~~~~ @@ -72,7 +72,7 @@ jsxIntrinsicElementsTypeArgumentErrors.tsx(28,16): error TS2558: Expected 0 type ~ !!! error TS1009: Trailing comma not allowed. - const i = />; // nonexistant type args + const i = />; // nonexistent type args ~~~~~~~ !!! error TS2304: Cannot find name 'Missing'. ~~~~~~~ diff --git a/tests/baselines/reference/jsxIntrinsicElementsTypeArgumentErrors.js b/tests/baselines/reference/jsxIntrinsicElementsTypeArgumentErrors.js index 1a36805d84fdc..b88309a17773e 100644 --- a/tests/baselines/reference/jsxIntrinsicElementsTypeArgumentErrors.js +++ b/tests/baselines/reference/jsxIntrinsicElementsTypeArgumentErrors.js @@ -9,7 +9,7 @@ const a = >; // empty type args const b = >; // trailing comma type args -const c = >; // nonexistant type args +const c = >; // nonexistent type args const d = >>; // nested missing type args @@ -22,7 +22,7 @@ const g = />; // empty type args const h = />; // trailing comma type args -const i = />; // nonexistant type args +const i = />; // nonexistent type args const j = >/>; // nested missing type args @@ -37,14 +37,14 @@ import * as React from "react"; // opening + closing const a = React.createElement("div", null); // empty type args const b = React.createElement("div", null); // trailing comma type args -const c = React.createElement("div", null); // nonexistant type args +const c = React.createElement("div", null); // nonexistent type args const d = React.createElement("div", null); // nested missing type args const e = React.createElement("div", null); // existing but incorrect nested type args const f = React.createElement("div", null); // existing type argument with no internal issues // self-closing const g = React.createElement("div", null); // empty type args const h = React.createElement("div", null); // trailing comma type args -const i = React.createElement("div", null); // nonexistant type args +const i = React.createElement("div", null); // nonexistent type args const j = React.createElement("div", null); // nested missing type args const k = React.createElement("div", null); // existing but incorrect nested type args const l = React.createElement("div", null); // existing type argument with no internal issues diff --git a/tests/baselines/reference/jsxIntrinsicElementsTypeArgumentErrors.symbols b/tests/baselines/reference/jsxIntrinsicElementsTypeArgumentErrors.symbols index b33c11ceb8b80..f96b1bab5a70b 100644 --- a/tests/baselines/reference/jsxIntrinsicElementsTypeArgumentErrors.symbols +++ b/tests/baselines/reference/jsxIntrinsicElementsTypeArgumentErrors.symbols @@ -16,7 +16,7 @@ const b = >; // trailing comma type args >div : Symbol(JSX.IntrinsicElements.div, Decl(react16.d.ts, 2548, 114)) >div : Symbol(JSX.IntrinsicElements.div, Decl(react16.d.ts, 2548, 114)) -const c = >; // nonexistant type args +const c = >; // nonexistent type args >c : Symbol(c, Decl(jsxIntrinsicElementsTypeArgumentErrors.tsx, 8, 5)) >div : Symbol(JSX.IntrinsicElements.div, Decl(react16.d.ts, 2548, 114)) >Missing : Symbol(Missing) @@ -49,7 +49,7 @@ const h = />; // trailing comma type args >h : Symbol(h, Decl(jsxIntrinsicElementsTypeArgumentErrors.tsx, 19, 5)) >div : Symbol(JSX.IntrinsicElements.div, Decl(react16.d.ts, 2548, 114)) -const i = />; // nonexistant type args +const i = />; // nonexistent type args >i : Symbol(i, Decl(jsxIntrinsicElementsTypeArgumentErrors.tsx, 21, 5)) >div : Symbol(JSX.IntrinsicElements.div, Decl(react16.d.ts, 2548, 114)) >Missing : Symbol(Missing) diff --git a/tests/baselines/reference/jsxIntrinsicElementsTypeArgumentErrors.types b/tests/baselines/reference/jsxIntrinsicElementsTypeArgumentErrors.types index 6c29d334af205..3881bde9207e9 100644 --- a/tests/baselines/reference/jsxIntrinsicElementsTypeArgumentErrors.types +++ b/tests/baselines/reference/jsxIntrinsicElementsTypeArgumentErrors.types @@ -33,7 +33,7 @@ const b = >; // trailing comma type args >div : any > : ^^^ -const c = >; // nonexistant type args +const c = >; // nonexistent type args >c : JSX.Element > : ^^^^^^^^^^^ >> : JSX.Element @@ -90,7 +90,7 @@ const h = />; // trailing comma type args >div : any > : ^^^ -const i = />; // nonexistant type args +const i = />; // nonexistent type args >i : JSX.Element > : ^^^^^^^^^^^ >/> : JSX.Element diff --git a/tests/baselines/reference/jsxNamespacePrefixInName.errors.txt b/tests/baselines/reference/jsxNamespacePrefixInName.errors.txt index 820778cde0aa8..6783bff5c561a 100644 --- a/tests/baselines/reference/jsxNamespacePrefixInName.errors.txt +++ b/tests/baselines/reference/jsxNamespacePrefixInName.errors.txt @@ -89,12 +89,12 @@ jsxNamespacePrefixInName.tsx(28,24): error TS7026: JSX element implicitly has ty ~~~~~~~~~~~~ !!! error TS7026: JSX element implicitly has type 'any' because no interface 'JSX.IntrinsicElements' exists. - var tooManySeparators1 = ; + var tooManySeparators1 = ; ~~~~~~~~~~~~~~ !!! error TS7026: JSX element implicitly has type 'any' because no interface 'JSX.IntrinsicElements' exists. ~ !!! error TS1003: Identifier expected. - var tooManySeparators2 = ; + var tooManySeparators2 = ; ~~~~~~~~~~~~ !!! error TS7026: JSX element implicitly has type 'any' because no interface 'JSX.IntrinsicElements' exists. ~ @@ -107,7 +107,7 @@ jsxNamespacePrefixInName.tsx(28,24): error TS7026: JSX element implicitly has ty !!! error TS1005: ',' expected. ~ !!! error TS1109: Expression expected. - var tooManySeparators3 = ; + var tooManySeparators3 = ; ~~~~~~~~~~~~~~~~~~~~~~~~~~~ !!! error TS7026: JSX element implicitly has type 'any' because no interface 'JSX.IntrinsicElements' exists. ~ @@ -120,7 +120,7 @@ jsxNamespacePrefixInName.tsx(28,24): error TS7026: JSX element implicitly has ty !!! error TS1005: ',' expected. ~ !!! error TS1109: Expression expected. - var tooManySeparators4 = {"text"}; + var tooManySeparators4 = {"text"}; ~~~~~~~~~~~~ !!! error TS7026: JSX element implicitly has type 'any' because no interface 'JSX.IntrinsicElements' exists. ~ @@ -133,7 +133,7 @@ jsxNamespacePrefixInName.tsx(28,24): error TS7026: JSX element implicitly has ty !!! error TS1005: ',' expected. ~ !!! error TS1109: Expression expected. - var tooManySeparators5 = {"text"}; + var tooManySeparators5 = {"text"}; ~~~~~~~~~~~~~~~~~~~~~~~~~~~ !!! error TS7026: JSX element implicitly has type 'any' because no interface 'JSX.IntrinsicElements' exists. ~ @@ -218,7 +218,7 @@ jsxNamespacePrefixInName.tsx(28,24): error TS7026: JSX element implicitly has ty var upcaseComponent1 = ; // Parsed as intrinsic ~~~~~~~~~~~~~ !!! error TS7026: JSX element implicitly has type 'any' because no interface 'JSX.IntrinsicElements' exists. - var upcaseComponent2 = ; // Parsed as instrinsic + var upcaseComponent2 = ; // Parsed as intrinsic ~~~~~~~~~~~~~~~~~~ !!! error TS7026: JSX element implicitly has type 'any' because no interface 'JSX.IntrinsicElements' exists. \ No newline at end of file diff --git a/tests/baselines/reference/jsxNamespacePrefixInName.js b/tests/baselines/reference/jsxNamespacePrefixInName.js index 8544f8269993a..45a57dd65a82b 100644 --- a/tests/baselines/reference/jsxNamespacePrefixInName.js +++ b/tests/baselines/reference/jsxNamespacePrefixInName.js @@ -7,11 +7,11 @@ var justElement3 = ; var justElement4 = {"text"}; var justElement5 = {"text"}; -var tooManySeparators1 = ; -var tooManySeparators2 = ; -var tooManySeparators3 = ; -var tooManySeparators4 = {"text"}; -var tooManySeparators5 = {"text"}; +var tooManySeparators1 = ; +var tooManySeparators2 = ; +var tooManySeparators3 = ; +var tooManySeparators4 = {"text"}; +var tooManySeparators5 = {"text"}; var justAttribute1 = ; var justAttribute2 = ; @@ -28,7 +28,7 @@ var beginOfIdent1 = <:a attr={"value"} />; var beginOfIdent2 = ; var upcaseComponent1 = ; // Parsed as intrinsic -var upcaseComponent2 = ; // Parsed as instrinsic +var upcaseComponent2 = ; // Parsed as intrinsic //// [jsxNamespacePrefixInName.jsx] @@ -38,14 +38,14 @@ var justElement2 = ; var justElement3 = ; var justElement4 = {"text"}; var justElement5 = {"text"}; -var tooManySeparators1 = ; -var tooManySeparators2 = , ment; +var tooManySeparators1 = ; +var tooManySeparators2 = , meant; > ; -var tooManySeparators3 = , ment; +var tooManySeparators3 = , meant; > ; -var tooManySeparators4 = {"text"}, ment; +var tooManySeparators4 = {"text"}, meant; > ; -var tooManySeparators5 = {"text"}, ment; +var tooManySeparators5 = {"text"}, meant; > ; var justAttribute1 = ; var justAttribute2 = ; @@ -58,4 +58,4 @@ var endOfIdent2 = ; var beginOfIdent1 = < , a, attr = { "value": } / > ; var beginOfIdent2 = ; var upcaseComponent1 = ; // Parsed as intrinsic -var upcaseComponent2 = ; // Parsed as instrinsic +var upcaseComponent2 = ; // Parsed as intrinsic diff --git a/tests/baselines/reference/jsxNamespacePrefixInName.symbols b/tests/baselines/reference/jsxNamespacePrefixInName.symbols index b171e1cbb2e8a..73a18aac40811 100644 --- a/tests/baselines/reference/jsxNamespacePrefixInName.symbols +++ b/tests/baselines/reference/jsxNamespacePrefixInName.symbols @@ -18,31 +18,31 @@ var justElement5 = {"text"}; >justElement5 : Symbol(justElement5, Decl(jsxNamespacePrefixInName.tsx, 4, 3)) >attr : Symbol(attr, Decl(jsxNamespacePrefixInName.tsx, 4, 29)) -var tooManySeparators1 = ; +var tooManySeparators1 = ; >tooManySeparators1 : Symbol(tooManySeparators1, Decl(jsxNamespacePrefixInName.tsx, 6, 3)) ->ment : Symbol(ment, Decl(jsxNamespacePrefixInName.tsx, 6, 32)) +>meant : Symbol(meant, Decl(jsxNamespacePrefixInName.tsx, 6, 32)) -var tooManySeparators2 = ; +var tooManySeparators2 = ; >tooManySeparators2 : Symbol(tooManySeparators2, Decl(jsxNamespacePrefixInName.tsx, 7, 3)) ->ment : Symbol(ment, Decl(jsxNamespacePrefixInName.tsx, 7, 32)) ->ment : Symbol(ment, Decl(jsxNamespacePrefixInName.tsx, 7, 45), Decl(jsxNamespacePrefixInName.tsx, 8, 60), Decl(jsxNamespacePrefixInName.tsx, 9, 53), Decl(jsxNamespacePrefixInName.tsx, 10, 68)) +>meant : Symbol(meant, Decl(jsxNamespacePrefixInName.tsx, 7, 32)) +>meant : Symbol(meant, Decl(jsxNamespacePrefixInName.tsx, 7, 45), Decl(jsxNamespacePrefixInName.tsx, 8, 60), Decl(jsxNamespacePrefixInName.tsx, 9, 53), Decl(jsxNamespacePrefixInName.tsx, 10, 68)) -var tooManySeparators3 = ; +var tooManySeparators3 = ; >tooManySeparators3 : Symbol(tooManySeparators3, Decl(jsxNamespacePrefixInName.tsx, 8, 3)) ->ment : Symbol(ment, Decl(jsxNamespacePrefixInName.tsx, 8, 32)) +>meant : Symbol(meant, Decl(jsxNamespacePrefixInName.tsx, 8, 32)) >attr : Symbol(attr, Decl(jsxNamespacePrefixInName.tsx, 8, 36)) ->ment : Symbol(ment, Decl(jsxNamespacePrefixInName.tsx, 7, 45), Decl(jsxNamespacePrefixInName.tsx, 8, 60), Decl(jsxNamespacePrefixInName.tsx, 9, 53), Decl(jsxNamespacePrefixInName.tsx, 10, 68)) +>meant : Symbol(meant, Decl(jsxNamespacePrefixInName.tsx, 7, 45), Decl(jsxNamespacePrefixInName.tsx, 8, 60), Decl(jsxNamespacePrefixInName.tsx, 9, 53), Decl(jsxNamespacePrefixInName.tsx, 10, 68)) -var tooManySeparators4 = {"text"}; +var tooManySeparators4 = {"text"}; >tooManySeparators4 : Symbol(tooManySeparators4, Decl(jsxNamespacePrefixInName.tsx, 9, 3)) ->ment : Symbol(ment, Decl(jsxNamespacePrefixInName.tsx, 9, 32)) ->ment : Symbol(ment, Decl(jsxNamespacePrefixInName.tsx, 7, 45), Decl(jsxNamespacePrefixInName.tsx, 8, 60), Decl(jsxNamespacePrefixInName.tsx, 9, 53), Decl(jsxNamespacePrefixInName.tsx, 10, 68)) +>meant : Symbol(meant, Decl(jsxNamespacePrefixInName.tsx, 9, 32)) +>meant : Symbol(meant, Decl(jsxNamespacePrefixInName.tsx, 7, 45), Decl(jsxNamespacePrefixInName.tsx, 8, 60), Decl(jsxNamespacePrefixInName.tsx, 9, 53), Decl(jsxNamespacePrefixInName.tsx, 10, 68)) -var tooManySeparators5 = {"text"}; +var tooManySeparators5 = {"text"}; >tooManySeparators5 : Symbol(tooManySeparators5, Decl(jsxNamespacePrefixInName.tsx, 10, 3)) ->ment : Symbol(ment, Decl(jsxNamespacePrefixInName.tsx, 10, 32)) +>meant : Symbol(meant, Decl(jsxNamespacePrefixInName.tsx, 10, 32)) >attr : Symbol(attr, Decl(jsxNamespacePrefixInName.tsx, 10, 36)) ->ment : Symbol(ment, Decl(jsxNamespacePrefixInName.tsx, 7, 45), Decl(jsxNamespacePrefixInName.tsx, 8, 60), Decl(jsxNamespacePrefixInName.tsx, 9, 53), Decl(jsxNamespacePrefixInName.tsx, 10, 68)) +>meant : Symbol(meant, Decl(jsxNamespacePrefixInName.tsx, 7, 45), Decl(jsxNamespacePrefixInName.tsx, 8, 60), Decl(jsxNamespacePrefixInName.tsx, 9, 53), Decl(jsxNamespacePrefixInName.tsx, 10, 68)) var justAttribute1 = ; >justAttribute1 : Symbol(justAttribute1, Decl(jsxNamespacePrefixInName.tsx, 12, 3)) @@ -87,6 +87,6 @@ var beginOfIdent2 = ; var upcaseComponent1 = ; // Parsed as intrinsic >upcaseComponent1 : Symbol(upcaseComponent1, Decl(jsxNamespacePrefixInName.tsx, 26, 3)) -var upcaseComponent2 = ; // Parsed as instrinsic +var upcaseComponent2 = ; // Parsed as intrinsic >upcaseComponent2 : Symbol(upcaseComponent2, Decl(jsxNamespacePrefixInName.tsx, 27, 3)) diff --git a/tests/baselines/reference/jsxNamespacePrefixInName.types b/tests/baselines/reference/jsxNamespacePrefixInName.types index 2babb8b58f97a..137ec601695b5 100644 --- a/tests/baselines/reference/jsxNamespacePrefixInName.types +++ b/tests/baselines/reference/jsxNamespacePrefixInName.types @@ -79,34 +79,34 @@ var justElement5 = {"text"}; >element : any > : ^^^ -var tooManySeparators1 = ; +var tooManySeparators1 = ; >tooManySeparators1 : any > : ^^^ -> : any +> : any > : ^^^ >a : any > : ^^^ >ele : any > : ^^^ ->ment : true +>meant : true > : ^^^^ -var tooManySeparators2 = ; +var tooManySeparators2 = ; >tooManySeparators2 : any > : ^^^ -> : ^^^ >a : any > : ^^^ >ele : any > : ^^^ ->ment : true +>meant : true > : ^^^^ >a : any > : ^^^ >ele : any > : ^^^ ->ment : any +>meant : any > : ^^^ >> : boolean > : ^^^^^^^ @@ -115,16 +115,16 @@ var tooManySeparators2 = ; > : any > : ^^^ -var tooManySeparators3 = ; +var tooManySeparators3 = ; >tooManySeparators3 : any > : ^^^ -> : ^^^ >a : any > : ^^^ >ele : any > : ^^^ ->ment : true +>meant : true > : ^^^^ >attr : string > : ^^^^^^ @@ -134,7 +134,7 @@ var tooManySeparators3 = ; > : ^^^ >ele : any > : ^^^ ->ment : any +>meant : any > : ^^^ >> : boolean > : ^^^^^^^ @@ -143,16 +143,16 @@ var tooManySeparators3 = ; > : any > : ^^^ -var tooManySeparators4 = {"text"}; +var tooManySeparators4 = {"text"}; >tooManySeparators4 : any > : ^^^ ->{"text"}{"text"} : ^^^ >a : any > : ^^^ >ele : any > : ^^^ ->ment : true +>meant : true > : ^^^^ >"text" : "text" > : ^^^^^^ @@ -160,7 +160,7 @@ var tooManySeparators4 = {"text"}; > : ^^^ >ele : any > : ^^^ ->ment : any +>meant : any > : ^^^ >> : boolean > : ^^^^^^^ @@ -169,16 +169,16 @@ var tooManySeparators4 = {"text"}; > : any > : ^^^ -var tooManySeparators5 = {"text"}; +var tooManySeparators5 = {"text"}; >tooManySeparators5 : any > : ^^^ ->{"text"}{"text"} : ^^^ >a : any > : ^^^ >ele : any > : ^^^ ->ment : true +>meant : true > : ^^^^ >attr : string > : ^^^^^^ @@ -190,7 +190,7 @@ var tooManySeparators5 = {"text"}; > : ^^^ >ele : any > : ^^^ ->ment : any +>meant : any > : ^^^ >> : boolean > : ^^^^^^^ @@ -395,7 +395,7 @@ var upcaseComponent1 = ; // Parsed as intrinsic >Upcase : any > : ^^^ -var upcaseComponent2 = ; // Parsed as instrinsic +var upcaseComponent2 = ; // Parsed as intrinsic >upcaseComponent2 : any > : ^^^ > : any diff --git a/tests/baselines/reference/jsxNamespacePrefixInNameReact.errors.txt b/tests/baselines/reference/jsxNamespacePrefixInNameReact.errors.txt index 14bf28dcd9e8c..dfdb567fdce9c 100644 --- a/tests/baselines/reference/jsxNamespacePrefixInNameReact.errors.txt +++ b/tests/baselines/reference/jsxNamespacePrefixInNameReact.errors.txt @@ -91,12 +91,12 @@ jsxNamespacePrefixInNameReact.tsx(30,24): error TS7026: JSX element implicitly h ~~~~~~~~~~~~ !!! error TS7026: JSX element implicitly has type 'any' because no interface 'JSX.IntrinsicElements' exists. - var tooManySeparators1 = ; + var tooManySeparators1 = ; ~~~~~~~~~~~~~~ !!! error TS7026: JSX element implicitly has type 'any' because no interface 'JSX.IntrinsicElements' exists. ~ !!! error TS1003: Identifier expected. - var tooManySeparators2 = ; + var tooManySeparators2 = ; ~~~~~~~~~~~~ !!! error TS7026: JSX element implicitly has type 'any' because no interface 'JSX.IntrinsicElements' exists. ~ @@ -109,7 +109,7 @@ jsxNamespacePrefixInNameReact.tsx(30,24): error TS7026: JSX element implicitly h !!! error TS1005: ',' expected. ~ !!! error TS1109: Expression expected. - var tooManySeparators3 = ; + var tooManySeparators3 = ; ~~~~~~~~~~~~~~~~~~~~~~~~~~~ !!! error TS7026: JSX element implicitly has type 'any' because no interface 'JSX.IntrinsicElements' exists. ~ @@ -122,7 +122,7 @@ jsxNamespacePrefixInNameReact.tsx(30,24): error TS7026: JSX element implicitly h !!! error TS1005: ',' expected. ~ !!! error TS1109: Expression expected. - var tooManySeparators4 = {"text"}; + var tooManySeparators4 = {"text"}; ~~~~~~~~~~~~ !!! error TS7026: JSX element implicitly has type 'any' because no interface 'JSX.IntrinsicElements' exists. ~ @@ -135,7 +135,7 @@ jsxNamespacePrefixInNameReact.tsx(30,24): error TS7026: JSX element implicitly h !!! error TS1005: ',' expected. ~ !!! error TS1109: Expression expected. - var tooManySeparators5 = {"text"}; + var tooManySeparators5 = {"text"}; ~~~~~~~~~~~~~~~~~~~~~~~~~~~ !!! error TS7026: JSX element implicitly has type 'any' because no interface 'JSX.IntrinsicElements' exists. ~ @@ -220,7 +220,7 @@ jsxNamespacePrefixInNameReact.tsx(30,24): error TS7026: JSX element implicitly h var upcaseComponent1 = ; // Parsed as intrinsic ~~~~~~~~~~~~~ !!! error TS7026: JSX element implicitly has type 'any' because no interface 'JSX.IntrinsicElements' exists. - var upcaseComponent2 = ; // Parsed as instrinsic + var upcaseComponent2 = ; // Parsed as intrinsic ~~~~~~~~~~~~~~~~~~ !!! error TS7026: JSX element implicitly has type 'any' because no interface 'JSX.IntrinsicElements' exists. \ No newline at end of file diff --git a/tests/baselines/reference/jsxNamespacePrefixInNameReact.js b/tests/baselines/reference/jsxNamespacePrefixInNameReact.js index 8ea2d918dc785..ee19b9e283b01 100644 --- a/tests/baselines/reference/jsxNamespacePrefixInNameReact.js +++ b/tests/baselines/reference/jsxNamespacePrefixInNameReact.js @@ -9,11 +9,11 @@ var justElement3 = ; var justElement4 = {"text"}; var justElement5 = {"text"}; -var tooManySeparators1 = ; -var tooManySeparators2 = ; -var tooManySeparators3 = ; -var tooManySeparators4 = {"text"}; -var tooManySeparators5 = {"text"}; +var tooManySeparators1 = ; +var tooManySeparators2 = ; +var tooManySeparators3 = ; +var tooManySeparators4 = {"text"}; +var tooManySeparators5 = {"text"}; var justAttribute1 = ; var justAttribute2 = ; @@ -30,7 +30,7 @@ var beginOfIdent1 = <:a attr={"value"} />; var beginOfIdent2 = ; var upcaseComponent1 = ; // Parsed as intrinsic -var upcaseComponent2 = ; // Parsed as instrinsic +var upcaseComponent2 = ; // Parsed as intrinsic //// [jsxNamespacePrefixInNameReact.js] @@ -40,14 +40,14 @@ var justElement2 = React.createElement("a:element", null); var justElement3 = React.createElement("a:element", { attr: "value" }); var justElement4 = React.createElement("a:element", null, "text"); var justElement5 = React.createElement("a:element", { attr: "value" }, "text"); -var tooManySeparators1 = React.createElement("a:ele", { ment: true }); -var tooManySeparators2 = React.createElement("a:ele", { ment: true }), ment; +var tooManySeparators1 = React.createElement("a:ele", { meant: true }); +var tooManySeparators2 = React.createElement("a:ele", { meant: true }), meant; > ; -var tooManySeparators3 = React.createElement("a:ele", { ment: true, attr: "value" }), ment; +var tooManySeparators3 = React.createElement("a:ele", { meant: true, attr: "value" }), meant; > ; -var tooManySeparators4 = React.createElement("a:ele", { ment: true }, "text"), ment; +var tooManySeparators4 = React.createElement("a:ele", { meant: true }, "text"), meant; > ; -var tooManySeparators5 = React.createElement("a:ele", { ment: true, attr: "value" }, "text"), ment; +var tooManySeparators5 = React.createElement("a:ele", { meant: true, attr: "value" }, "text"), meant; > ; var justAttribute1 = React.createElement("element", { "a:attr": "value" }); var justAttribute2 = React.createElement("element", { "a:attr": "value" }); @@ -60,4 +60,4 @@ var endOfIdent2 = React.createElement("a", { "attr:": "value" }); var beginOfIdent1 = < , a, attr = { "value": } / > ; var beginOfIdent2 = React.createElement("a:attr", Object.assign({}, "value")); var upcaseComponent1 = React.createElement("ns:Upcase", null); // Parsed as intrinsic -var upcaseComponent2 = React.createElement("Upcase:element", null); // Parsed as instrinsic +var upcaseComponent2 = React.createElement("Upcase:element", null); // Parsed as intrinsic diff --git a/tests/baselines/reference/jsxNamespacePrefixInNameReact.symbols b/tests/baselines/reference/jsxNamespacePrefixInNameReact.symbols index 5694cf765ca15..a6e2ceeea0adb 100644 --- a/tests/baselines/reference/jsxNamespacePrefixInNameReact.symbols +++ b/tests/baselines/reference/jsxNamespacePrefixInNameReact.symbols @@ -21,31 +21,31 @@ var justElement5 = {"text"}; >justElement5 : Symbol(justElement5, Decl(jsxNamespacePrefixInNameReact.tsx, 6, 3)) >attr : Symbol(attr, Decl(jsxNamespacePrefixInNameReact.tsx, 6, 29)) -var tooManySeparators1 = ; +var tooManySeparators1 = ; >tooManySeparators1 : Symbol(tooManySeparators1, Decl(jsxNamespacePrefixInNameReact.tsx, 8, 3)) ->ment : Symbol(ment, Decl(jsxNamespacePrefixInNameReact.tsx, 8, 32)) +>meant : Symbol(meant, Decl(jsxNamespacePrefixInNameReact.tsx, 8, 32)) -var tooManySeparators2 = ; +var tooManySeparators2 = ; >tooManySeparators2 : Symbol(tooManySeparators2, Decl(jsxNamespacePrefixInNameReact.tsx, 9, 3)) ->ment : Symbol(ment, Decl(jsxNamespacePrefixInNameReact.tsx, 9, 32)) ->ment : Symbol(ment, Decl(jsxNamespacePrefixInNameReact.tsx, 9, 45), Decl(jsxNamespacePrefixInNameReact.tsx, 10, 60), Decl(jsxNamespacePrefixInNameReact.tsx, 11, 53), Decl(jsxNamespacePrefixInNameReact.tsx, 12, 68)) +>meant : Symbol(meant, Decl(jsxNamespacePrefixInNameReact.tsx, 9, 32)) +>meant : Symbol(meant, Decl(jsxNamespacePrefixInNameReact.tsx, 9, 45), Decl(jsxNamespacePrefixInNameReact.tsx, 10, 60), Decl(jsxNamespacePrefixInNameReact.tsx, 11, 53), Decl(jsxNamespacePrefixInNameReact.tsx, 12, 68)) -var tooManySeparators3 = ; +var tooManySeparators3 = ; >tooManySeparators3 : Symbol(tooManySeparators3, Decl(jsxNamespacePrefixInNameReact.tsx, 10, 3)) ->ment : Symbol(ment, Decl(jsxNamespacePrefixInNameReact.tsx, 10, 32)) +>meant : Symbol(meant, Decl(jsxNamespacePrefixInNameReact.tsx, 10, 32)) >attr : Symbol(attr, Decl(jsxNamespacePrefixInNameReact.tsx, 10, 36)) ->ment : Symbol(ment, Decl(jsxNamespacePrefixInNameReact.tsx, 9, 45), Decl(jsxNamespacePrefixInNameReact.tsx, 10, 60), Decl(jsxNamespacePrefixInNameReact.tsx, 11, 53), Decl(jsxNamespacePrefixInNameReact.tsx, 12, 68)) +>meant : Symbol(meant, Decl(jsxNamespacePrefixInNameReact.tsx, 9, 45), Decl(jsxNamespacePrefixInNameReact.tsx, 10, 60), Decl(jsxNamespacePrefixInNameReact.tsx, 11, 53), Decl(jsxNamespacePrefixInNameReact.tsx, 12, 68)) -var tooManySeparators4 = {"text"}; +var tooManySeparators4 = {"text"}; >tooManySeparators4 : Symbol(tooManySeparators4, Decl(jsxNamespacePrefixInNameReact.tsx, 11, 3)) ->ment : Symbol(ment, Decl(jsxNamespacePrefixInNameReact.tsx, 11, 32)) ->ment : Symbol(ment, Decl(jsxNamespacePrefixInNameReact.tsx, 9, 45), Decl(jsxNamespacePrefixInNameReact.tsx, 10, 60), Decl(jsxNamespacePrefixInNameReact.tsx, 11, 53), Decl(jsxNamespacePrefixInNameReact.tsx, 12, 68)) +>meant : Symbol(meant, Decl(jsxNamespacePrefixInNameReact.tsx, 11, 32)) +>meant : Symbol(meant, Decl(jsxNamespacePrefixInNameReact.tsx, 9, 45), Decl(jsxNamespacePrefixInNameReact.tsx, 10, 60), Decl(jsxNamespacePrefixInNameReact.tsx, 11, 53), Decl(jsxNamespacePrefixInNameReact.tsx, 12, 68)) -var tooManySeparators5 = {"text"}; +var tooManySeparators5 = {"text"}; >tooManySeparators5 : Symbol(tooManySeparators5, Decl(jsxNamespacePrefixInNameReact.tsx, 12, 3)) ->ment : Symbol(ment, Decl(jsxNamespacePrefixInNameReact.tsx, 12, 32)) +>meant : Symbol(meant, Decl(jsxNamespacePrefixInNameReact.tsx, 12, 32)) >attr : Symbol(attr, Decl(jsxNamespacePrefixInNameReact.tsx, 12, 36)) ->ment : Symbol(ment, Decl(jsxNamespacePrefixInNameReact.tsx, 9, 45), Decl(jsxNamespacePrefixInNameReact.tsx, 10, 60), Decl(jsxNamespacePrefixInNameReact.tsx, 11, 53), Decl(jsxNamespacePrefixInNameReact.tsx, 12, 68)) +>meant : Symbol(meant, Decl(jsxNamespacePrefixInNameReact.tsx, 9, 45), Decl(jsxNamespacePrefixInNameReact.tsx, 10, 60), Decl(jsxNamespacePrefixInNameReact.tsx, 11, 53), Decl(jsxNamespacePrefixInNameReact.tsx, 12, 68)) var justAttribute1 = ; >justAttribute1 : Symbol(justAttribute1, Decl(jsxNamespacePrefixInNameReact.tsx, 14, 3)) @@ -90,6 +90,6 @@ var beginOfIdent2 = ; var upcaseComponent1 = ; // Parsed as intrinsic >upcaseComponent1 : Symbol(upcaseComponent1, Decl(jsxNamespacePrefixInNameReact.tsx, 28, 3)) -var upcaseComponent2 = ; // Parsed as instrinsic +var upcaseComponent2 = ; // Parsed as intrinsic >upcaseComponent2 : Symbol(upcaseComponent2, Decl(jsxNamespacePrefixInNameReact.tsx, 29, 3)) diff --git a/tests/baselines/reference/jsxNamespacePrefixInNameReact.types b/tests/baselines/reference/jsxNamespacePrefixInNameReact.types index bd139d675dd6a..03a790ff2ed0c 100644 --- a/tests/baselines/reference/jsxNamespacePrefixInNameReact.types +++ b/tests/baselines/reference/jsxNamespacePrefixInNameReact.types @@ -83,34 +83,34 @@ var justElement5 = {"text"}; >element : any > : ^^^ -var tooManySeparators1 = ; +var tooManySeparators1 = ; >tooManySeparators1 : any > : ^^^ -> : any +> : any > : ^^^ >a : any > : ^^^ >ele : any > : ^^^ ->ment : true +>meant : true > : ^^^^ -var tooManySeparators2 = ; +var tooManySeparators2 = ; >tooManySeparators2 : any > : ^^^ -> : ^^^ >a : any > : ^^^ >ele : any > : ^^^ ->ment : true +>meant : true > : ^^^^ >a : any > : ^^^ >ele : any > : ^^^ ->ment : any +>meant : any > : ^^^ >> : boolean > : ^^^^^^^ @@ -119,16 +119,16 @@ var tooManySeparators2 = ; > : any > : ^^^ -var tooManySeparators3 = ; +var tooManySeparators3 = ; >tooManySeparators3 : any > : ^^^ -> : ^^^ >a : any > : ^^^ >ele : any > : ^^^ ->ment : true +>meant : true > : ^^^^ >attr : string > : ^^^^^^ @@ -138,7 +138,7 @@ var tooManySeparators3 = ; > : ^^^ >ele : any > : ^^^ ->ment : any +>meant : any > : ^^^ >> : boolean > : ^^^^^^^ @@ -147,16 +147,16 @@ var tooManySeparators3 = ; > : any > : ^^^ -var tooManySeparators4 = {"text"}; +var tooManySeparators4 = {"text"}; >tooManySeparators4 : any > : ^^^ ->{"text"}{"text"} : ^^^ >a : any > : ^^^ >ele : any > : ^^^ ->ment : true +>meant : true > : ^^^^ >"text" : "text" > : ^^^^^^ @@ -164,7 +164,7 @@ var tooManySeparators4 = {"text"}; > : ^^^ >ele : any > : ^^^ ->ment : any +>meant : any > : ^^^ >> : boolean > : ^^^^^^^ @@ -173,16 +173,16 @@ var tooManySeparators4 = {"text"}; > : any > : ^^^ -var tooManySeparators5 = {"text"}; +var tooManySeparators5 = {"text"}; >tooManySeparators5 : any > : ^^^ ->{"text"}{"text"} : ^^^ >a : any > : ^^^ >ele : any > : ^^^ ->ment : true +>meant : true > : ^^^^ >attr : string > : ^^^^^^ @@ -194,7 +194,7 @@ var tooManySeparators5 = {"text"}; > : ^^^ >ele : any > : ^^^ ->ment : any +>meant : any > : ^^^ >> : boolean > : ^^^^^^^ @@ -399,7 +399,7 @@ var upcaseComponent1 = ; // Parsed as intrinsic >Upcase : any > : ^^^ -var upcaseComponent2 = ; // Parsed as instrinsic +var upcaseComponent2 = ; // Parsed as intrinsic >upcaseComponent2 : any > : ^^^ > : any diff --git a/tests/baselines/reference/localGetReferences.baseline.jsonc b/tests/baselines/reference/localGetReferences.baseline.jsonc index ada4a5521420b..b7ba31b08f0b2 100644 --- a/tests/baselines/reference/localGetReferences.baseline.jsonc +++ b/tests/baselines/reference/localGetReferences.baseline.jsonc @@ -1,6 +1,6 @@ // === findAllReferences === // === /tests/cases/fourslash/localGetReferences_1.ts === -// // Comment Refence Test: globalVar +// // Comment Reference Test: globalVar // // References to a variable declared in global. // /*FIND ALL REFS*/<|var [|{| isWriteAccess: true, isDefinition: true |}globalVar|]: number = 2;|> // @@ -70,7 +70,7 @@ // === Definitions === // === /tests/cases/fourslash/localGetReferences_1.ts === - // // Comment Refence Test: globalVar + // // Comment Reference Test: globalVar // // References to a variable declared in global. // /*FIND ALL REFS*/<|var [|globalVar|]: number = 2;|> // @@ -118,7 +118,7 @@ // === findAllReferences === // === /tests/cases/fourslash/localGetReferences_1.ts === -// // Comment Refence Test: globalVar +// // Comment Reference Test: globalVar // // References to a variable declared in global. // <|var /*FIND ALL REFS*/[|{| isWriteAccess: true, isDefinition: true |}globalVar|]: number = 2;|> // @@ -188,7 +188,7 @@ // === Definitions === // === /tests/cases/fourslash/localGetReferences_1.ts === - // // Comment Refence Test: globalVar + // // Comment Reference Test: globalVar // // References to a variable declared in global. // <|var /*FIND ALL REFS*/[|globalVar|]: number = 2;|> // @@ -739,7 +739,7 @@ // === findAllReferences === // === /tests/cases/fourslash/localGetReferences_1.ts === -// // Comment Refence Test: globalVar +// // Comment Reference Test: globalVar // // References to a variable declared in global. // <|var [|{| isWriteAccess: true |}globalVar|]: number = 2;|> // @@ -809,7 +809,7 @@ // === Definitions === // === /tests/cases/fourslash/localGetReferences_1.ts === - // // Comment Refence Test: globalVar + // // Comment Reference Test: globalVar // // References to a variable declared in global. // <|var [|globalVar|]: number = 2;|> // @@ -1853,7 +1853,7 @@ // === findAllReferences === // === /tests/cases/fourslash/localGetReferences_1.ts === -// // Comment Refence Test: globalVar +// // Comment Reference Test: globalVar // // References to a variable declared in global. // <|var [|{| isWriteAccess: true |}globalVar|]: number = 2;|> // @@ -1923,7 +1923,7 @@ // === Definitions === // === /tests/cases/fourslash/localGetReferences_1.ts === - // // Comment Refence Test: globalVar + // // Comment Reference Test: globalVar // // References to a variable declared in global. // <|var [|globalVar|]: number = 2;|> // @@ -2153,7 +2153,7 @@ // === findAllReferences === // === /tests/cases/fourslash/localGetReferences_1.ts === -// // Comment Refence Test: globalVar +// // Comment Reference Test: globalVar // // References to a variable declared in global. // <|var [|{| isWriteAccess: true |}globalVar|]: number = 2;|> // @@ -2223,7 +2223,7 @@ // === Definitions === // === /tests/cases/fourslash/localGetReferences_1.ts === - // // Comment Refence Test: globalVar + // // Comment Reference Test: globalVar // // References to a variable declared in global. // <|var [|globalVar|]: number = 2;|> // @@ -2743,7 +2743,7 @@ // === findAllReferences === // === /tests/cases/fourslash/localGetReferences_1.ts === -// // Comment Refence Test: globalVar +// // Comment Reference Test: globalVar // // References to a variable declared in global. // <|var [|{| isWriteAccess: true |}globalVar|]: number = 2;|> // @@ -2813,7 +2813,7 @@ // === Definitions === // === /tests/cases/fourslash/localGetReferences_1.ts === - // // Comment Refence Test: globalVar + // // Comment Reference Test: globalVar // // References to a variable declared in global. // <|var [|globalVar|]: number = 2;|> // @@ -3170,7 +3170,7 @@ // === findAllReferences === // === /tests/cases/fourslash/localGetReferences_1.ts === -// // Comment Refence Test: globalVar +// // Comment Reference Test: globalVar // // References to a variable declared in global. // <|var [|{| isWriteAccess: true |}globalVar|]: number = 2;|> // @@ -3240,7 +3240,7 @@ // === Definitions === // === /tests/cases/fourslash/localGetReferences_1.ts === - // // Comment Refence Test: globalVar + // // Comment Reference Test: globalVar // // References to a variable declared in global. // <|var [|globalVar|]: number = 2;|> // @@ -3461,7 +3461,7 @@ // === findAllReferences === // === /tests/cases/fourslash/localGetReferences_1.ts === -// // Comment Refence Test: globalVar +// // Comment Reference Test: globalVar // // References to a variable declared in global. // <|var [|{| isWriteAccess: true |}globalVar|]: number = 2;|> // @@ -3531,7 +3531,7 @@ // === Definitions === // === /tests/cases/fourslash/localGetReferences_1.ts === - // // Comment Refence Test: globalVar + // // Comment Reference Test: globalVar // // References to a variable declared in global. // <|var [|globalVar|]: number = 2;|> // @@ -3725,7 +3725,7 @@ // === findAllReferences === // === /tests/cases/fourslash/localGetReferences_1.ts === -// // Comment Refence Test: globalVar +// // Comment Reference Test: globalVar // // References to a variable declared in global. // <|var [|{| isWriteAccess: true |}globalVar|]: number = 2;|> // @@ -3795,7 +3795,7 @@ // === Definitions === // === /tests/cases/fourslash/localGetReferences_1.ts === - // // Comment Refence Test: globalVar + // // Comment Reference Test: globalVar // // References to a variable declared in global. // <|var [|globalVar|]: number = 2;|> // @@ -3853,7 +3853,7 @@ // === findAllReferences === // === /tests/cases/fourslash/localGetReferences_1.ts === -// // Comment Refence Test: globalVar +// // Comment Reference Test: globalVar // // References to a variable declared in global. // <|var [|{| isWriteAccess: true |}globalVar|]: number = 2;|> // @@ -3923,7 +3923,7 @@ // === Definitions === // === /tests/cases/fourslash/localGetReferences_1.ts === - // // Comment Refence Test: globalVar + // // Comment Reference Test: globalVar // // References to a variable declared in global. // <|var [|globalVar|]: number = 2;|> // @@ -3981,7 +3981,7 @@ // === findAllReferences === // === /tests/cases/fourslash/localGetReferences_1.ts === -// // Comment Refence Test: globalVar +// // Comment Reference Test: globalVar // // References to a variable declared in global. // <|var [|{| isWriteAccess: true |}globalVar|]: number = 2;|> // @@ -4051,7 +4051,7 @@ // === Definitions === // === /tests/cases/fourslash/localGetReferences_1.ts === - // // Comment Refence Test: globalVar + // // Comment Reference Test: globalVar // // References to a variable declared in global. // <|var [|globalVar|]: number = 2;|> // @@ -4109,7 +4109,7 @@ // === findAllReferences === // === /tests/cases/fourslash/localGetReferences_1.ts === -// // Comment Refence Test: globalVar +// // Comment Reference Test: globalVar // // References to a variable declared in global. // <|var [|{| isWriteAccess: true |}globalVar|]: number = 2;|> // @@ -4179,7 +4179,7 @@ // === Definitions === // === /tests/cases/fourslash/localGetReferences_1.ts === - // // Comment Refence Test: globalVar + // // Comment Reference Test: globalVar // // References to a variable declared in global. // <|var [|globalVar|]: number = 2;|> // @@ -4936,7 +4936,7 @@ // === findAllReferences === // === /tests/cases/fourslash/localGetReferences_1.ts === -// // Comment Refence Test: g/*FIND ALL REFS*/lobalVar +// // Comment Reference Test: g/*FIND ALL REFS*/lobalVar // // References to a variable declared in global. // var globalVar: number = 2; // diff --git a/tests/baselines/reference/missingFunctionImplementation.errors.txt b/tests/baselines/reference/missingFunctionImplementation.errors.txt index 223eb64ced713..ae0d377a45b4d 100644 --- a/tests/baselines/reference/missingFunctionImplementation.errors.txt +++ b/tests/baselines/reference/missingFunctionImplementation.errors.txt @@ -119,7 +119,7 @@ missingFunctionImplementation.ts(77,19): error TS2393: Duplicate function implem export function m(a): void { } } - // merged namespaces, duplicate defintions + // merged namespaces, duplicate definitions namespace N12 { export function m(a): void; ~ diff --git a/tests/baselines/reference/missingFunctionImplementation.js b/tests/baselines/reference/missingFunctionImplementation.js index 6984eb218a185..4986a89caecd3 100644 --- a/tests/baselines/reference/missingFunctionImplementation.js +++ b/tests/baselines/reference/missingFunctionImplementation.js @@ -70,7 +70,7 @@ namespace N10 { export function m(a): void { } } -// merged namespaces, duplicate defintions +// merged namespaces, duplicate definitions namespace N12 { export function m(a): void; export function m(): void; @@ -123,7 +123,7 @@ var N10; function m(a) { } N10.m = m; })(N10 || (N10 = {})); -// merged namespaces, duplicate defintions +// merged namespaces, duplicate definitions var N12; (function (N12) { function m(a) { } diff --git a/tests/baselines/reference/missingFunctionImplementation.symbols b/tests/baselines/reference/missingFunctionImplementation.symbols index a82a0b028ef24..0d69185d9e3b4 100644 --- a/tests/baselines/reference/missingFunctionImplementation.symbols +++ b/tests/baselines/reference/missingFunctionImplementation.symbols @@ -136,7 +136,7 @@ namespace N10 { >a : Symbol(a, Decl(missingFunctionImplementation.ts, 66, 20)) } -// merged namespaces, duplicate defintions +// merged namespaces, duplicate definitions namespace N12 { >N12 : Symbol(N12, Decl(missingFunctionImplementation.ts, 67, 1), Decl(missingFunctionImplementation.ts, 74, 1)) diff --git a/tests/baselines/reference/missingFunctionImplementation.types b/tests/baselines/reference/missingFunctionImplementation.types index 856c55b984858..995f0b1db71d5 100644 --- a/tests/baselines/reference/missingFunctionImplementation.types +++ b/tests/baselines/reference/missingFunctionImplementation.types @@ -177,7 +177,7 @@ namespace N10 { > : ^^^ } -// merged namespaces, duplicate defintions +// merged namespaces, duplicate definitions namespace N12 { >N12 : typeof N12 > : ^^^^^^^^^^ diff --git a/tests/baselines/reference/mixinPrivateAndProtected.errors.txt b/tests/baselines/reference/mixinPrivateAndProtected.errors.txt index d9ed88fa5d170..27e11ff7bd51d 100644 --- a/tests/baselines/reference/mixinPrivateAndProtected.errors.txt +++ b/tests/baselines/reference/mixinPrivateAndProtected.errors.txt @@ -28,20 +28,20 @@ mixinPrivateAndProtected.ts(85,2): error TS2564: Property 'accountBalance' has n class A { public pb: number = 2; - protected ptd: number = 1; + protected pdf: number = 1; private pvt: number = 0; } function mixB>(Cls: T) { return class extends Cls { - protected ptd: number = 10; + protected pdf: number = 10; private pvt: number = 0; }; } function mixB2>(Cls: T) { return class extends Cls { - protected ptd: number = 10; + protected pdf: number = 10; }; } @@ -51,7 +51,7 @@ mixinPrivateAndProtected.ts(85,2): error TS2564: Property 'accountBalance' has n function mixC>(Cls: T) { return class extends Cls { - protected ptd: number = 100; + protected pdf: number = 100; private pvt: number = 0; }; } @@ -67,7 +67,7 @@ mixinPrivateAndProtected.ts(85,2): error TS2564: Property 'accountBalance' has n ab2c = new AB2C(); a.pb.toFixed(); - a.ptd.toFixed(); // Error + a.pdf.toFixed(); // Error ~~~ !!! error TS2445: Property 'ptd' is protected and only accessible within class 'A' and its subclasses. a.pvt.toFixed(); // Error @@ -78,7 +78,7 @@ mixinPrivateAndProtected.ts(85,2): error TS2564: Property 'accountBalance' has n ~~ !!! error TS2339: Property 'pb' does not exist on type 'never'. !!! error TS2339: The intersection 'mixB.(Anonymous class) & A' was reduced to 'never' because property 'pvt' exists in multiple constituents and is private in some. - ab.ptd.toFixed(); // Error + ab.pdf.toFixed(); // Error ~~~ !!! error TS2339: Property 'ptd' does not exist on type 'never'. !!! error TS2339: The intersection 'mixB.(Anonymous class) & A' was reduced to 'never' because property 'pvt' exists in multiple constituents and is private in some. @@ -91,7 +91,7 @@ mixinPrivateAndProtected.ts(85,2): error TS2564: Property 'accountBalance' has n ~~ !!! error TS2339: Property 'pb' does not exist on type 'never'. !!! error TS2339: The intersection 'mixC<{ new (...args: any[]): mixB.(Anonymous class); prototype: mixB.(Anonymous class); } & typeof A>.(Anonymous class) & mixB.(Anonymous class) & A' was reduced to 'never' because property 'pvt' exists in multiple constituents and is private in some. - abc.ptd.toFixed(); // Error + abc.pdf.toFixed(); // Error ~~~ !!! error TS2339: Property 'ptd' does not exist on type 'never'. !!! error TS2339: The intersection 'mixC<{ new (...args: any[]): mixB.(Anonymous class); prototype: mixB.(Anonymous class); } & typeof A>.(Anonymous class) & mixB.(Anonymous class) & A' was reduced to 'never' because property 'pvt' exists in multiple constituents and is private in some. @@ -104,7 +104,7 @@ mixinPrivateAndProtected.ts(85,2): error TS2564: Property 'accountBalance' has n ~~ !!! error TS2339: Property 'pb' does not exist on type 'never'. !!! error TS2339: The intersection 'mixC<{ new (...args: any[]): mixB2.(Anonymous class); prototype: mixB2.(Anonymous class); } & typeof A>.(Anonymous class) & mixB2.(Anonymous class) & A' was reduced to 'never' because property 'pvt' exists in multiple constituents and is private in some. - ab2c.ptd.toFixed(); // Error + ab2c.pdf.toFixed(); // Error ~~~ !!! error TS2339: Property 'ptd' does not exist on type 'never'. !!! error TS2339: The intersection 'mixC<{ new (...args: any[]): mixB2.(Anonymous class); prototype: mixB2.(Anonymous class); } & typeof A>.(Anonymous class) & mixB2.(Anonymous class) & A' was reduced to 'never' because property 'pvt' exists in multiple constituents and is private in some. diff --git a/tests/baselines/reference/mixinPrivateAndProtected.js b/tests/baselines/reference/mixinPrivateAndProtected.js index f61be38998a83..06f6ac9843343 100644 --- a/tests/baselines/reference/mixinPrivateAndProtected.js +++ b/tests/baselines/reference/mixinPrivateAndProtected.js @@ -7,20 +7,20 @@ type Constructor = new(...args: any[]) => T; class A { public pb: number = 2; - protected ptd: number = 1; + protected pdf: number = 1; private pvt: number = 0; } function mixB>(Cls: T) { return class extends Cls { - protected ptd: number = 10; + protected pdf: number = 10; private pvt: number = 0; }; } function mixB2>(Cls: T) { return class extends Cls { - protected ptd: number = 10; + protected pdf: number = 10; }; } @@ -30,7 +30,7 @@ const function mixC>(Cls: T) { return class extends Cls { - protected ptd: number = 100; + protected pdf: number = 100; private pvt: number = 0; }; } @@ -46,19 +46,19 @@ const ab2c = new AB2C(); a.pb.toFixed(); -a.ptd.toFixed(); // Error +a.pdf.toFixed(); // Error a.pvt.toFixed(); // Error ab.pb.toFixed(); -ab.ptd.toFixed(); // Error +ab.pdf.toFixed(); // Error ab.pvt.toFixed(); // Error abc.pb.toFixed(); -abc.ptd.toFixed(); // Error +abc.pdf.toFixed(); // Error abc.pvt.toFixed(); // Error ab2c.pb.toFixed(); -ab2c.ptd.toFixed(); // Error +ab2c.pdf.toFixed(); // Error ab2c.pvt.toFixed(); // Error // Repro from #13924 @@ -97,7 +97,7 @@ class Customer extends PersonMixin(Person) { class A { constructor() { this.pb = 2; - this.ptd = 1; + this.pdf = 1; this.pvt = 0; } } @@ -105,7 +105,7 @@ function mixB(Cls) { return class extends Cls { constructor() { super(...arguments); - this.ptd = 10; + this.pdf = 10; this.pvt = 0; } }; @@ -114,7 +114,7 @@ function mixB2(Cls) { return class extends Cls { constructor() { super(...arguments); - this.ptd = 10; + this.pdf = 10; } }; } @@ -123,7 +123,7 @@ function mixC(Cls) { return class extends Cls { constructor() { super(...arguments); - this.ptd = 100; + this.pdf = 100; this.pvt = 0; } }; @@ -131,16 +131,16 @@ function mixC(Cls) { const AB2C = mixC(AB2), ABC = mixC(AB); const a = new A(), ab = new AB(), abc = new ABC(), ab2c = new AB2C(); a.pb.toFixed(); -a.ptd.toFixed(); // Error +a.pdf.toFixed(); // Error a.pvt.toFixed(); // Error ab.pb.toFixed(); -ab.ptd.toFixed(); // Error +ab.pdf.toFixed(); // Error ab.pvt.toFixed(); // Error abc.pb.toFixed(); -abc.ptd.toFixed(); // Error +abc.pdf.toFixed(); // Error abc.pvt.toFixed(); // Error ab2c.pb.toFixed(); -ab2c.ptd.toFixed(); // Error +ab2c.pdf.toFixed(); // Error ab2c.pvt.toFixed(); // Error // Repro from #13924 class Person { diff --git a/tests/baselines/reference/mixinPrivateAndProtected.symbols b/tests/baselines/reference/mixinPrivateAndProtected.symbols index 89dc1aaff5557..e7fe5a937848d 100644 --- a/tests/baselines/reference/mixinPrivateAndProtected.symbols +++ b/tests/baselines/reference/mixinPrivateAndProtected.symbols @@ -15,8 +15,8 @@ class A { public pb: number = 2; >pb : Symbol(A.pb, Decl(mixinPrivateAndProtected.ts, 4, 9)) - protected ptd: number = 1; ->ptd : Symbol(A.ptd, Decl(mixinPrivateAndProtected.ts, 5, 26)) + protected pdf: number = 1; +>pdf : Symbol(A.pdf, Decl(mixinPrivateAndProtected.ts, 5, 26)) private pvt: number = 0; >pvt : Symbol(A.pvt, Decl(mixinPrivateAndProtected.ts, 6, 30)) @@ -32,8 +32,8 @@ function mixB>(Cls: T) { return class extends Cls { >Cls : Symbol(Cls, Decl(mixinPrivateAndProtected.ts, 10, 41)) - protected ptd: number = 10; ->ptd : Symbol((Anonymous class).ptd, Decl(mixinPrivateAndProtected.ts, 11, 30)) + protected pdf: number = 10; +>pdf : Symbol((Anonymous class).pdf, Decl(mixinPrivateAndProtected.ts, 11, 30)) private pvt: number = 0; >pvt : Symbol((Anonymous class).pvt, Decl(mixinPrivateAndProtected.ts, 12, 35)) @@ -52,8 +52,8 @@ function mixB2>(Cls: T) { return class extends Cls { >Cls : Symbol(Cls, Decl(mixinPrivateAndProtected.ts, 17, 41)) - protected ptd: number = 10; ->ptd : Symbol((Anonymous class).ptd, Decl(mixinPrivateAndProtected.ts, 18, 30)) + protected pdf: number = 10; +>pdf : Symbol((Anonymous class).pdf, Decl(mixinPrivateAndProtected.ts, 18, 30)) }; } @@ -79,8 +79,8 @@ function mixC>(Cls: T) { return class extends Cls { >Cls : Symbol(Cls, Decl(mixinPrivateAndProtected.ts, 27, 41)) - protected ptd: number = 100; ->ptd : Symbol((Anonymous class).ptd, Decl(mixinPrivateAndProtected.ts, 28, 30)) + protected pdf: number = 100; +>pdf : Symbol((Anonymous class).pdf, Decl(mixinPrivateAndProtected.ts, 28, 30)) private pvt: number = 0; >pvt : Symbol((Anonymous class).pvt, Decl(mixinPrivateAndProtected.ts, 29, 36)) @@ -123,11 +123,11 @@ a.pb.toFixed(); >pb : Symbol(A.pb, Decl(mixinPrivateAndProtected.ts, 4, 9)) >toFixed : Symbol(Number.toFixed, Decl(lib.es5.d.ts, --, --)) -a.ptd.toFixed(); // Error ->a.ptd.toFixed : Symbol(Number.toFixed, Decl(lib.es5.d.ts, --, --)) ->a.ptd : Symbol(A.ptd, Decl(mixinPrivateAndProtected.ts, 5, 26)) +a.pdf.toFixed(); // Error +>a.pdf.toFixed : Symbol(Number.toFixed, Decl(lib.es5.d.ts, --, --)) +>a.pdf : Symbol(A.pdf, Decl(mixinPrivateAndProtected.ts, 5, 26)) >a : Symbol(a, Decl(mixinPrivateAndProtected.ts, 38, 5)) ->ptd : Symbol(A.ptd, Decl(mixinPrivateAndProtected.ts, 5, 26)) +>pdf : Symbol(A.pdf, Decl(mixinPrivateAndProtected.ts, 5, 26)) >toFixed : Symbol(Number.toFixed, Decl(lib.es5.d.ts, --, --)) a.pvt.toFixed(); // Error @@ -140,7 +140,7 @@ a.pvt.toFixed(); // Error ab.pb.toFixed(); >ab : Symbol(ab, Decl(mixinPrivateAndProtected.ts, 39, 16)) -ab.ptd.toFixed(); // Error +ab.pdf.toFixed(); // Error >ab : Symbol(ab, Decl(mixinPrivateAndProtected.ts, 39, 16)) ab.pvt.toFixed(); // Error @@ -149,7 +149,7 @@ ab.pvt.toFixed(); // Error abc.pb.toFixed(); >abc : Symbol(abc, Decl(mixinPrivateAndProtected.ts, 40, 18)) -abc.ptd.toFixed(); // Error +abc.pdf.toFixed(); // Error >abc : Symbol(abc, Decl(mixinPrivateAndProtected.ts, 40, 18)) abc.pvt.toFixed(); // Error @@ -158,7 +158,7 @@ abc.pvt.toFixed(); // Error ab2c.pb.toFixed(); >ab2c : Symbol(ab2c, Decl(mixinPrivateAndProtected.ts, 41, 20)) -ab2c.ptd.toFixed(); // Error +ab2c.pdf.toFixed(); // Error >ab2c : Symbol(ab2c, Decl(mixinPrivateAndProtected.ts, 41, 20)) ab2c.pvt.toFixed(); // Error diff --git a/tests/baselines/reference/mixinPrivateAndProtected.types b/tests/baselines/reference/mixinPrivateAndProtected.types index e0948d6a56c62..1695ed64f2d22 100644 --- a/tests/baselines/reference/mixinPrivateAndProtected.types +++ b/tests/baselines/reference/mixinPrivateAndProtected.types @@ -19,8 +19,8 @@ class A { >2 : 2 > : ^ - protected ptd: number = 1; ->ptd : number + protected pdf: number = 1; +>pdf : number > : ^^^^^^ >1 : 1 > : ^ @@ -39,13 +39,13 @@ function mixB>(Cls: T) { > : ^ return class extends Cls { ->class extends Cls { protected ptd: number = 10; private pvt: number = 0; } : { new (...args: any[]): (Anonymous class); prototype: mixB.(Anonymous class); } & T +>class extends Cls { protected pdf: number = 10; private pvt: number = 0; } : { new (...args: any[]): (Anonymous class); prototype: mixB.(Anonymous class); } & T > : ^^^^^^^^^^ ^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ >Cls : {} > : ^^ - protected ptd: number = 10; ->ptd : number + protected pdf: number = 10; +>pdf : number > : ^^^^^^ >10 : 10 > : ^^ @@ -66,13 +66,13 @@ function mixB2>(Cls: T) { > : ^ return class extends Cls { ->class extends Cls { protected ptd: number = 10; } : { new (...args: any[]): (Anonymous class); prototype: mixB2.(Anonymous class); } & T +>class extends Cls { protected pdf: number = 10; } : { new (...args: any[]): (Anonymous class); prototype: mixB2.(Anonymous class); } & T > : ^^^^^^^^^^ ^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ >Cls : A > : ^ - protected ptd: number = 10; ->ptd : number + protected pdf: number = 10; +>pdf : number > : ^^^^^^ >10 : 10 > : ^^ @@ -108,13 +108,13 @@ function mixC>(Cls: T) { > : ^ return class extends Cls { ->class extends Cls { protected ptd: number = 100; private pvt: number = 0; } : { new (...args: any[]): (Anonymous class); prototype: mixC.(Anonymous class); } & T +>class extends Cls { protected pdf: number = 100; private pvt: number = 0; } : { new (...args: any[]): (Anonymous class); prototype: mixC.(Anonymous class); } & T > : ^^^^^^^^^^ ^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ >Cls : {} > : ^^ - protected ptd: number = 100; ->ptd : number + protected pdf: number = 100; +>pdf : number > : ^^^^^^ >100 : 100 > : ^^^ @@ -196,16 +196,16 @@ a.pb.toFixed(); >toFixed : (fractionDigits?: number) => string > : ^ ^^^ ^^^^^ -a.ptd.toFixed(); // Error ->a.ptd.toFixed() : string +a.pdf.toFixed(); // Error +>a.pdf.toFixed() : string > : ^^^^^^ ->a.ptd.toFixed : (fractionDigits?: number) => string +>a.pdf.toFixed : (fractionDigits?: number) => string > : ^ ^^^ ^^^^^ ->a.ptd : number +>a.pdf : number > : ^^^^^^ >a : A > : ^ ->ptd : number +>pdf : number > : ^^^^^^ >toFixed : (fractionDigits?: number) => string > : ^ ^^^ ^^^^^ @@ -238,16 +238,16 @@ ab.pb.toFixed(); >toFixed : any > : ^^^ -ab.ptd.toFixed(); // Error ->ab.ptd.toFixed() : any +ab.pdf.toFixed(); // Error +>ab.pdf.toFixed() : any > : ^^^ ->ab.ptd.toFixed : any +>ab.pdf.toFixed : any > : ^^^ ->ab.ptd : any +>ab.pdf : any > : ^^^ >ab : never > : ^^^^^ ->ptd : any +>pdf : any > : ^^^ >toFixed : any > : ^^^ @@ -280,16 +280,16 @@ abc.pb.toFixed(); >toFixed : any > : ^^^ -abc.ptd.toFixed(); // Error ->abc.ptd.toFixed() : any +abc.pdf.toFixed(); // Error +>abc.pdf.toFixed() : any > : ^^^ ->abc.ptd.toFixed : any +>abc.pdf.toFixed : any > : ^^^ ->abc.ptd : any +>abc.pdf : any > : ^^^ >abc : never > : ^^^^^ ->ptd : any +>pdf : any > : ^^^ >toFixed : any > : ^^^ @@ -322,16 +322,16 @@ ab2c.pb.toFixed(); >toFixed : any > : ^^^ -ab2c.ptd.toFixed(); // Error ->ab2c.ptd.toFixed() : any +ab2c.pdf.toFixed(); // Error +>ab2c.pdf.toFixed() : any > : ^^^ ->ab2c.ptd.toFixed : any +>ab2c.pdf.toFixed : any > : ^^^ ->ab2c.ptd : any +>ab2c.pdf : any > : ^^^ >ab2c : never > : ^^^^^ ->ptd : any +>pdf : any > : ^^^ >toFixed : any > : ^^^ diff --git a/tests/baselines/reference/moduleResolution/relative-module-name-as-file.js b/tests/baselines/reference/moduleResolution/relative-module-name-as-file.js index 79b37762a7635..7f9f9d493e7fc 100644 --- a/tests/baselines/reference/moduleResolution/relative-module-name-as-file.js +++ b/tests/baselines/reference/moduleResolution/relative-module-name-as-file.js @@ -222,7 +222,7 @@ Resolution:: { } -load as file with name starting with directory seperator +load as file with name starting with directory separator Resolving "/foo" from /foo/bar/baz.ts when module has extension: .ts //// [/foo/bar/baz.ts] diff --git a/tests/baselines/reference/narrowFromAnyWithInstanceof.errors.txt b/tests/baselines/reference/narrowFromAnyWithInstanceof.errors.txt index 1c7e2611eab5e..99e7a7804d326 100644 --- a/tests/baselines/reference/narrowFromAnyWithInstanceof.errors.txt +++ b/tests/baselines/reference/narrowFromAnyWithInstanceof.errors.txt @@ -19,7 +19,7 @@ narrowFromAnyWithInstanceof.ts(22,7): error TS2551: Property 'getHuors' does not if (x instanceof Error) { // 'any' is narrowed to types other than 'Function'/'Object' x.message; - x.mesage; + x.message; ~~~~~~ !!! error TS2551: Property 'mesage' does not exist on type 'Error'. Did you mean 'message'? !!! related TS2728 lib.es5.d.ts:--:--: 'message' is declared here. diff --git a/tests/baselines/reference/narrowFromAnyWithInstanceof.js b/tests/baselines/reference/narrowFromAnyWithInstanceof.js index 0acc01f9996d2..fab06ce4883a7 100644 --- a/tests/baselines/reference/narrowFromAnyWithInstanceof.js +++ b/tests/baselines/reference/narrowFromAnyWithInstanceof.js @@ -17,7 +17,7 @@ if (x instanceof Object) { // 'any' is not narrowed when target type is 'Object' if (x instanceof Error) { // 'any' is narrowed to types other than 'Function'/'Object' x.message; - x.mesage; + x.message; } if (x instanceof Date) { @@ -40,7 +40,7 @@ if (x instanceof Object) { // 'any' is not narrowed when target type is 'Object' } if (x instanceof Error) { // 'any' is narrowed to types other than 'Function'/'Object' x.message; - x.mesage; + x.message; } if (x instanceof Date) { x.getDate(); diff --git a/tests/baselines/reference/narrowFromAnyWithInstanceof.symbols b/tests/baselines/reference/narrowFromAnyWithInstanceof.symbols index c5215d67ab0b6..bf11a41eea237 100644 --- a/tests/baselines/reference/narrowFromAnyWithInstanceof.symbols +++ b/tests/baselines/reference/narrowFromAnyWithInstanceof.symbols @@ -41,7 +41,7 @@ if (x instanceof Error) { // 'any' is narrowed to types other than 'Function'/'O >x : Symbol(x, Decl(narrowFromAnyWithInstanceof.ts, 0, 11)) >message : Symbol(Error.message, Decl(lib.es5.d.ts, --, --)) - x.mesage; + x.message; >x : Symbol(x, Decl(narrowFromAnyWithInstanceof.ts, 0, 11)) } diff --git a/tests/baselines/reference/narrowFromAnyWithInstanceof.types b/tests/baselines/reference/narrowFromAnyWithInstanceof.types index 0f5237e9c4d2b..6d793e8941355 100644 --- a/tests/baselines/reference/narrowFromAnyWithInstanceof.types +++ b/tests/baselines/reference/narrowFromAnyWithInstanceof.types @@ -89,12 +89,12 @@ if (x instanceof Error) { // 'any' is narrowed to types other than 'Function'/'O >message : string > : ^^^^^^ - x.mesage; ->x.mesage : any + x.message; +>x.message : any > : ^^^ >x : Error > : ^^^^^ ->mesage : any +>message : any > : ^^^ } diff --git a/tests/baselines/reference/narrowFromAnyWithTypePredicate.errors.txt b/tests/baselines/reference/narrowFromAnyWithTypePredicate.errors.txt index 8e0f3c2b205e0..2ad4ceac9db3e 100644 --- a/tests/baselines/reference/narrowFromAnyWithTypePredicate.errors.txt +++ b/tests/baselines/reference/narrowFromAnyWithTypePredicate.errors.txt @@ -38,7 +38,7 @@ narrowFromAnyWithTypePredicate.ts(33,7): error TS2551: Property 'getHuors' does if (isError(x)) { x.message; - x.mesage; + x.message; ~~~~~~ !!! error TS2551: Property 'mesage' does not exist on type 'Error'. Did you mean 'message'? !!! related TS2728 lib.es5.d.ts:--:--: 'message' is declared here. diff --git a/tests/baselines/reference/narrowFromAnyWithTypePredicate.js b/tests/baselines/reference/narrowFromAnyWithTypePredicate.js index badccd581eeb0..6a04228f6f1e3 100644 --- a/tests/baselines/reference/narrowFromAnyWithTypePredicate.js +++ b/tests/baselines/reference/narrowFromAnyWithTypePredicate.js @@ -28,7 +28,7 @@ if (isAnything(x)) { // 'any' is narrowed to types other than 'Function'/'Object if (isError(x)) { x.message; - x.mesage; + x.message; } if (isDate(x)) { @@ -55,7 +55,7 @@ if (isAnything(x)) { // 'any' is narrowed to types other than 'Function'/'Object } if (isError(x)) { x.message; - x.mesage; + x.message; } if (isDate(x)) { x.getDate(); diff --git a/tests/baselines/reference/narrowFromAnyWithTypePredicate.symbols b/tests/baselines/reference/narrowFromAnyWithTypePredicate.symbols index 2655aa7cef174..fee01bbbf9673 100644 --- a/tests/baselines/reference/narrowFromAnyWithTypePredicate.symbols +++ b/tests/baselines/reference/narrowFromAnyWithTypePredicate.symbols @@ -82,7 +82,7 @@ if (isError(x)) { >x : Symbol(x, Decl(narrowFromAnyWithTypePredicate.ts, 0, 11)) >message : Symbol(Error.message, Decl(lib.es5.d.ts, --, --)) - x.mesage; + x.message; >x : Symbol(x, Decl(narrowFromAnyWithTypePredicate.ts, 0, 11)) } diff --git a/tests/baselines/reference/narrowFromAnyWithTypePredicate.types b/tests/baselines/reference/narrowFromAnyWithTypePredicate.types index 590dbcb633d1b..246c6438918fe 100644 --- a/tests/baselines/reference/narrowFromAnyWithTypePredicate.types +++ b/tests/baselines/reference/narrowFromAnyWithTypePredicate.types @@ -145,12 +145,12 @@ if (isError(x)) { >message : string > : ^^^^^^ - x.mesage; ->x.mesage : any + x.message; +>x.message : any > : ^^^ >x : Error > : ^^^^^ ->mesage : any +>message : any > : ^^^ } diff --git a/tests/baselines/reference/nestedCallbackErrorNotFlattened.errors.txt b/tests/baselines/reference/nestedCallbackErrorNotFlattened.errors.txt index 4daa8b176ed8c..1fd54e7aeea86 100644 --- a/tests/baselines/reference/nestedCallbackErrorNotFlattened.errors.txt +++ b/tests/baselines/reference/nestedCallbackErrorNotFlattened.errors.txt @@ -9,7 +9,7 @@ nestedCallbackErrorNotFlattened.ts(6,1): error TS2322: Type '() => () => () => ( type Cb = {noAlias: () => T}["noAlias"]; // `"noAlias"` here prevents an alias symbol from being made // which means the comparison will definitely be structural, rather than by variance - declare const x: Cb>>>; // one more layer of `Cb` adn we'd get a `true` from the deeply-nested symbol check + declare const x: Cb>>>; // one more layer of `Cb` and we'd get a `true` from the deeply-nested symbol check declare let y: Cb>>>; y = x; ~ diff --git a/tests/baselines/reference/nestedCallbackErrorNotFlattened.js b/tests/baselines/reference/nestedCallbackErrorNotFlattened.js index c1dcebf1005c6..063b277ef7f10 100644 --- a/tests/baselines/reference/nestedCallbackErrorNotFlattened.js +++ b/tests/baselines/reference/nestedCallbackErrorNotFlattened.js @@ -4,7 +4,7 @@ type Cb = {noAlias: () => T}["noAlias"]; // `"noAlias"` here prevents an alias symbol from being made // which means the comparison will definitely be structural, rather than by variance -declare const x: Cb>>>; // one more layer of `Cb` adn we'd get a `true` from the deeply-nested symbol check +declare const x: Cb>>>; // one more layer of `Cb` and we'd get a `true` from the deeply-nested symbol check declare let y: Cb>>>; y = x; diff --git a/tests/baselines/reference/nestedCallbackErrorNotFlattened.symbols b/tests/baselines/reference/nestedCallbackErrorNotFlattened.symbols index f8c0c9d637009..85bcc785d2068 100644 --- a/tests/baselines/reference/nestedCallbackErrorNotFlattened.symbols +++ b/tests/baselines/reference/nestedCallbackErrorNotFlattened.symbols @@ -9,7 +9,7 @@ type Cb = {noAlias: () => T}["noAlias"]; // `"noAlias"` here prevents an alia // which means the comparison will definitely be structural, rather than by variance -declare const x: Cb>>>; // one more layer of `Cb` adn we'd get a `true` from the deeply-nested symbol check +declare const x: Cb>>>; // one more layer of `Cb` and we'd get a `true` from the deeply-nested symbol check >x : Symbol(x, Decl(nestedCallbackErrorNotFlattened.ts, 3, 13)) >Cb : Symbol(Cb, Decl(nestedCallbackErrorNotFlattened.ts, 0, 0)) >Cb : Symbol(Cb, Decl(nestedCallbackErrorNotFlattened.ts, 0, 0)) diff --git a/tests/baselines/reference/nestedCallbackErrorNotFlattened.types b/tests/baselines/reference/nestedCallbackErrorNotFlattened.types index f23415587861b..50face94d076d 100644 --- a/tests/baselines/reference/nestedCallbackErrorNotFlattened.types +++ b/tests/baselines/reference/nestedCallbackErrorNotFlattened.types @@ -9,7 +9,7 @@ type Cb = {noAlias: () => T}["noAlias"]; // `"noAlias"` here prevents an alia // which means the comparison will definitely be structural, rather than by variance -declare const x: Cb>>>; // one more layer of `Cb` adn we'd get a `true` from the deeply-nested symbol check +declare const x: Cb>>>; // one more layer of `Cb` and we'd get a `true` from the deeply-nested symbol check >x : () => () => () => () => number > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/noImplicitReturnsInAsync2.errors.txt b/tests/baselines/reference/noImplicitReturnsInAsync2.errors.txt index 764edd2f503f2..e0ec0add35d08 100644 --- a/tests/baselines/reference/noImplicitReturnsInAsync2.errors.txt +++ b/tests/baselines/reference/noImplicitReturnsInAsync2.errors.txt @@ -36,7 +36,7 @@ noImplicitReturnsInAsync2.ts(24,48): error TS7030: Not all code paths return a v } } - // infered to be Promise, should not be an error, currently reported correctly + // inferred to be Promise, should not be an error, currently reported correctly async function test7(isError: boolean = true) { if (isError === true) { return; diff --git a/tests/baselines/reference/noImplicitReturnsInAsync2.js b/tests/baselines/reference/noImplicitReturnsInAsync2.js index 903d38326a328..b1cfe6efc82b5 100644 --- a/tests/baselines/reference/noImplicitReturnsInAsync2.js +++ b/tests/baselines/reference/noImplicitReturnsInAsync2.js @@ -30,7 +30,7 @@ async function test6(isError: boolean = true): Promise { } } -// infered to be Promise, should not be an error, currently reported correctly +// inferred to be Promise, should not be an error, currently reported correctly async function test7(isError: boolean = true) { if (isError === true) { return; @@ -80,7 +80,7 @@ function test6() { } }); } -// infered to be Promise, should not be an error, currently reported correctly +// inferred to be Promise, should not be an error, currently reported correctly function test7() { return __awaiter(this, arguments, void 0, function* (isError = true) { if (isError === true) { diff --git a/tests/baselines/reference/noImplicitReturnsInAsync2.symbols b/tests/baselines/reference/noImplicitReturnsInAsync2.symbols index 7eabf616c4f8c..1e4e5a31e95e1 100644 --- a/tests/baselines/reference/noImplicitReturnsInAsync2.symbols +++ b/tests/baselines/reference/noImplicitReturnsInAsync2.symbols @@ -55,7 +55,7 @@ async function test6(isError: boolean = true): Promise { } } -// infered to be Promise, should not be an error, currently reported correctly +// inferred to be Promise, should not be an error, currently reported correctly async function test7(isError: boolean = true) { >test7 : Symbol(test7, Decl(noImplicitReturnsInAsync2.ts, 27, 1)) >isError : Symbol(isError, Decl(noImplicitReturnsInAsync2.ts, 30, 21)) diff --git a/tests/baselines/reference/noImplicitReturnsInAsync2.types b/tests/baselines/reference/noImplicitReturnsInAsync2.types index ba12aa0795a52..9d12d5affe7f4 100644 --- a/tests/baselines/reference/noImplicitReturnsInAsync2.types +++ b/tests/baselines/reference/noImplicitReturnsInAsync2.types @@ -94,7 +94,7 @@ async function test6(isError: boolean = true): Promise { } } -// infered to be Promise, should not be an error, currently reported correctly +// inferred to be Promise, should not be an error, currently reported correctly async function test7(isError: boolean = true) { >test7 : (isError?: boolean) => Promise > : ^ ^^^ ^^^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/nodeModulesTripleSlashReferenceModeOverride4(module=node16).errors.txt b/tests/baselines/reference/nodeModulesTripleSlashReferenceModeOverride4(module=node16).errors.txt index 3d7f07f2775e1..0cb8762fade31 100644 --- a/tests/baselines/reference/nodeModulesTripleSlashReferenceModeOverride4(module=node16).errors.txt +++ b/tests/baselines/reference/nodeModulesTripleSlashReferenceModeOverride4(module=node16).errors.txt @@ -3,7 +3,7 @@ ==== /index.ts (1 errors) ==== /// - foo; // foo should resolve while bar should not, since even though index.js is cjs, the refernce is esm + foo; // foo should resolve while bar should not, since even though index.js is cjs, the reference is esm bar; ~~~ !!! error TS2304: Cannot find name 'bar'. diff --git a/tests/baselines/reference/nodeModulesTripleSlashReferenceModeOverride4(module=node16).js b/tests/baselines/reference/nodeModulesTripleSlashReferenceModeOverride4(module=node16).js index 74346916b2641..641bed3973334 100644 --- a/tests/baselines/reference/nodeModulesTripleSlashReferenceModeOverride4(module=node16).js +++ b/tests/baselines/reference/nodeModulesTripleSlashReferenceModeOverride4(module=node16).js @@ -21,7 +21,7 @@ declare global { } //// [index.ts] /// -foo; // foo should resolve while bar should not, since even though index.js is cjs, the refernce is esm +foo; // foo should resolve while bar should not, since even though index.js is cjs, the reference is esm bar; export {}; @@ -29,5 +29,5 @@ export {}; "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); /// -foo; // foo should resolve while bar should not, since even though index.js is cjs, the refernce is esm +foo; // foo should resolve while bar should not, since even though index.js is cjs, the reference is esm bar; diff --git a/tests/baselines/reference/nodeModulesTripleSlashReferenceModeOverride4(module=node16).symbols b/tests/baselines/reference/nodeModulesTripleSlashReferenceModeOverride4(module=node16).symbols index 9f7867c7dbd5a..eafba16c778fb 100644 --- a/tests/baselines/reference/nodeModulesTripleSlashReferenceModeOverride4(module=node16).symbols +++ b/tests/baselines/reference/nodeModulesTripleSlashReferenceModeOverride4(module=node16).symbols @@ -2,7 +2,7 @@ === /index.ts === /// -foo; // foo should resolve while bar should not, since even though index.js is cjs, the refernce is esm +foo; // foo should resolve while bar should not, since even though index.js is cjs, the reference is esm >foo : Symbol(foo, Decl(import.d.ts, 2, 7)) bar; diff --git a/tests/baselines/reference/nodeModulesTripleSlashReferenceModeOverride4(module=node16).types b/tests/baselines/reference/nodeModulesTripleSlashReferenceModeOverride4(module=node16).types index 45343b1ac3c7d..939529c6dcd30 100644 --- a/tests/baselines/reference/nodeModulesTripleSlashReferenceModeOverride4(module=node16).types +++ b/tests/baselines/reference/nodeModulesTripleSlashReferenceModeOverride4(module=node16).types @@ -2,7 +2,7 @@ === /index.ts === /// -foo; // foo should resolve while bar should not, since even though index.js is cjs, the refernce is esm +foo; // foo should resolve while bar should not, since even though index.js is cjs, the reference is esm >foo : number > : ^^^^^^ diff --git a/tests/baselines/reference/nodeModulesTripleSlashReferenceModeOverride4(module=node18).errors.txt b/tests/baselines/reference/nodeModulesTripleSlashReferenceModeOverride4(module=node18).errors.txt index 3d7f07f2775e1..0cb8762fade31 100644 --- a/tests/baselines/reference/nodeModulesTripleSlashReferenceModeOverride4(module=node18).errors.txt +++ b/tests/baselines/reference/nodeModulesTripleSlashReferenceModeOverride4(module=node18).errors.txt @@ -3,7 +3,7 @@ ==== /index.ts (1 errors) ==== /// - foo; // foo should resolve while bar should not, since even though index.js is cjs, the refernce is esm + foo; // foo should resolve while bar should not, since even though index.js is cjs, the reference is esm bar; ~~~ !!! error TS2304: Cannot find name 'bar'. diff --git a/tests/baselines/reference/nodeModulesTripleSlashReferenceModeOverride4(module=node18).js b/tests/baselines/reference/nodeModulesTripleSlashReferenceModeOverride4(module=node18).js index 74346916b2641..641bed3973334 100644 --- a/tests/baselines/reference/nodeModulesTripleSlashReferenceModeOverride4(module=node18).js +++ b/tests/baselines/reference/nodeModulesTripleSlashReferenceModeOverride4(module=node18).js @@ -21,7 +21,7 @@ declare global { } //// [index.ts] /// -foo; // foo should resolve while bar should not, since even though index.js is cjs, the refernce is esm +foo; // foo should resolve while bar should not, since even though index.js is cjs, the reference is esm bar; export {}; @@ -29,5 +29,5 @@ export {}; "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); /// -foo; // foo should resolve while bar should not, since even though index.js is cjs, the refernce is esm +foo; // foo should resolve while bar should not, since even though index.js is cjs, the reference is esm bar; diff --git a/tests/baselines/reference/nodeModulesTripleSlashReferenceModeOverride4(module=node18).symbols b/tests/baselines/reference/nodeModulesTripleSlashReferenceModeOverride4(module=node18).symbols index 9f7867c7dbd5a..eafba16c778fb 100644 --- a/tests/baselines/reference/nodeModulesTripleSlashReferenceModeOverride4(module=node18).symbols +++ b/tests/baselines/reference/nodeModulesTripleSlashReferenceModeOverride4(module=node18).symbols @@ -2,7 +2,7 @@ === /index.ts === /// -foo; // foo should resolve while bar should not, since even though index.js is cjs, the refernce is esm +foo; // foo should resolve while bar should not, since even though index.js is cjs, the reference is esm >foo : Symbol(foo, Decl(import.d.ts, 2, 7)) bar; diff --git a/tests/baselines/reference/nodeModulesTripleSlashReferenceModeOverride4(module=node18).types b/tests/baselines/reference/nodeModulesTripleSlashReferenceModeOverride4(module=node18).types index 45343b1ac3c7d..939529c6dcd30 100644 --- a/tests/baselines/reference/nodeModulesTripleSlashReferenceModeOverride4(module=node18).types +++ b/tests/baselines/reference/nodeModulesTripleSlashReferenceModeOverride4(module=node18).types @@ -2,7 +2,7 @@ === /index.ts === /// -foo; // foo should resolve while bar should not, since even though index.js is cjs, the refernce is esm +foo; // foo should resolve while bar should not, since even though index.js is cjs, the reference is esm >foo : number > : ^^^^^^ diff --git a/tests/baselines/reference/nodeModulesTripleSlashReferenceModeOverride4(module=node20).errors.txt b/tests/baselines/reference/nodeModulesTripleSlashReferenceModeOverride4(module=node20).errors.txt index 3d7f07f2775e1..0cb8762fade31 100644 --- a/tests/baselines/reference/nodeModulesTripleSlashReferenceModeOverride4(module=node20).errors.txt +++ b/tests/baselines/reference/nodeModulesTripleSlashReferenceModeOverride4(module=node20).errors.txt @@ -3,7 +3,7 @@ ==== /index.ts (1 errors) ==== /// - foo; // foo should resolve while bar should not, since even though index.js is cjs, the refernce is esm + foo; // foo should resolve while bar should not, since even though index.js is cjs, the reference is esm bar; ~~~ !!! error TS2304: Cannot find name 'bar'. diff --git a/tests/baselines/reference/nodeModulesTripleSlashReferenceModeOverride4(module=node20).js b/tests/baselines/reference/nodeModulesTripleSlashReferenceModeOverride4(module=node20).js index 74346916b2641..641bed3973334 100644 --- a/tests/baselines/reference/nodeModulesTripleSlashReferenceModeOverride4(module=node20).js +++ b/tests/baselines/reference/nodeModulesTripleSlashReferenceModeOverride4(module=node20).js @@ -21,7 +21,7 @@ declare global { } //// [index.ts] /// -foo; // foo should resolve while bar should not, since even though index.js is cjs, the refernce is esm +foo; // foo should resolve while bar should not, since even though index.js is cjs, the reference is esm bar; export {}; @@ -29,5 +29,5 @@ export {}; "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); /// -foo; // foo should resolve while bar should not, since even though index.js is cjs, the refernce is esm +foo; // foo should resolve while bar should not, since even though index.js is cjs, the reference is esm bar; diff --git a/tests/baselines/reference/nodeModulesTripleSlashReferenceModeOverride4(module=node20).symbols b/tests/baselines/reference/nodeModulesTripleSlashReferenceModeOverride4(module=node20).symbols index 9f7867c7dbd5a..eafba16c778fb 100644 --- a/tests/baselines/reference/nodeModulesTripleSlashReferenceModeOverride4(module=node20).symbols +++ b/tests/baselines/reference/nodeModulesTripleSlashReferenceModeOverride4(module=node20).symbols @@ -2,7 +2,7 @@ === /index.ts === /// -foo; // foo should resolve while bar should not, since even though index.js is cjs, the refernce is esm +foo; // foo should resolve while bar should not, since even though index.js is cjs, the reference is esm >foo : Symbol(foo, Decl(import.d.ts, 2, 7)) bar; diff --git a/tests/baselines/reference/nodeModulesTripleSlashReferenceModeOverride4(module=node20).types b/tests/baselines/reference/nodeModulesTripleSlashReferenceModeOverride4(module=node20).types index 45343b1ac3c7d..939529c6dcd30 100644 --- a/tests/baselines/reference/nodeModulesTripleSlashReferenceModeOverride4(module=node20).types +++ b/tests/baselines/reference/nodeModulesTripleSlashReferenceModeOverride4(module=node20).types @@ -2,7 +2,7 @@ === /index.ts === /// -foo; // foo should resolve while bar should not, since even though index.js is cjs, the refernce is esm +foo; // foo should resolve while bar should not, since even though index.js is cjs, the reference is esm >foo : number > : ^^^^^^ diff --git a/tests/baselines/reference/nodeModulesTripleSlashReferenceModeOverride4(module=nodenext).errors.txt b/tests/baselines/reference/nodeModulesTripleSlashReferenceModeOverride4(module=nodenext).errors.txt index 3d7f07f2775e1..0cb8762fade31 100644 --- a/tests/baselines/reference/nodeModulesTripleSlashReferenceModeOverride4(module=nodenext).errors.txt +++ b/tests/baselines/reference/nodeModulesTripleSlashReferenceModeOverride4(module=nodenext).errors.txt @@ -3,7 +3,7 @@ ==== /index.ts (1 errors) ==== /// - foo; // foo should resolve while bar should not, since even though index.js is cjs, the refernce is esm + foo; // foo should resolve while bar should not, since even though index.js is cjs, the reference is esm bar; ~~~ !!! error TS2304: Cannot find name 'bar'. diff --git a/tests/baselines/reference/nodeModulesTripleSlashReferenceModeOverride4(module=nodenext).js b/tests/baselines/reference/nodeModulesTripleSlashReferenceModeOverride4(module=nodenext).js index 74346916b2641..641bed3973334 100644 --- a/tests/baselines/reference/nodeModulesTripleSlashReferenceModeOverride4(module=nodenext).js +++ b/tests/baselines/reference/nodeModulesTripleSlashReferenceModeOverride4(module=nodenext).js @@ -21,7 +21,7 @@ declare global { } //// [index.ts] /// -foo; // foo should resolve while bar should not, since even though index.js is cjs, the refernce is esm +foo; // foo should resolve while bar should not, since even though index.js is cjs, the reference is esm bar; export {}; @@ -29,5 +29,5 @@ export {}; "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); /// -foo; // foo should resolve while bar should not, since even though index.js is cjs, the refernce is esm +foo; // foo should resolve while bar should not, since even though index.js is cjs, the reference is esm bar; diff --git a/tests/baselines/reference/nodeModulesTripleSlashReferenceModeOverride4(module=nodenext).symbols b/tests/baselines/reference/nodeModulesTripleSlashReferenceModeOverride4(module=nodenext).symbols index 9f7867c7dbd5a..eafba16c778fb 100644 --- a/tests/baselines/reference/nodeModulesTripleSlashReferenceModeOverride4(module=nodenext).symbols +++ b/tests/baselines/reference/nodeModulesTripleSlashReferenceModeOverride4(module=nodenext).symbols @@ -2,7 +2,7 @@ === /index.ts === /// -foo; // foo should resolve while bar should not, since even though index.js is cjs, the refernce is esm +foo; // foo should resolve while bar should not, since even though index.js is cjs, the reference is esm >foo : Symbol(foo, Decl(import.d.ts, 2, 7)) bar; diff --git a/tests/baselines/reference/nodeModulesTripleSlashReferenceModeOverride4(module=nodenext).types b/tests/baselines/reference/nodeModulesTripleSlashReferenceModeOverride4(module=nodenext).types index 45343b1ac3c7d..939529c6dcd30 100644 --- a/tests/baselines/reference/nodeModulesTripleSlashReferenceModeOverride4(module=nodenext).types +++ b/tests/baselines/reference/nodeModulesTripleSlashReferenceModeOverride4(module=nodenext).types @@ -2,7 +2,7 @@ === /index.ts === /// -foo; // foo should resolve while bar should not, since even though index.js is cjs, the refernce is esm +foo; // foo should resolve while bar should not, since even though index.js is cjs, the reference is esm >foo : number > : ^^^^^^ diff --git a/tests/baselines/reference/nodeNextPackageSelfNameWithOutDirDeclDirCompositeNestedDirs.js b/tests/baselines/reference/nodeNextPackageSelfNameWithOutDirDeclDirCompositeNestedDirs.js index c3baffe14e6fe..d0750a1424388 100644 --- a/tests/baselines/reference/nodeNextPackageSelfNameWithOutDirDeclDirCompositeNestedDirs.js +++ b/tests/baselines/reference/nodeNextPackageSelfNameWithOutDirDeclDirCompositeNestedDirs.js @@ -17,7 +17,7 @@ export {srcthing as thing} from "./src/thing.js"; // The following import should cause `index.ts` // to be included in the build, which will, // in turn, cause the common src directory to not be `src` -// (the harness is wierd here in that noImplicitReferences makes only +// (the harness is weird here in that noImplicitReferences makes only // this file get loaded as an entrypoint and emitted, while on the // real command-line we'll crawl the imports for that set - a limitation // of the harness, I suppose) @@ -33,7 +33,7 @@ export function srcthing(): void {} // The following import should cause `index.ts` // to be included in the build, which will, // in turn, cause the common src directory to not be `src` -// (the harness is wierd here in that noImplicitReferences makes only +// (the harness is weird here in that noImplicitReferences makes only // this file get loaded as an entrypoint and emitted, while on the // real command-line we'll crawl the imports for that set - a limitation // of the harness, I suppose) diff --git a/tests/baselines/reference/nodeNextPackageSelfNameWithOutDirDeclDirCompositeNestedDirs.symbols b/tests/baselines/reference/nodeNextPackageSelfNameWithOutDirDeclDirCompositeNestedDirs.symbols index 7fd0a8131114d..9f81e5ae89410 100644 --- a/tests/baselines/reference/nodeNextPackageSelfNameWithOutDirDeclDirCompositeNestedDirs.symbols +++ b/tests/baselines/reference/nodeNextPackageSelfNameWithOutDirDeclDirCompositeNestedDirs.symbols @@ -9,7 +9,7 @@ export {srcthing as thing} from "./src/thing.js"; // The following import should cause `index.ts` // to be included in the build, which will, // in turn, cause the common src directory to not be `src` -// (the harness is wierd here in that noImplicitReferences makes only +// (the harness is weird here in that noImplicitReferences makes only // this file get loaded as an entrypoint and emitted, while on the // real command-line we'll crawl the imports for that set - a limitation // of the harness, I suppose) diff --git a/tests/baselines/reference/nodeNextPackageSelfNameWithOutDirDeclDirCompositeNestedDirs.types b/tests/baselines/reference/nodeNextPackageSelfNameWithOutDirDeclDirCompositeNestedDirs.types index 6457cdf66a6c5..2ea425801ea1c 100644 --- a/tests/baselines/reference/nodeNextPackageSelfNameWithOutDirDeclDirCompositeNestedDirs.types +++ b/tests/baselines/reference/nodeNextPackageSelfNameWithOutDirDeclDirCompositeNestedDirs.types @@ -11,7 +11,7 @@ export {srcthing as thing} from "./src/thing.js"; // The following import should cause `index.ts` // to be included in the build, which will, // in turn, cause the common src directory to not be `src` -// (the harness is wierd here in that noImplicitReferences makes only +// (the harness is weird here in that noImplicitReferences makes only // this file get loaded as an entrypoint and emitted, while on the // real command-line we'll crawl the imports for that set - a limitation // of the harness, I suppose) diff --git a/tests/baselines/reference/nodeNextPackageSelfNameWithOutDirDeclDirNestedDirs.js b/tests/baselines/reference/nodeNextPackageSelfNameWithOutDirDeclDirNestedDirs.js index 09a0e3be39e86..0969ff64c8098 100644 --- a/tests/baselines/reference/nodeNextPackageSelfNameWithOutDirDeclDirNestedDirs.js +++ b/tests/baselines/reference/nodeNextPackageSelfNameWithOutDirDeclDirNestedDirs.js @@ -17,7 +17,7 @@ export {srcthing as thing} from "./src/thing.js"; // The following import should cause `index.ts` // to be included in the build, which will, // in turn, cause the common src directory to not be `src` -// (the harness is wierd here in that noImplicitReferences makes only +// (the harness is weird here in that noImplicitReferences makes only // this file get loaded as an entrypoint and emitted, while on the // real command-line we'll crawl the imports for that set - a limitation // of the harness, I suppose) @@ -33,7 +33,7 @@ export function srcthing(): void {} // The following import should cause `index.ts` // to be included in the build, which will, // in turn, cause the common src directory to not be `src` -// (the harness is wierd here in that noImplicitReferences makes only +// (the harness is weird here in that noImplicitReferences makes only // this file get loaded as an entrypoint and emitted, while on the // real command-line we'll crawl the imports for that set - a limitation // of the harness, I suppose) diff --git a/tests/baselines/reference/nodeNextPackageSelfNameWithOutDirDeclDirNestedDirs.symbols b/tests/baselines/reference/nodeNextPackageSelfNameWithOutDirDeclDirNestedDirs.symbols index fd266479ca93d..348ed17585ce7 100644 --- a/tests/baselines/reference/nodeNextPackageSelfNameWithOutDirDeclDirNestedDirs.symbols +++ b/tests/baselines/reference/nodeNextPackageSelfNameWithOutDirDeclDirNestedDirs.symbols @@ -9,7 +9,7 @@ export {srcthing as thing} from "./src/thing.js"; // The following import should cause `index.ts` // to be included in the build, which will, // in turn, cause the common src directory to not be `src` -// (the harness is wierd here in that noImplicitReferences makes only +// (the harness is weird here in that noImplicitReferences makes only // this file get loaded as an entrypoint and emitted, while on the // real command-line we'll crawl the imports for that set - a limitation // of the harness, I suppose) diff --git a/tests/baselines/reference/nodeNextPackageSelfNameWithOutDirDeclDirNestedDirs.types b/tests/baselines/reference/nodeNextPackageSelfNameWithOutDirDeclDirNestedDirs.types index 1923d27551862..608c8cdb4be7f 100644 --- a/tests/baselines/reference/nodeNextPackageSelfNameWithOutDirDeclDirNestedDirs.types +++ b/tests/baselines/reference/nodeNextPackageSelfNameWithOutDirDeclDirNestedDirs.types @@ -11,7 +11,7 @@ export {srcthing as thing} from "./src/thing.js"; // The following import should cause `index.ts` // to be included in the build, which will, // in turn, cause the common src directory to not be `src` -// (the harness is wierd here in that noImplicitReferences makes only +// (the harness is weird here in that noImplicitReferences makes only // this file get loaded as an entrypoint and emitted, while on the // real command-line we'll crawl the imports for that set - a limitation // of the harness, I suppose) diff --git a/tests/baselines/reference/nonContextuallyTypedLogicalOr.js b/tests/baselines/reference/nonContextuallyTypedLogicalOr.js index 0905b612d015d..e3a7e82f1f7a4 100644 --- a/tests/baselines/reference/nonContextuallyTypedLogicalOr.js +++ b/tests/baselines/reference/nonContextuallyTypedLogicalOr.js @@ -6,13 +6,13 @@ interface Contextual { p?: number; } -interface Ellement { +interface Element { dummy; p: any; } var c: Contextual; -var e: Ellement; +var e: Element; (c || e).dummy; diff --git a/tests/baselines/reference/nonContextuallyTypedLogicalOr.symbols b/tests/baselines/reference/nonContextuallyTypedLogicalOr.symbols index 2c416638a513d..cb968b682baf6 100644 --- a/tests/baselines/reference/nonContextuallyTypedLogicalOr.symbols +++ b/tests/baselines/reference/nonContextuallyTypedLogicalOr.symbols @@ -11,23 +11,23 @@ interface Contextual { >p : Symbol(Contextual.p, Decl(nonContextuallyTypedLogicalOr.ts, 1, 10)) } -interface Ellement { ->Ellement : Symbol(Ellement, Decl(nonContextuallyTypedLogicalOr.ts, 3, 1)) +interface Element { +>Element : Symbol(Element, Decl(nonContextuallyTypedLogicalOr.ts, 3, 1)) dummy; ->dummy : Symbol(Ellement.dummy, Decl(nonContextuallyTypedLogicalOr.ts, 5, 20)) +>dummy : Symbol(Element.dummy, Decl(nonContextuallyTypedLogicalOr.ts, 5, 20)) p: any; ->p : Symbol(Ellement.p, Decl(nonContextuallyTypedLogicalOr.ts, 6, 10)) +>p : Symbol(Element.p, Decl(nonContextuallyTypedLogicalOr.ts, 6, 10)) } var c: Contextual; >c : Symbol(c, Decl(nonContextuallyTypedLogicalOr.ts, 10, 3)) >Contextual : Symbol(Contextual, Decl(nonContextuallyTypedLogicalOr.ts, 0, 0)) -var e: Ellement; +var e: Element; >e : Symbol(e, Decl(nonContextuallyTypedLogicalOr.ts, 11, 3)) ->Ellement : Symbol(Ellement, Decl(nonContextuallyTypedLogicalOr.ts, 3, 1)) +>Element : Symbol(Element, Decl(nonContextuallyTypedLogicalOr.ts, 3, 1)) (c || e).dummy; >(c || e).dummy : Symbol(dummy, Decl(nonContextuallyTypedLogicalOr.ts, 0, 22), Decl(nonContextuallyTypedLogicalOr.ts, 5, 20)) diff --git a/tests/baselines/reference/nonContextuallyTypedLogicalOr.types b/tests/baselines/reference/nonContextuallyTypedLogicalOr.types index 03d163721feba..f76e013deff00 100644 --- a/tests/baselines/reference/nonContextuallyTypedLogicalOr.types +++ b/tests/baselines/reference/nonContextuallyTypedLogicalOr.types @@ -10,7 +10,7 @@ interface Contextual { > : ^^^^^^ } -interface Ellement { +interface Element { dummy; >dummy : any @@ -22,19 +22,19 @@ var c: Contextual; >c : Contextual > : ^^^^^^^^^^ -var e: Ellement; ->e : Ellement +var e: Element; +>e : Element > : ^^^^^^^^ (c || e).dummy; >(c || e).dummy : any ->(c || e) : Contextual | Ellement +>(c || e) : Contextual | Element > : ^^^^^^^^^^^^^^^^^^^^^ ->c || e : Contextual | Ellement +>c || e : Contextual | Element > : ^^^^^^^^^^^^^^^^^^^^^ >c : Contextual > : ^^^^^^^^^^ ->e : Ellement +>e : Element > : ^^^^^^^^ >dummy : any > : ^^^ diff --git a/tests/baselines/reference/objectRest.errors.txt b/tests/baselines/reference/objectRest.errors.txt index 23e0e8044c63a..74c004debf032 100644 --- a/tests/baselines/reference/objectRest.errors.txt +++ b/tests/baselines/reference/objectRest.errors.txt @@ -65,5 +65,5 @@ objectRest.ts(44,53): error TS2739: Type '{}' is missing the following propertie ~ !!! error TS2739: Type '{}' is missing the following properties from type '{ a: number; b: string; }': a, b - var noContextualType = ({ aNumber = 12, ...notEmptyObject }) => aNumber + notEmptyObject.anythingGoes; + var noContextualType = ({ a number = 12, ...notEmptyObject }) => a number + notEmptyObject.anythingGoes; \ No newline at end of file diff --git a/tests/baselines/reference/objectRest.js b/tests/baselines/reference/objectRest.js index 26303baed89bc..05c53c1ce6a4d 100644 --- a/tests/baselines/reference/objectRest.js +++ b/tests/baselines/reference/objectRest.js @@ -46,7 +46,7 @@ let computed2 = 'a'; var { [computed]: stillNotGreat, [computed2]: soSo, ...o } = o; ({ [computed]: stillNotGreat, [computed2]: soSo, ...o } = o); -var noContextualType = ({ aNumber = 12, ...notEmptyObject }) => aNumber + notEmptyObject.anythingGoes; +var noContextualType = ({ a number = 12, ...notEmptyObject }) => a number + notEmptyObject.anythingGoes; //// [objectRest.js] @@ -92,6 +92,6 @@ let computed2 = 'a'; var _k = o, _l = computed, stillNotGreat = _k[_l], _m = computed2, soSo = _k[_m], o = __rest(_k, [typeof _l === "symbol" ? _l : _l + "", typeof _m === "symbol" ? _m : _m + ""]); (_c = o, _d = computed, stillNotGreat = _c[_d], _e = computed2, soSo = _c[_e], o = __rest(_c, [typeof _d === "symbol" ? _d : _d + "", typeof _e === "symbol" ? _e : _e + ""])); var noContextualType = (_a) => { - var { aNumber = 12 } = _a, notEmptyObject = __rest(_a, ["aNumber"]); - return aNumber + notEmptyObject.anythingGoes; + var { a number = 12 } = _a, notEmptyObject = __rest(_a, ["a number"]); + return a number + notEmptyObject.anythingGoes; }; diff --git a/tests/baselines/reference/objectRest.symbols b/tests/baselines/reference/objectRest.symbols index 34f2a3f368f40..3dd035a0f4383 100644 --- a/tests/baselines/reference/objectRest.symbols +++ b/tests/baselines/reference/objectRest.symbols @@ -195,10 +195,10 @@ var { [computed]: stillNotGreat, [computed2]: soSo, ...o } = o; >o : Symbol(o, Decl(objectRest.ts, 0, 3), Decl(objectRest.ts, 42, 51)) >o : Symbol(o, Decl(objectRest.ts, 0, 3), Decl(objectRest.ts, 42, 51)) -var noContextualType = ({ aNumber = 12, ...notEmptyObject }) => aNumber + notEmptyObject.anythingGoes; +var noContextualType = ({ a number = 12, ...notEmptyObject }) => a number + notEmptyObject.anythingGoes; >noContextualType : Symbol(noContextualType, Decl(objectRest.ts, 45, 3)) ->aNumber : Symbol(aNumber, Decl(objectRest.ts, 45, 25)) +>a number : Symbol(a number, Decl(objectRest.ts, 45, 25)) >notEmptyObject : Symbol(notEmptyObject, Decl(objectRest.ts, 45, 39)) ->aNumber : Symbol(aNumber, Decl(objectRest.ts, 45, 25)) +>a number : Symbol(a number, Decl(objectRest.ts, 45, 25)) >notEmptyObject : Symbol(notEmptyObject, Decl(objectRest.ts, 45, 39)) diff --git a/tests/baselines/reference/objectRest.types b/tests/baselines/reference/objectRest.types index 7907f02e013f5..ab170969c9256 100644 --- a/tests/baselines/reference/objectRest.types +++ b/tests/baselines/reference/objectRest.types @@ -362,20 +362,20 @@ var { [computed]: stillNotGreat, [computed2]: soSo, ...o } = o; >o : { a: number; b: string; } > : ^^^^^^^^^^^^^^^^^^^^^^^^^ -var noContextualType = ({ aNumber = 12, ...notEmptyObject }) => aNumber + notEmptyObject.anythingGoes; ->noContextualType : ({ aNumber, ...notEmptyObject }: { [x: string]: any; aNumber?: number; }) => any +var noContextualType = ({ a number = 12, ...notEmptyObject }) => a number + notEmptyObject.anythingGoes; +>noContextualType : ({ a number, ...notEmptyObject }: { [x: string]: any; a number?: number; }) => any > : ^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ->({ aNumber = 12, ...notEmptyObject }) => aNumber + notEmptyObject.anythingGoes : ({ aNumber, ...notEmptyObject }: { [x: string]: any; aNumber?: number; }) => any +>({ a number = 12, ...notEmptyObject }) => a number + notEmptyObject.anythingGoes : ({ a number, ...notEmptyObject }: { [x: string]: any; a number?: number; }) => any > : ^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ->aNumber : number +>a number : number > : ^^^^^^ >12 : 12 > : ^^ >notEmptyObject : { [x: string]: any; } > : ^^^^^^^^^^^^^^^^^^^^^ ->aNumber + notEmptyObject.anythingGoes : any +>a number + notEmptyObject.anythingGoes : any > : ^^^ ->aNumber : number +>a number : number > : ^^^^^^ >notEmptyObject.anythingGoes : any > : ^^^ diff --git a/tests/baselines/reference/objectRestParameter.types b/tests/baselines/reference/objectRestParameter.types index 5e6fc34404e63..9968542818a4e 100644 --- a/tests/baselines/reference/objectRestParameter.types +++ b/tests/baselines/reference/objectRestParameter.types @@ -79,7 +79,7 @@ suddenly(({ x: { z = 12, ...nested }, ...rest } = { x: { z: 1, ka: 1 }, y: 'noo' > : ^ >y : string > : ^^^^^^ ->'noo' : "noo" +>'no' : "no" > : ^^^^^ >rest.y + nested.ka : string > : ^^^^^^ diff --git a/tests/baselines/reference/objectRestParameterES5(target=es2015).types b/tests/baselines/reference/objectRestParameterES5(target=es2015).types index bb237dd286d39..01ff4c77b1774 100644 --- a/tests/baselines/reference/objectRestParameterES5(target=es2015).types +++ b/tests/baselines/reference/objectRestParameterES5(target=es2015).types @@ -79,7 +79,7 @@ suddenly(({ x: { z = 12, ...nested }, ...rest } = { x: { z: 1, ka: 1 }, y: 'noo' > : ^ >y : string > : ^^^^^^ ->'noo' : "noo" +>'no' : "no" > : ^^^^^ >rest.y + nested.ka : string > : ^^^^^^ diff --git a/tests/baselines/reference/objectRestParameterES5(target=es5).types b/tests/baselines/reference/objectRestParameterES5(target=es5).types index d52224d844068..aa06724b39ab8 100644 --- a/tests/baselines/reference/objectRestParameterES5(target=es5).types +++ b/tests/baselines/reference/objectRestParameterES5(target=es5).types @@ -83,7 +83,7 @@ suddenly(({ x: { z = 12, ...nested }, ...rest } = { x: { z: 1, ka: 1 }, y: 'noo' > : ^ >y : string > : ^^^^^^ ->'noo' : "noo" +>'no' : "no" > : ^^^^^ >rest.y + nested.ka : string > : ^^^^^^ diff --git a/tests/baselines/reference/objectSpread(target=es2015).types b/tests/baselines/reference/objectSpread(target=es2015).types index 14e8a8c2f7e8b..bffd302d672ec 100644 --- a/tests/baselines/reference/objectSpread(target=es2015).types +++ b/tests/baselines/reference/objectSpread(target=es2015).types @@ -130,7 +130,7 @@ let nested: { a: number, b: boolean, c: string } = > : ^^^^^ >c : string > : ^^^^^^ ->'overriden' : "overriden" +>'overridden' : "overridden" > : ^^^^^^^^^^^ >c : string > : ^^^^^^ @@ -204,7 +204,7 @@ let combinedNestedChangeType: { a: number, b: boolean, c: number } = > : ^^^^^ >c : string > : ^^^^^^ ->'overriden' : "overriden" +>'overridden' : "overridden" > : ^^^^^^^^^^^ >c : number > : ^^^^^^ diff --git a/tests/baselines/reference/objectSpread(target=es5).types b/tests/baselines/reference/objectSpread(target=es5).types index a36c65b5038e5..35289b8b2815f 100644 --- a/tests/baselines/reference/objectSpread(target=es5).types +++ b/tests/baselines/reference/objectSpread(target=es5).types @@ -130,7 +130,7 @@ let nested: { a: number, b: boolean, c: string } = > : ^^^^^ >c : string > : ^^^^^^ ->'overriden' : "overriden" +>'overridden' : "overridden" > : ^^^^^^^^^^^ >c : string > : ^^^^^^ @@ -204,7 +204,7 @@ let combinedNestedChangeType: { a: number, b: boolean, c: number } = > : ^^^^^ >c : string > : ^^^^^^ ->'overriden' : "overriden" +>'overridden' : "overridden" > : ^^^^^^^^^^^ >c : number > : ^^^^^^ diff --git a/tests/baselines/reference/objectSpreadNegative(target=es2015).types b/tests/baselines/reference/objectSpreadNegative(target=es2015).types index 0e1c4abe618c2..66ac5a8926366 100644 --- a/tests/baselines/reference/objectSpreadNegative(target=es2015).types +++ b/tests/baselines/reference/objectSpreadNegative(target=es2015).types @@ -298,7 +298,7 @@ let combinedNested: { a: number, b: boolean, c: string, d: string } = > : ^^^^^ >c : string > : ^^^^^^ ->'overriden' : "overriden" +>'overridden' : "overridden" > : ^^^^^^^^^^^ >d : string > : ^^^^^^ diff --git a/tests/baselines/reference/objectSpreadNegative(target=es5).types b/tests/baselines/reference/objectSpreadNegative(target=es5).types index 0e1c4abe618c2..66ac5a8926366 100644 --- a/tests/baselines/reference/objectSpreadNegative(target=es5).types +++ b/tests/baselines/reference/objectSpreadNegative(target=es5).types @@ -298,7 +298,7 @@ let combinedNested: { a: number, b: boolean, c: string, d: string } = > : ^^^^^ >c : string > : ^^^^^^ ->'overriden' : "overriden" +>'overridden' : "overridden" > : ^^^^^^^^^^^ >d : string > : ^^^^^^ diff --git a/tests/baselines/reference/operationsAvailableOnPromisedType(target=es5).js b/tests/baselines/reference/operationsAvailableOnPromisedType(target=es5).js index c4c13bb49927d..a7f6e0e02da5c 100644 --- a/tests/baselines/reference/operationsAvailableOnPromisedType(target=es5).js +++ b/tests/baselines/reference/operationsAvailableOnPromisedType(target=es5).js @@ -43,7 +43,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge }); }; var __generator = (this && this.__generator) || function (thisArg, body) { - var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); + var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, tries: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; function verb(n) { return function (v) { return step([n, v]); }; } function step(op) { @@ -55,14 +55,14 @@ var __generator = (this && this.__generator) || function (thisArg, body) { case 0: case 1: t = op; break; case 4: _.label++; return { value: op[1], done: false }; case 5: _.label++; y = op[1]; op = [0]; continue; - case 7: op = _.ops.pop(); _.trys.pop(); continue; + case 7: op = _.ops.pop(); _.tries.pop(); continue; default: - if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } + if (!(t = _.tries, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } if (t[2]) _.ops.pop(); - _.trys.pop(); continue; + _.tries.pop(); continue; } op = body.call(thisArg, _); } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } @@ -108,7 +108,7 @@ function fn(a, b, c, d, e, f, g) { } _e.label = 1; case 1: - _e.trys.push([1, 6, 7, 12]); + _e.tries.push([1, 6, 7, 12]); _d = true, c_2 = __asyncValues(c); _e.label = 2; case 2: return [4 /*yield*/, c_2.next()]; @@ -127,7 +127,7 @@ function fn(a, b, c, d, e, f, g) { e_1 = { error: e_1_1 }; return [3 /*break*/, 12]; case 7: - _e.trys.push([7, , 10, 11]); + _e.tries.push([7, , 10, 11]); if (!(!_d && !_a && (_b = c_2.return))) return [3 /*break*/, 9]; return [4 /*yield*/, _b.call(c_2)]; case 8: diff --git a/tests/baselines/reference/packageJsonMain_isNonRecursive.errors.txt b/tests/baselines/reference/packageJsonMain_isNonRecursive.errors.txt index bf5a281cd1e53..e825859d86bc4 100644 --- a/tests/baselines/reference/packageJsonMain_isNonRecursive.errors.txt +++ b/tests/baselines/reference/packageJsonMain_isNonRecursive.errors.txt @@ -10,8 +10,8 @@ { "main": "oof" } ==== /node_modules/foo/oof/package.json (0 errors) ==== - { "main": "ofo" } + { "main": "of" } -==== /node_modules/foo/oof/ofo.js (0 errors) ==== +==== /node_modules/foo/oof/of.js (0 errors) ==== module.exports = 0; \ No newline at end of file diff --git a/tests/baselines/reference/packageJsonMain_isNonRecursive.js b/tests/baselines/reference/packageJsonMain_isNonRecursive.js index db02ba5bd214b..0654a70285aad 100644 --- a/tests/baselines/reference/packageJsonMain_isNonRecursive.js +++ b/tests/baselines/reference/packageJsonMain_isNonRecursive.js @@ -4,9 +4,9 @@ { "main": "oof" } //// [package.json] -{ "main": "ofo" } +{ "main": "of" } -//// [ofo.js] +//// [of.js] module.exports = 0; //// [a.ts] diff --git a/tests/baselines/reference/parserRealSource11.errors.txt b/tests/baselines/reference/parserRealSource11.errors.txt index 73ab1c6a053f2..63004e89bd92f 100644 --- a/tests/baselines/reference/parserRealSource11.errors.txt +++ b/tests/baselines/reference/parserRealSource11.errors.txt @@ -1982,7 +1982,7 @@ parserRealSource11.ts(2356,48): error TS2304: Cannot find name 'TokenID'. public endingToken: ASTSpan = null; constructor (public name: Identifier, public bod: ASTList, public isConstructor: boolean, - public arguments: ASTList, public vars: ASTList, public scopes: ASTList, public statics: ASTList, + public arguments: ASTList, public vars: ASTList, public scopes: ASTList, public statistics: ASTList, ~~~~~~~~~ !!! error TS1210: Code contained in a class is evaluated in JavaScript's strict mode which does not allow this use of 'arguments'. For more information, see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Strict_mode. nodeType: number) { @@ -2189,7 +2189,7 @@ parserRealSource11.ts(2356,48): error TS2304: Cannot find name 'TokenID'. ~~~~~~~~ !!! error TS2304: Cannot find name 'FncFlags'. - public hasStaticDeclarations() { return (!this.isConstructor && (this.statics.members.length > 0 || this.innerStaticFuncs.length > 0)); } + public hasStaticDeclarations() { return (!this.isConstructor && (this.statistics.members.length > 0 || this.innerStaticFuncs.length > 0)); } } export class LocationInfo { @@ -2995,7 +2995,7 @@ parserRealSource11.ts(2356,48): error TS2304: Cannot find name 'TokenID'. export class ForInStatement extends Statement { constructor (public lval: AST, public obj: AST) { - super(NodeType.ForIn); + super(NodeType.foreign); ~~~~~~~~ !!! error TS2304: Cannot find name 'NodeType'. if (this.lval && (this.lval.nodeType == NodeType.VarDecl)) { @@ -3108,7 +3108,7 @@ parserRealSource11.ts(2356,48): error TS2304: Cannot find name 'TokenID'. public typeCheck(typeFlow: TypeFlow) { ~~~~~~~~ !!! error TS2304: Cannot find name 'TypeFlow'. - if (typeFlow.checker.styleSettings.forin) { + if (typeFlow.checker.styleSettings.foreign) { if (!this.isFiltered()) { typeFlow.checker.errorReporter.styleError(this, "no hasOwnProperty filter"); } diff --git a/tests/baselines/reference/parserRealSource11.js b/tests/baselines/reference/parserRealSource11.js index b16f57a4770e0..03406e40d7e87 100644 --- a/tests/baselines/reference/parserRealSource11.js +++ b/tests/baselines/reference/parserRealSource11.js @@ -985,7 +985,7 @@ namespace TypeScript { public endingToken: ASTSpan = null; constructor (public name: Identifier, public bod: ASTList, public isConstructor: boolean, - public arguments: ASTList, public vars: ASTList, public scopes: ASTList, public statics: ASTList, + public arguments: ASTList, public vars: ASTList, public scopes: ASTList, public statistics: ASTList, nodeType: number) { super(nodeType); @@ -1100,7 +1100,7 @@ namespace TypeScript { public isSignature() { return (this.fncFlags & FncFlags.Signature) != FncFlags.None; } - public hasStaticDeclarations() { return (!this.isConstructor && (this.statics.members.length > 0 || this.innerStaticFuncs.length > 0)); } + public hasStaticDeclarations() { return (!this.isConstructor && (this.statistics.members.length > 0 || this.innerStaticFuncs.length > 0)); } } export class LocationInfo { @@ -1688,7 +1688,7 @@ namespace TypeScript { export class ForInStatement extends Statement { constructor (public lval: AST, public obj: AST) { - super(NodeType.ForIn); + super(NodeType.foreign); if (this.lval && (this.lval.nodeType == NodeType.VarDecl)) { (this.lval).varFlags |= VarFlags.AutoInit; } @@ -1767,7 +1767,7 @@ namespace TypeScript { } public typeCheck(typeFlow: TypeFlow) { - if (typeFlow.checker.styleSettings.forin) { + if (typeFlow.checker.styleSettings.foreign) { if (!this.isFiltered()) { typeFlow.checker.errorReporter.styleError(this, "no hasOwnProperty filter"); } @@ -3237,7 +3237,7 @@ var TypeScript; TypeScript.ArgDecl = ArgDecl; var internalId = 0; class FuncDecl extends AST { - constructor(name, bod, isConstructor, arguments, vars, scopes, statics, nodeType) { + constructor(name, bod, isConstructor, arguments, vars, scopes, statistics, nodeType) { super(nodeType); this.name = name; this.bod = bod; @@ -3245,7 +3245,7 @@ var TypeScript; this.arguments = arguments; this.vars = vars; this.scopes = scopes; - this.statics = statics; + this.statistics = statistics; this.hint = null; this.fncFlags = FncFlags.None; this.returnTypeAnnotation = null; @@ -3361,7 +3361,7 @@ var TypeScript; this.fncFlags = FncFlags.None; } isSignature() { return (this.fncFlags & FncFlags.Signature) != FncFlags.None; } - hasStaticDeclarations() { return (!this.isConstructor && (this.statics.members.length > 0 || this.innerStaticFuncs.length > 0)); } + hasStaticDeclarations() { return (!this.isConstructor && (this.statistics.members.length > 0 || this.innerStaticFuncs.length > 0)); } } TypeScript.FuncDecl = FuncDecl; class LocationInfo { @@ -3890,7 +3890,7 @@ var TypeScript; TypeScript.EndCode = EndCode; class ForInStatement extends Statement { constructor(lval, obj) { - super(NodeType.ForIn); + super(NodeType.foreign); this.lval = lval; this.obj = obj; this.statement = new ASTSpan(); @@ -3966,7 +3966,7 @@ var TypeScript; emitter.emitParensAndCommentsInPlace(this, false); } typeCheck(typeFlow) { - if (typeFlow.checker.styleSettings.forin) { + if (typeFlow.checker.styleSettings.foreign) { if (!this.isFiltered()) { typeFlow.checker.errorReporter.styleError(this, "no hasOwnProperty filter"); } diff --git a/tests/baselines/reference/parserRealSource11.symbols b/tests/baselines/reference/parserRealSource11.symbols index d6d653b525a2e..01c53e3a2f33a 100644 --- a/tests/baselines/reference/parserRealSource11.symbols +++ b/tests/baselines/reference/parserRealSource11.symbols @@ -2829,14 +2829,14 @@ namespace TypeScript { >ASTList : Symbol(ASTList, Decl(parserRealSource11.ts, 188, 5)) >isConstructor : Symbol(FuncDecl.isConstructor, Decl(parserRealSource11.ts, 983, 66)) - public arguments: ASTList, public vars: ASTList, public scopes: ASTList, public statics: ASTList, + public arguments: ASTList, public vars: ASTList, public scopes: ASTList, public statistics: ASTList, >arguments : Symbol(FuncDecl.arguments, Decl(parserRealSource11.ts, 983, 97)) >ASTList : Symbol(ASTList, Decl(parserRealSource11.ts, 188, 5)) >vars : Symbol(FuncDecl.vars, Decl(parserRealSource11.ts, 984, 47)) >ASTList : Symbol(ASTList, Decl(parserRealSource11.ts, 188, 5)) >scopes : Symbol(FuncDecl.scopes, Decl(parserRealSource11.ts, 984, 69)) >ASTList : Symbol(ASTList, Decl(parserRealSource11.ts, 188, 5)) ->statics : Symbol(FuncDecl.statics, Decl(parserRealSource11.ts, 984, 93)) +>statistics : Symbol(FuncDecl.statistics, Decl(parserRealSource11.ts, 984, 93)) >ASTList : Symbol(ASTList, Decl(parserRealSource11.ts, 188, 5)) nodeType: number) { @@ -3241,16 +3241,16 @@ namespace TypeScript { >this : Symbol(FuncDecl, Decl(parserRealSource11.ts, 954, 23)) >fncFlags : Symbol(FuncDecl.fncFlags, Decl(parserRealSource11.ts, 957, 35)) - public hasStaticDeclarations() { return (!this.isConstructor && (this.statics.members.length > 0 || this.innerStaticFuncs.length > 0)); } + public hasStaticDeclarations() { return (!this.isConstructor && (this.statistics.members.length > 0 || this.innerStaticFuncs.length > 0)); } >hasStaticDeclarations : Symbol(FuncDecl.hasStaticDeclarations, Decl(parserRealSource11.ts, 1097, 94)) >this.isConstructor : Symbol(FuncDecl.isConstructor, Decl(parserRealSource11.ts, 983, 66)) >this : Symbol(FuncDecl, Decl(parserRealSource11.ts, 954, 23)) >isConstructor : Symbol(FuncDecl.isConstructor, Decl(parserRealSource11.ts, 983, 66)) ->this.statics.members.length : Symbol(Array.length, Decl(lib.es5.d.ts, --, --)) ->this.statics.members : Symbol(ASTList.members, Decl(parserRealSource11.ts, 191, 50)) ->this.statics : Symbol(FuncDecl.statics, Decl(parserRealSource11.ts, 984, 93)) +>this.statistics.members.length : Symbol(Array.length, Decl(lib.es5.d.ts, --, --)) +>this.statistics.members : Symbol(ASTList.members, Decl(parserRealSource11.ts, 191, 50)) +>this.statistics : Symbol(FuncDecl.statistics, Decl(parserRealSource11.ts, 984, 93)) >this : Symbol(FuncDecl, Decl(parserRealSource11.ts, 954, 23)) ->statics : Symbol(FuncDecl.statics, Decl(parserRealSource11.ts, 984, 93)) +>statistics : Symbol(FuncDecl.statistics, Decl(parserRealSource11.ts, 984, 93)) >members : Symbol(ASTList.members, Decl(parserRealSource11.ts, 191, 50)) >length : Symbol(Array.length, Decl(lib.es5.d.ts, --, --)) >this.innerStaticFuncs.length : Symbol(Array.length, Decl(lib.es5.d.ts, --, --)) @@ -5085,7 +5085,7 @@ namespace TypeScript { >obj : Symbol(ForInStatement.obj, Decl(parserRealSource11.ts, 1686, 38)) >AST : Symbol(AST, Decl(parserRealSource11.ts, 9, 5)) - super(NodeType.ForIn); + super(NodeType.foreign); >super : Symbol(Statement, Decl(parserRealSource11.ts, 1291, 5)) if (this.lval && (this.lval.nodeType == NodeType.VarDecl)) { @@ -5411,7 +5411,7 @@ namespace TypeScript { >typeFlow : Symbol(typeFlow, Decl(parserRealSource11.ts, 1765, 25)) >TypeFlow : Symbol(TypeFlow) - if (typeFlow.checker.styleSettings.forin) { + if (typeFlow.checker.styleSettings.foreign) { >typeFlow : Symbol(typeFlow, Decl(parserRealSource11.ts, 1765, 25)) if (!this.isFiltered()) { diff --git a/tests/baselines/reference/parserRealSource11.types b/tests/baselines/reference/parserRealSource11.types index ac71e73533bb0..018848acacc66 100644 --- a/tests/baselines/reference/parserRealSource11.types +++ b/tests/baselines/reference/parserRealSource11.types @@ -7343,14 +7343,14 @@ namespace TypeScript { >isConstructor : boolean > : ^^^^^^^ - public arguments: ASTList, public vars: ASTList, public scopes: ASTList, public statics: ASTList, + public arguments: ASTList, public vars: ASTList, public scopes: ASTList, public statistics: ASTList, >arguments : ASTList > : ^^^^^^^ >vars : ASTList > : ^^^^^^^ >scopes : ASTList > : ^^^^^^^ ->statics : ASTList +>statistics : ASTList > : ^^^^^^^ nodeType: number) { @@ -8320,12 +8320,12 @@ namespace TypeScript { >None : any > : ^^^ - public hasStaticDeclarations() { return (!this.isConstructor && (this.statics.members.length > 0 || this.innerStaticFuncs.length > 0)); } + public hasStaticDeclarations() { return (!this.isConstructor && (this.statistics.members.length > 0 || this.innerStaticFuncs.length > 0)); } >hasStaticDeclarations : () => boolean > : ^^^^^^^^^^^^^ ->(!this.isConstructor && (this.statics.members.length > 0 || this.innerStaticFuncs.length > 0)) : boolean +>(!this.isConstructor && (this.statistics.members.length > 0 || this.innerStaticFuncs.length > 0)) : boolean > : ^^^^^^^ ->!this.isConstructor && (this.statics.members.length > 0 || this.innerStaticFuncs.length > 0) : boolean +>!this.isConstructor && (this.statistics.members.length > 0 || this.innerStaticFuncs.length > 0) : boolean > : ^^^^^^^ >!this.isConstructor : boolean > : ^^^^^^^ @@ -8335,21 +8335,21 @@ namespace TypeScript { > : ^^^^ >isConstructor : boolean > : ^^^^^^^ ->(this.statics.members.length > 0 || this.innerStaticFuncs.length > 0) : boolean +>(this.statistics.members.length > 0 || this.innerStaticFuncs.length > 0) : boolean > : ^^^^^^^ ->this.statics.members.length > 0 || this.innerStaticFuncs.length > 0 : boolean +>this.statistics.members.length > 0 || this.innerStaticFuncs.length > 0 : boolean > : ^^^^^^^ ->this.statics.members.length > 0 : boolean +>this.statistics.members.length > 0 : boolean > : ^^^^^^^ ->this.statics.members.length : number +>this.statistics.members.length : number > : ^^^^^^ ->this.statics.members : AST[] +>this.statistics.members : AST[] > : ^^^^^ ->this.statics : ASTList +>this.statistics : ASTList > : ^^^^^^^ >this : this > : ^^^^ ->statics : ASTList +>statistics : ASTList > : ^^^^^^^ >members : AST[] > : ^^^^^ @@ -12756,16 +12756,16 @@ namespace TypeScript { >obj : AST > : ^^^ - super(NodeType.ForIn); ->super(NodeType.ForIn) : void + super(NodeType.foreign); +>super(NodeType.foreign) : void > : ^^^^ >super : typeof Statement > : ^^^^^^^^^^^^^^^^ ->NodeType.ForIn : any +>NodeType.foreign : any > : ^^^ >NodeType : any > : ^^^ ->ForIn : any +>foreign : any > : ^^^ if (this.lval && (this.lval.nodeType == NodeType.VarDecl)) { @@ -13586,8 +13586,8 @@ namespace TypeScript { >typeFlow : TypeFlow > : ^^^^^^^^ - if (typeFlow.checker.styleSettings.forin) { ->typeFlow.checker.styleSettings.forin : any + if (typeFlow.checker.styleSettings.foreign) { +>typeFlow.checker.styleSettings.foreign : any > : ^^^ >typeFlow.checker.styleSettings : any > : ^^^ @@ -13599,7 +13599,7 @@ namespace TypeScript { > : ^^^ >styleSettings : any > : ^^^ ->forin : any +>foreign : any > : ^^^ if (!this.isFiltered()) { diff --git a/tests/baselines/reference/parserRealSource12.errors.txt b/tests/baselines/reference/parserRealSource12.errors.txt index 13604144620e0..91d89ab619da7 100644 --- a/tests/baselines/reference/parserRealSource12.errors.txt +++ b/tests/baselines/reference/parserRealSource12.errors.txt @@ -571,7 +571,7 @@ parserRealSource12.ts(524,30): error TS2304: Cannot find name 'ASTList'. this.childrenWalkers[NodeType.For] = ChildrenWalkers.walkForStatementChildren; ~~~~~~~~ !!! error TS2304: Cannot find name 'NodeType'. - this.childrenWalkers[NodeType.ForIn] = ChildrenWalkers.walkForInStatementChildren; + this.childrenWalkers[NodeType.foreign] = ChildrenWalkers.walkForInStatementChildren; ~~~~~~~~ !!! error TS2304: Cannot find name 'NodeType'. this.childrenWalkers[NodeType.If] = ChildrenWalkers.walkIfStatementChildren; diff --git a/tests/baselines/reference/parserRealSource12.js b/tests/baselines/reference/parserRealSource12.js index 5f959fc58c677..6ff99207bff91 100644 --- a/tests/baselines/reference/parserRealSource12.js +++ b/tests/baselines/reference/parserRealSource12.js @@ -174,7 +174,7 @@ namespace TypeScript { this.childrenWalkers[NodeType.Continue] = ChildrenWalkers.walkNone; this.childrenWalkers[NodeType.Throw] = ChildrenWalkers.walkUnaryExpressionChildren; this.childrenWalkers[NodeType.For] = ChildrenWalkers.walkForStatementChildren; - this.childrenWalkers[NodeType.ForIn] = ChildrenWalkers.walkForInStatementChildren; + this.childrenWalkers[NodeType.foreign] = ChildrenWalkers.walkForInStatementChildren; this.childrenWalkers[NodeType.If] = ChildrenWalkers.walkIfStatementChildren; this.childrenWalkers[NodeType.While] = ChildrenWalkers.walkWhileStatementChildren; this.childrenWalkers[NodeType.DoWhile] = ChildrenWalkers.walkDoWhileStatementChildren; @@ -685,7 +685,7 @@ var TypeScript; this.childrenWalkers[NodeType.Continue] = ChildrenWalkers.walkNone; this.childrenWalkers[NodeType.Throw] = ChildrenWalkers.walkUnaryExpressionChildren; this.childrenWalkers[NodeType.For] = ChildrenWalkers.walkForStatementChildren; - this.childrenWalkers[NodeType.ForIn] = ChildrenWalkers.walkForInStatementChildren; + this.childrenWalkers[NodeType.foreign] = ChildrenWalkers.walkForInStatementChildren; this.childrenWalkers[NodeType.If] = ChildrenWalkers.walkIfStatementChildren; this.childrenWalkers[NodeType.While] = ChildrenWalkers.walkWhileStatementChildren; this.childrenWalkers[NodeType.DoWhile] = ChildrenWalkers.walkDoWhileStatementChildren; diff --git a/tests/baselines/reference/parserRealSource12.symbols b/tests/baselines/reference/parserRealSource12.symbols index fb103d3ac361a..cedcc4f4dcb03 100644 --- a/tests/baselines/reference/parserRealSource12.symbols +++ b/tests/baselines/reference/parserRealSource12.symbols @@ -948,7 +948,7 @@ namespace TypeScript { >ChildrenWalkers : Symbol(ChildrenWalkers, Decl(parserRealSource12.ts, 217, 5)) >walkForStatementChildren : Symbol(ChildrenWalkers.walkForStatementChildren, Decl(parserRealSource12.ts, 330, 9)) - this.childrenWalkers[NodeType.ForIn] = ChildrenWalkers.walkForInStatementChildren; + this.childrenWalkers[NodeType.foreign] = ChildrenWalkers.walkForInStatementChildren; >this.childrenWalkers : Symbol(AstWalkerFactory.childrenWalkers, Decl(parserRealSource12.ts, 69, 35)) >this : Symbol(AstWalkerFactory, Decl(parserRealSource12.ts, 67, 5)) >childrenWalkers : Symbol(AstWalkerFactory.childrenWalkers, Decl(parserRealSource12.ts, 69, 35)) diff --git a/tests/baselines/reference/parserRealSource12.types b/tests/baselines/reference/parserRealSource12.types index 5b21f67eea5e7..7e5192cc02232 100644 --- a/tests/baselines/reference/parserRealSource12.types +++ b/tests/baselines/reference/parserRealSource12.types @@ -2399,10 +2399,10 @@ namespace TypeScript { >walkForStatementChildren : (preAst: ForStatement, parent: AST, walker: IAstWalker) => void > : ^ ^^ ^^ ^^ ^^ ^^ ^^^^^ - this.childrenWalkers[NodeType.ForIn] = ChildrenWalkers.walkForInStatementChildren; ->this.childrenWalkers[NodeType.ForIn] = ChildrenWalkers.walkForInStatementChildren : (preAst: ForInStatement, parent: AST, walker: IAstWalker) => void + this.childrenWalkers[NodeType.foreign] = ChildrenWalkers.walkForInStatementChildren; +>this.childrenWalkers[NodeType.foreign] = ChildrenWalkers.walkForInStatementChildren : (preAst: ForInStatement, parent: AST, walker: IAstWalker) => void > : ^ ^^ ^^ ^^ ^^ ^^ ^^^^^ ->this.childrenWalkers[NodeType.ForIn] : IAstWalkChildren +>this.childrenWalkers[NodeType.foreign] : IAstWalkChildren > : ^^^^^^^^^^^^^^^^ >this.childrenWalkers : IAstWalkChildren[] > : ^^^^^^^^^^^^^^^^^^ @@ -2410,11 +2410,11 @@ namespace TypeScript { > : ^^^^ >childrenWalkers : IAstWalkChildren[] > : ^^^^^^^^^^^^^^^^^^ ->NodeType.ForIn : any +>NodeType.foreign : any > : ^^^ >NodeType : any > : ^^^ ->ForIn : any +>foreign : any > : ^^^ >ChildrenWalkers.walkForInStatementChildren : (preAst: ForInStatement, parent: AST, walker: IAstWalker) => void > : ^ ^^ ^^ ^^ ^^ ^^ ^^^^^ diff --git a/tests/baselines/reference/parserRealSource14.errors.txt b/tests/baselines/reference/parserRealSource14.errors.txt index 7c74bb3299530..ad3fca309c6f9 100644 --- a/tests/baselines/reference/parserRealSource14.errors.txt +++ b/tests/baselines/reference/parserRealSource14.errors.txt @@ -599,7 +599,7 @@ parserRealSource14.ts(572,20): error TS2339: Property 'getAstWalkerFactory' does public isBodyOfForIn(): boolean { return this.count() >= 2 && - this.asts[this.top - 1].nodeType === TypeScript.NodeType.ForIn && + this.asts[this.top - 1].nodeType === TypeScript.NodeType.foreign && ~~~~~~~~ !!! error TS2339: Property 'NodeType' does not exist on type 'typeof TypeScript'. (this.asts[this.top - 1]).body == this.asts[this.top - 0]; @@ -886,7 +886,7 @@ parserRealSource14.ts(572,20): error TS2339: Property 'getAstWalkerFactory' does // If we ask for the AST at the position after the "r" character, we won't see we are // inside a comment, because the "class" AST node has a limChar corresponding to the position of // the "{" character, meaning we don't traverse the tree down to the stmt list of the class, meaning - // we don't find the "precomment" attached to the errorneous empty stmt. + // we don't find the "precomment" attached to the erroneous empty stmt. //TODO: It would be nice to be able to get rid of this. DontPruneSearchBasedOnPosition = 1 << 1, } diff --git a/tests/baselines/reference/parserRealSource14.js b/tests/baselines/reference/parserRealSource14.js index c63575f75fd6d..f9ffe78243df1 100644 --- a/tests/baselines/reference/parserRealSource14.js +++ b/tests/baselines/reference/parserRealSource14.js @@ -283,7 +283,7 @@ namespace TypeScript { public isBodyOfForIn(): boolean { return this.count() >= 2 && - this.asts[this.top - 1].nodeType === TypeScript.NodeType.ForIn && + this.asts[this.top - 1].nodeType === TypeScript.NodeType.foreign && (this.asts[this.top - 1]).body == this.asts[this.top - 0]; } @@ -454,7 +454,7 @@ namespace TypeScript { // If we ask for the AST at the position after the "r" character, we won't see we are // inside a comment, because the "class" AST node has a limChar corresponding to the position of // the "{" character, meaning we don't traverse the tree down to the stmt list of the class, meaning - // we don't find the "precomment" attached to the errorneous empty stmt. + // we don't find the "precomment" attached to the erroneous empty stmt. //TODO: It would be nice to be able to get rid of this. DontPruneSearchBasedOnPosition = 1 << 1, } @@ -817,7 +817,7 @@ var TypeScript; } isBodyOfForIn() { return this.count() >= 2 && - this.asts[this.top - 1].nodeType === TypeScript.NodeType.ForIn && + this.asts[this.top - 1].nodeType === TypeScript.NodeType.foreign && this.asts[this.top - 1].body == this.asts[this.top - 0]; } isBodyOfWith() { @@ -967,7 +967,7 @@ var TypeScript; // If we ask for the AST at the position after the "r" character, we won't see we are // inside a comment, because the "class" AST node has a limChar corresponding to the position of // the "{" character, meaning we don't traverse the tree down to the stmt list of the class, meaning - // we don't find the "precomment" attached to the errorneous empty stmt. + // we don't find the "precomment" attached to the erroneous empty stmt. //TODO: It would be nice to be able to get rid of this. GetAstPathOptions[GetAstPathOptions["DontPruneSearchBasedOnPosition"] = 2] = "DontPruneSearchBasedOnPosition"; })(GetAstPathOptions = TypeScript.GetAstPathOptions || (TypeScript.GetAstPathOptions = {})); diff --git a/tests/baselines/reference/parserRealSource14.symbols b/tests/baselines/reference/parserRealSource14.symbols index 44f9aeec74a02..1dcb28ff731c9 100644 --- a/tests/baselines/reference/parserRealSource14.symbols +++ b/tests/baselines/reference/parserRealSource14.symbols @@ -1342,7 +1342,7 @@ namespace TypeScript { >this : Symbol(AstPath, Decl(parserRealSource14.ts, 16, 5)) >count : Symbol(AstPath.count, Decl(parserRealSource14.ts, 79, 9)) - this.asts[this.top - 1].nodeType === TypeScript.NodeType.ForIn && + this.asts[this.top - 1].nodeType === TypeScript.NodeType.foreign && >this.asts : Symbol(AstPath.asts, Decl(parserRealSource14.ts, 22, 26)) >this : Symbol(AstPath, Decl(parserRealSource14.ts, 16, 5)) >asts : Symbol(AstPath.asts, Decl(parserRealSource14.ts, 22, 26)) @@ -2237,7 +2237,7 @@ namespace TypeScript { // If we ask for the AST at the position after the "r" character, we won't see we are // inside a comment, because the "class" AST node has a limChar corresponding to the position of // the "{" character, meaning we don't traverse the tree down to the stmt list of the class, meaning - // we don't find the "precomment" attached to the errorneous empty stmt. + // we don't find the "precomment" attached to the erroneous empty stmt. //TODO: It would be nice to be able to get rid of this. DontPruneSearchBasedOnPosition = 1 << 1, >DontPruneSearchBasedOnPosition : Symbol(GetAstPathOptions.DontPruneSearchBasedOnPosition, Decl(parserRealSource14.ts, 447, 26)) diff --git a/tests/baselines/reference/parserRealSource14.types b/tests/baselines/reference/parserRealSource14.types index defd8f53d4381..da3d0620fa806 100644 --- a/tests/baselines/reference/parserRealSource14.types +++ b/tests/baselines/reference/parserRealSource14.types @@ -3983,9 +3983,9 @@ namespace TypeScript { > : ^^^^^^ return this.count() >= 2 && ->this.count() >= 2 && this.asts[this.top - 1].nodeType === TypeScript.NodeType.ForIn && (this.asts[this.top - 1]).body == this.asts[this.top - 0] : boolean +>this.count() >= 2 && this.asts[this.top - 1].nodeType === TypeScript.NodeType.foreign && (this.asts[this.top - 1]).body == this.asts[this.top - 0] : boolean > : ^^^^^^^ ->this.count() >= 2 && this.asts[this.top - 1].nodeType === TypeScript.NodeType.ForIn : boolean +>this.count() >= 2 && this.asts[this.top - 1].nodeType === TypeScript.NodeType.foreign : boolean > : ^^^^^^^ >this.count() >= 2 : boolean > : ^^^^^^^ @@ -4000,8 +4000,8 @@ namespace TypeScript { >2 : 2 > : ^ - this.asts[this.top - 1].nodeType === TypeScript.NodeType.ForIn && ->this.asts[this.top - 1].nodeType === TypeScript.NodeType.ForIn : boolean + this.asts[this.top - 1].nodeType === TypeScript.NodeType.foreign && +>this.asts[this.top - 1].nodeType === TypeScript.NodeType.foreign : boolean > : ^^^^^^^ >this.asts[this.top - 1].nodeType : any > : ^^^ @@ -4025,7 +4025,7 @@ namespace TypeScript { > : ^ >nodeType : any > : ^^^ ->TypeScript.NodeType.ForIn : any +>TypeScript.NodeType.foreign : any > : ^^^ >TypeScript.NodeType : any > : ^^^ @@ -4033,7 +4033,7 @@ namespace TypeScript { > : ^^^^^^^^^^^^^^^^^ >NodeType : any > : ^^^ ->ForIn : any +>foreign : any > : ^^^ (this.asts[this.top - 1]).body == this.asts[this.top - 0]; @@ -6929,7 +6929,7 @@ namespace TypeScript { // If we ask for the AST at the position after the "r" character, we won't see we are // inside a comment, because the "class" AST node has a limChar corresponding to the position of // the "{" character, meaning we don't traverse the tree down to the stmt list of the class, meaning - // we don't find the "precomment" attached to the errorneous empty stmt. + // we don't find the "precomment" attached to the erroneous empty stmt. //TODO: It would be nice to be able to get rid of this. DontPruneSearchBasedOnPosition = 1 << 1, >DontPruneSearchBasedOnPosition : GetAstPathOptions.DontPruneSearchBasedOnPosition diff --git a/tests/baselines/reference/parserRealSource2.errors.txt b/tests/baselines/reference/parserRealSource2.errors.txt index fcdda1ba74ee7..eefff7d6be500 100644 --- a/tests/baselines/reference/parserRealSource2.errors.txt +++ b/tests/baselines/reference/parserRealSource2.errors.txt @@ -83,8 +83,8 @@ parserRealSource2.ts(4,21): error TS6053: File 'typescript.ts' not found. export enum ASTFlags { None = 0, - ExplicitSemicolon = 1, // statment terminated by an explicit semicolon - AutomaticSemicolon = 1 << 1, // statment terminated by an automatic semicolon + ExplicitSemicolon = 1, // statement terminated by an explicit semicolon + AutomaticSemicolon = 1 << 1, // statement terminated by an automatic semicolon Writeable = 1 << 2, // node is lhs that can be modified Error = 1 << 3, // node has an error DotLHSPartial = 1 << 4, // node is the lhs of an incomplete dot expr at cursor diff --git a/tests/baselines/reference/parserRealSource2.js b/tests/baselines/reference/parserRealSource2.js index 9db7bd7ada67f..827c7c36738ca 100644 --- a/tests/baselines/reference/parserRealSource2.js +++ b/tests/baselines/reference/parserRealSource2.js @@ -80,8 +80,8 @@ namespace TypeScript { export enum ASTFlags { None = 0, - ExplicitSemicolon = 1, // statment terminated by an explicit semicolon - AutomaticSemicolon = 1 << 1, // statment terminated by an automatic semicolon + ExplicitSemicolon = 1, // statement terminated by an explicit semicolon + AutomaticSemicolon = 1 << 1, // statement terminated by an automatic semicolon Writeable = 1 << 2, // node is lhs that can be modified Error = 1 << 3, // node has an error DotLHSPartial = 1 << 4, // node is the lhs of an incomplete dot expr at cursor diff --git a/tests/baselines/reference/parserRealSource2.symbols b/tests/baselines/reference/parserRealSource2.symbols index fb8f0a7966c99..845b2ab687fa0 100644 --- a/tests/baselines/reference/parserRealSource2.symbols +++ b/tests/baselines/reference/parserRealSource2.symbols @@ -223,10 +223,10 @@ namespace TypeScript { None = 0, >None : Symbol(ASTFlags.None, Decl(parserRealSource2.ts, 77, 26)) - ExplicitSemicolon = 1, // statment terminated by an explicit semicolon + ExplicitSemicolon = 1, // statement terminated by an explicit semicolon >ExplicitSemicolon : Symbol(ASTFlags.ExplicitSemicolon, Decl(parserRealSource2.ts, 78, 17)) - AutomaticSemicolon = 1 << 1, // statment terminated by an automatic semicolon + AutomaticSemicolon = 1 << 1, // statement terminated by an automatic semicolon >AutomaticSemicolon : Symbol(ASTFlags.AutomaticSemicolon, Decl(parserRealSource2.ts, 79, 30)) Writeable = 1 << 2, // node is lhs that can be modified diff --git a/tests/baselines/reference/parserRealSource2.types b/tests/baselines/reference/parserRealSource2.types index 43c6f739cc829..8b568be3a4c82 100644 --- a/tests/baselines/reference/parserRealSource2.types +++ b/tests/baselines/reference/parserRealSource2.types @@ -629,13 +629,13 @@ namespace TypeScript { >0 : 0 > : ^ - ExplicitSemicolon = 1, // statment terminated by an explicit semicolon + ExplicitSemicolon = 1, // statement terminated by an explicit semicolon >ExplicitSemicolon : ASTFlags.ExplicitSemicolon > : ^^^^^^^^^^^^^^^^^^^^^^^^^^ >1 : 1 > : ^ - AutomaticSemicolon = 1 << 1, // statment terminated by an automatic semicolon + AutomaticSemicolon = 1 << 1, // statement terminated by an automatic semicolon >AutomaticSemicolon : ASTFlags.AutomaticSemicolon > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^ >1 << 1 : number diff --git a/tests/baselines/reference/parserRealSource3.errors.txt b/tests/baselines/reference/parserRealSource3.errors.txt index 1ca604b03bdcb..8dbfa8f970816 100644 --- a/tests/baselines/reference/parserRealSource3.errors.txt +++ b/tests/baselines/reference/parserRealSource3.errors.txt @@ -92,7 +92,7 @@ parserRealSource3.ts(4,21): error TS6053: File 'typescript.ts' not found. Continue, Throw, For, - ForIn, + foreign, If, While, DoWhile, diff --git a/tests/baselines/reference/parserRealSource3.js b/tests/baselines/reference/parserRealSource3.js index d977813538721..d1ff5c157c6ce 100644 --- a/tests/baselines/reference/parserRealSource3.js +++ b/tests/baselines/reference/parserRealSource3.js @@ -89,7 +89,7 @@ namespace TypeScript { Continue, Throw, For, - ForIn, + foreign, If, While, DoWhile, @@ -211,7 +211,7 @@ var TypeScript; NodeType[NodeType["Continue"] = 77] = "Continue"; NodeType[NodeType["Throw"] = 78] = "Throw"; NodeType[NodeType["For"] = 79] = "For"; - NodeType[NodeType["ForIn"] = 80] = "ForIn"; + NodeType[NodeType["foreign"] = 80] = "foreign"; NodeType[NodeType["If"] = 81] = "If"; NodeType[NodeType["While"] = 82] = "While"; NodeType[NodeType["DoWhile"] = 83] = "DoWhile"; diff --git a/tests/baselines/reference/parserRealSource3.symbols b/tests/baselines/reference/parserRealSource3.symbols index 3e47146c11774..660ce00995df4 100644 --- a/tests/baselines/reference/parserRealSource3.symbols +++ b/tests/baselines/reference/parserRealSource3.symbols @@ -253,8 +253,8 @@ namespace TypeScript { For, >For : Symbol(NodeType.For, Decl(parserRealSource3.ts, 86, 14)) - ForIn, ->ForIn : Symbol(NodeType.ForIn, Decl(parserRealSource3.ts, 87, 12)) + foreign, +>foreign : Symbol(NodeType.foreign, Decl(parserRealSource3.ts, 87, 12)) If, >If : Symbol(NodeType.If, Decl(parserRealSource3.ts, 88, 14)) diff --git a/tests/baselines/reference/parserRealSource3.types b/tests/baselines/reference/parserRealSource3.types index 7a6d457f382c4..2ad7a0735ba18 100644 --- a/tests/baselines/reference/parserRealSource3.types +++ b/tests/baselines/reference/parserRealSource3.types @@ -335,8 +335,8 @@ namespace TypeScript { >For : NodeType.For > : ^^^^^^^^^^^^ - ForIn, ->ForIn : NodeType.ForIn + foreign, +>foreign : NodeType.foreign > : ^^^^^^^^^^^^^^ If, diff --git a/tests/baselines/reference/parserRealSource8.errors.txt b/tests/baselines/reference/parserRealSource8.errors.txt index 87419b617bcfc..ff3edf33f2522 100644 --- a/tests/baselines/reference/parserRealSource8.errors.txt +++ b/tests/baselines/reference/parserRealSource8.errors.txt @@ -502,7 +502,7 @@ parserRealSource8.ts(454,35): error TS2304: Cannot find name 'Catch'. !!! error TS2304: Cannot find name 'TypeSymbol'. if (isStatic) { - // In the case of function-nested statics, no member list will have bee initialized for the function, so we need + // In the case of function-nested statistics, no member list will have bee initialized for the function, so we need // to copy it over. We don't set this by default because having a non-null member list will throw off assignment // compatibility tests if (outerFnc.type.members == null && container.getType().memberScope) { @@ -640,7 +640,7 @@ parserRealSource8.ts(454,35): error TS2304: Cannot find name 'Catch'. var locals = new SymbolScopeBuilder(funcMembers, ambientFuncMembers, null, null, parentScope, localContainer); ~~~~~~~~~~~~~~~~~~ !!! error TS2304: Cannot find name 'SymbolScopeBuilder'. - var statics = new SymbolScopeBuilder(funcStaticMembers, ambientFuncStaticMembers, null, null, parentScope, null); + var statistics = new SymbolScopeBuilder(funcStaticMembers, ambientFuncStaticMembers, null, null, parentScope, null); ~~~~~~~~~~~~~~~~~~ !!! error TS2304: Cannot find name 'SymbolScopeBuilder'. @@ -667,8 +667,8 @@ parserRealSource8.ts(454,35): error TS2304: Cannot find name 'Catch'. group.containedScope = locals; locals.container = group.symbol; - group.memberScope = statics; - statics.container = group.symbol; + group.memberScope = statistics; + statistics.container = group.symbol; } funcDecl.enclosingFnc = context.scopeChain.fnc; group.enclosingType = isStatic ? context.scopeChain.classType : context.scopeChain.thisType; @@ -683,7 +683,7 @@ parserRealSource8.ts(454,35): error TS2304: Cannot find name 'Catch'. !!! error TS2304: Cannot find name 'FncFlags'. context.typeFlow.addLocalsFromScope(locals, fgSym, funcDecl.vars, funcTable, false); - context.typeFlow.addLocalsFromScope(statics, fgSym, funcDecl.statics, + context.typeFlow.addLocalsFromScope(statistics, fgSym, funcDecl.statistics, funcStaticTable, false); } if (signature.parameters) { diff --git a/tests/baselines/reference/parserRealSource8.js b/tests/baselines/reference/parserRealSource8.js index 0f7ebfda642dc..b4551b66cd95a 100644 --- a/tests/baselines/reference/parserRealSource8.js +++ b/tests/baselines/reference/parserRealSource8.js @@ -242,7 +242,7 @@ namespace TypeScript { var fgSym: TypeSymbol = null; if (isStatic) { - // In the case of function-nested statics, no member list will have bee initialized for the function, so we need + // In the case of function-nested statistics, no member list will have bee initialized for the function, so we need // to copy it over. We don't set this by default because having a non-null member list will throw off assignment // compatibility tests if (outerFnc.type.members == null && container.getType().memberScope) { @@ -322,7 +322,7 @@ namespace TypeScript { funcDecl.unitIndex = context.typeFlow.checker.locationInfo.unitIndex; var locals = new SymbolScopeBuilder(funcMembers, ambientFuncMembers, null, null, parentScope, localContainer); - var statics = new SymbolScopeBuilder(funcStaticMembers, ambientFuncStaticMembers, null, null, parentScope, null); + var statistics = new SymbolScopeBuilder(funcStaticMembers, ambientFuncStaticMembers, null, null, parentScope, null); if (funcDecl.isConstructor && context.scopeChain.thisType) { context.scopeChain.thisType.constructorScope = locals; @@ -347,8 +347,8 @@ namespace TypeScript { group.containedScope = locals; locals.container = group.symbol; - group.memberScope = statics; - statics.container = group.symbol; + group.memberScope = statistics; + statistics.container = group.symbol; } funcDecl.enclosingFnc = context.scopeChain.fnc; group.enclosingType = isStatic ? context.scopeChain.classType : context.scopeChain.thisType; @@ -357,7 +357,7 @@ namespace TypeScript { if (((funcDecl.fncFlags & FncFlags.Signature) == FncFlags.None) && funcDecl.vars) { context.typeFlow.addLocalsFromScope(locals, fgSym, funcDecl.vars, funcTable, false); - context.typeFlow.addLocalsFromScope(statics, fgSym, funcDecl.statics, + context.typeFlow.addLocalsFromScope(statistics, fgSym, funcDecl.statistics, funcStaticTable, false); } if (signature.parameters) { @@ -676,7 +676,7 @@ var TypeScript; var nameText = funcDecl.name ? funcDecl.name.actualText : null; var fgSym = null; if (isStatic) { - // In the case of function-nested statics, no member list will have bee initialized for the function, so we need + // In the case of function-nested statistics, no member list will have bee initialized for the function, so we need // to copy it over. We don't set this by default because having a non-null member list will throw off assignment // compatibility tests if (outerFnc.type.members == null && container.getType().memberScope) { @@ -743,7 +743,7 @@ var TypeScript; // REVIEW: Is it a problem that this is being set twice for properties and constructors? funcDecl.unitIndex = context.typeFlow.checker.locationInfo.unitIndex; var locals = new SymbolScopeBuilder(funcMembers, ambientFuncMembers, null, null, parentScope, localContainer); - var statics = new SymbolScopeBuilder(funcStaticMembers, ambientFuncStaticMembers, null, null, parentScope, null); + var statistics = new SymbolScopeBuilder(funcStaticMembers, ambientFuncStaticMembers, null, null, parentScope, null); if (funcDecl.isConstructor && context.scopeChain.thisType) { context.scopeChain.thisType.constructorScope = locals; } @@ -762,8 +762,8 @@ var TypeScript; if (!funcDecl.isConstructor) { group.containedScope = locals; locals.container = group.symbol; - group.memberScope = statics; - statics.container = group.symbol; + group.memberScope = statistics; + statistics.container = group.symbol; } funcDecl.enclosingFnc = context.scopeChain.fnc; group.enclosingType = isStatic ? context.scopeChain.classType : context.scopeChain.thisType; @@ -771,7 +771,7 @@ var TypeScript; var fgSym = ast.type.symbol; if (((funcDecl.fncFlags & FncFlags.Signature) == FncFlags.None) && funcDecl.vars) { context.typeFlow.addLocalsFromScope(locals, fgSym, funcDecl.vars, funcTable, false); - context.typeFlow.addLocalsFromScope(statics, fgSym, funcDecl.statics, funcStaticTable, false); + context.typeFlow.addLocalsFromScope(statistics, fgSym, funcDecl.statistics, funcStaticTable, false); } if (signature.parameters) { var len = signature.parameters.length; diff --git a/tests/baselines/reference/parserRealSource8.symbols b/tests/baselines/reference/parserRealSource8.symbols index 7807c7cc35980..4b08db298bd86 100644 --- a/tests/baselines/reference/parserRealSource8.symbols +++ b/tests/baselines/reference/parserRealSource8.symbols @@ -740,7 +740,7 @@ namespace TypeScript { if (isStatic) { >isStatic : Symbol(isStatic, Decl(parserRealSource8.ts, 184, 11)) - // In the case of function-nested statics, no member list will have bee initialized for the function, so we need + // In the case of function-nested statistics, no member list will have bee initialized for the function, so we need // to copy it over. We don't set this by default because having a non-null member list will throw off assignment // compatibility tests if (outerFnc.type.members == null && container.getType().memberScope) { @@ -939,8 +939,8 @@ namespace TypeScript { >parentScope : Symbol(parentScope, Decl(parserRealSource8.ts, 187, 11)) >localContainer : Symbol(localContainer, Decl(parserRealSource8.ts, 179, 11)) - var statics = new SymbolScopeBuilder(funcStaticMembers, ambientFuncStaticMembers, null, null, parentScope, null); ->statics : Symbol(statics, Decl(parserRealSource8.ts, 321, 11)) + var statistics = new SymbolScopeBuilder(funcStaticMembers, ambientFuncStaticMembers, null, null, parentScope, null); +>statistics : Symbol(statistics, Decl(parserRealSource8.ts, 321, 11)) >funcStaticMembers : Symbol(funcStaticMembers, Decl(parserRealSource8.ts, 313, 11)) >ambientFuncStaticMembers : Symbol(ambientFuncStaticMembers, Decl(parserRealSource8.ts, 315, 11)) >parentScope : Symbol(parentScope, Decl(parserRealSource8.ts, 187, 11)) @@ -993,12 +993,12 @@ namespace TypeScript { >locals : Symbol(locals, Decl(parserRealSource8.ts, 320, 11)) >group : Symbol(group, Decl(parserRealSource8.ts, 339, 15)) - group.memberScope = statics; + group.memberScope = statistics; >group : Symbol(group, Decl(parserRealSource8.ts, 339, 15)) ->statics : Symbol(statics, Decl(parserRealSource8.ts, 321, 11)) +>statistics : Symbol(statistics, Decl(parserRealSource8.ts, 321, 11)) - statics.container = group.symbol; ->statics : Symbol(statics, Decl(parserRealSource8.ts, 321, 11)) + statistics.container = group.symbol; +>statistics : Symbol(statistics, Decl(parserRealSource8.ts, 321, 11)) >group : Symbol(group, Decl(parserRealSource8.ts, 339, 15)) } funcDecl.enclosingFnc = context.scopeChain.fnc; @@ -1038,11 +1038,11 @@ namespace TypeScript { funcTable, false); >funcTable : Symbol(funcTable, Decl(parserRealSource8.ts, 308, 11)) - context.typeFlow.addLocalsFromScope(statics, fgSym, funcDecl.statics, + context.typeFlow.addLocalsFromScope(statistics, fgSym, funcDecl.statistics, >context.typeFlow : Symbol(AssignScopeContext.typeFlow, Decl(parserRealSource8.ts, 8, 51)) >context : Symbol(context, Decl(parserRealSource8.ts, 175, 53)) >typeFlow : Symbol(AssignScopeContext.typeFlow, Decl(parserRealSource8.ts, 8, 51)) ->statics : Symbol(statics, Decl(parserRealSource8.ts, 321, 11)) +>statistics : Symbol(statistics, Decl(parserRealSource8.ts, 321, 11)) >fgSym : Symbol(fgSym, Decl(parserRealSource8.ts, 238, 15), Decl(parserRealSource8.ts, 352, 15)) >funcDecl : Symbol(funcDecl, Decl(parserRealSource8.ts, 176, 11)) diff --git a/tests/baselines/reference/parserRealSource8.types b/tests/baselines/reference/parserRealSource8.types index cc243f70632c1..504d09bd66b81 100644 --- a/tests/baselines/reference/parserRealSource8.types +++ b/tests/baselines/reference/parserRealSource8.types @@ -1990,7 +1990,7 @@ namespace TypeScript { >isStatic : any > : ^^^ - // In the case of function-nested statics, no member list will have bee initialized for the function, so we need + // In the case of function-nested statistics, no member list will have bee initialized for the function, so we need // to copy it over. We don't set this by default because having a non-null member list will throw off assignment // compatibility tests if (outerFnc.type.members == null && container.getType().memberScope) { @@ -2735,8 +2735,8 @@ namespace TypeScript { >localContainer : Symbol > : ^^^^^^ - var statics = new SymbolScopeBuilder(funcStaticMembers, ambientFuncStaticMembers, null, null, parentScope, null); ->statics : any + var statistics = new SymbolScopeBuilder(funcStaticMembers, ambientFuncStaticMembers, null, null, parentScope, null); +>statistics : any > : ^^^ >new SymbolScopeBuilder(funcStaticMembers, ambientFuncStaticMembers, null, null, parentScope, null) : any > : ^^^ @@ -2881,8 +2881,8 @@ namespace TypeScript { >symbol : any > : ^^^ - group.memberScope = statics; ->group.memberScope = statics : any + group.memberScope = statistics; +>group.memberScope = statistics : any > : ^^^ >group.memberScope : any > : ^^^ @@ -2890,15 +2890,15 @@ namespace TypeScript { > : ^^^ >memberScope : any > : ^^^ ->statics : any +>statistics : any > : ^^^ - statics.container = group.symbol; ->statics.container = group.symbol : any + statistics.container = group.symbol; +>statistics.container = group.symbol : any > : ^^^ ->statics.container : any +>statistics.container : any > : ^^^ ->statics : any +>statistics : any > : ^^^ >container : any > : ^^^ @@ -3046,8 +3046,8 @@ namespace TypeScript { >false : false > : ^^^^^ - context.typeFlow.addLocalsFromScope(statics, fgSym, funcDecl.statics, ->context.typeFlow.addLocalsFromScope(statics, fgSym, funcDecl.statics, funcStaticTable, false) : any + context.typeFlow.addLocalsFromScope(statistics, fgSym, funcDecl.statistics, +>context.typeFlow.addLocalsFromScope(statistics, fgSym, funcDecl.statistics, funcStaticTable, false) : any > : ^^^ >context.typeFlow.addLocalsFromScope : any > : ^^^ @@ -3059,15 +3059,15 @@ namespace TypeScript { > : ^^^^^^^^ >addLocalsFromScope : any > : ^^^ ->statics : any +>statistics : any > : ^^^ >fgSym : TypeSymbol > : ^^^^^^^^^^ ->funcDecl.statics : any +>funcDecl.statistics : any > : ^^^ >funcDecl : FuncDecl > : ^^^^^^^^ ->statics : any +>statistics : any > : ^^^ funcStaticTable, false); diff --git a/tests/baselines/reference/parserS12.11_A3_T4.errors.txt b/tests/baselines/reference/parserS12.11_A3_T4.errors.txt index e70edaea4e31d..cf82ccc844d2a 100644 --- a/tests/baselines/reference/parserS12.11_A3_T4.errors.txt +++ b/tests/baselines/reference/parserS12.11_A3_T4.errors.txt @@ -9,7 +9,7 @@ parserS12.11_A3_T4.ts(16,9): error TS1109: Expression expected. * Syntax constructions of switch statement * * @path ch12/12.11/S12.11_A3_T4.js - * @description Using "case" that has no Expresson after it. "CaseClause: case Expression : [StatementList]" + * @description Using "case" that has no Expression after it. "CaseClause: case Expression : [StatementList]" * @negative */ diff --git a/tests/baselines/reference/parserS12.11_A3_T4.js b/tests/baselines/reference/parserS12.11_A3_T4.js index 2c5b7b52b87ca..f47afa07f28fc 100644 --- a/tests/baselines/reference/parserS12.11_A3_T4.js +++ b/tests/baselines/reference/parserS12.11_A3_T4.js @@ -8,7 +8,7 @@ * Syntax constructions of switch statement * * @path ch12/12.11/S12.11_A3_T4.js - * @description Using "case" that has no Expresson after it. "CaseClause: case Expression : [StatementList]" + * @description Using "case" that has no Expression after it. "CaseClause: case Expression : [StatementList]" * @negative */ @@ -38,7 +38,7 @@ var x = SwitchTest(0); * Syntax constructions of switch statement * * @path ch12/12.11/S12.11_A3_T4.js - * @description Using "case" that has no Expresson after it. "CaseClause: case Expression : [StatementList]" + * @description Using "case" that has no Expression after it. "CaseClause: case Expression : [StatementList]" * @negative */ function SwitchTest(value) { diff --git a/tests/baselines/reference/parserS12.11_A3_T4.symbols b/tests/baselines/reference/parserS12.11_A3_T4.symbols index 8abd52b1056bf..2fd1bf413e216 100644 --- a/tests/baselines/reference/parserS12.11_A3_T4.symbols +++ b/tests/baselines/reference/parserS12.11_A3_T4.symbols @@ -8,7 +8,7 @@ * Syntax constructions of switch statement * * @path ch12/12.11/S12.11_A3_T4.js - * @description Using "case" that has no Expresson after it. "CaseClause: case Expression : [StatementList]" + * @description Using "case" that has no Expression after it. "CaseClause: case Expression : [StatementList]" * @negative */ diff --git a/tests/baselines/reference/parserS12.11_A3_T4.types b/tests/baselines/reference/parserS12.11_A3_T4.types index 00558684c11ba..307295fac4a61 100644 --- a/tests/baselines/reference/parserS12.11_A3_T4.types +++ b/tests/baselines/reference/parserS12.11_A3_T4.types @@ -8,7 +8,7 @@ * Syntax constructions of switch statement * * @path ch12/12.11/S12.11_A3_T4.js - * @description Using "case" that has no Expresson after it. "CaseClause: case Expression : [StatementList]" + * @description Using "case" that has no Expression after it. "CaseClause: case Expression : [StatementList]" * @negative */ diff --git a/tests/baselines/reference/parserSyntaxWalker.generated.js b/tests/baselines/reference/parserSyntaxWalker.generated.js index c4406ba5cfa0b..e8653de835a3c 100644 --- a/tests/baselines/reference/parserSyntaxWalker.generated.js +++ b/tests/baselines/reference/parserSyntaxWalker.generated.js @@ -114,7 +114,7 @@ // } // /// -// /// Test different statements. Including if-else,swith,foreach,(un)checked,lock,using,try-catch-finally +// /// Test different statements. Including if-else,switch,foreach,(un)checked,lock,using,try-catch-finally // /// // /// // /// @@ -371,7 +371,7 @@ // return 0; // } // /// -// /// Test different statements. Including if-else,swith,foreach,(un)checked,lock,using,try-catch-finally +// /// Test different statements. Including if-else,switch,foreach,(un)checked,lock,using,try-catch-finally // /// // /// // /// diff --git a/tests/baselines/reference/parserSyntaxWalker.generated.symbols b/tests/baselines/reference/parserSyntaxWalker.generated.symbols index ec39c644fa4ef..ec0f653d1baa3 100644 --- a/tests/baselines/reference/parserSyntaxWalker.generated.symbols +++ b/tests/baselines/reference/parserSyntaxWalker.generated.symbols @@ -115,7 +115,7 @@ // } // /// -// /// Test different statements. Including if-else,swith,foreach,(un)checked,lock,using,try-catch-finally +// /// Test different statements. Including if-else,switch,foreach,(un)checked,lock,using,try-catch-finally // /// // /// // /// diff --git a/tests/baselines/reference/parserSyntaxWalker.generated.types b/tests/baselines/reference/parserSyntaxWalker.generated.types index ec39c644fa4ef..ec0f653d1baa3 100644 --- a/tests/baselines/reference/parserSyntaxWalker.generated.types +++ b/tests/baselines/reference/parserSyntaxWalker.generated.types @@ -115,7 +115,7 @@ // } // /// -// /// Test different statements. Including if-else,swith,foreach,(un)checked,lock,using,try-catch-finally +// /// Test different statements. Including if-else,switch,foreach,(un)checked,lock,using,try-catch-finally // /// // /// // /// diff --git a/tests/baselines/reference/parserharness.errors.txt b/tests/baselines/reference/parserharness.errors.txt index 6e6fa182e0f1b..feeedea823bbb 100644 --- a/tests/baselines/reference/parserharness.errors.txt +++ b/tests/baselines/reference/parserharness.errors.txt @@ -1930,7 +1930,7 @@ parserharness.ts(2067,62): error TS18048: 'comparison' is possibly 'undefined'. * extracts options and individual files in a multifile test */ export namespace TestCaseParser { - /** all the necesarry information to set the right compiler settings */ + /** all the necessary information to set the right compiler settings */ export interface CompilerSetting { flag: string; value: string; @@ -2467,7 +2467,7 @@ parserharness.ts(2067,62): error TS18048: 'comparison' is possibly 'undefined'. } export function runJSString(code: string, callback: (error: Error, result: any) => void ) { - // List of names that get overriden by various test code we eval + // List of names that get overridden by various test code we eval var dangerNames: any = ['Array']; var globalBackup: any = {}; diff --git a/tests/baselines/reference/parserharness.js b/tests/baselines/reference/parserharness.js index fcdd4be35fae1..7b7fe17a7536b 100644 --- a/tests/baselines/reference/parserharness.js +++ b/tests/baselines/reference/parserharness.js @@ -1415,7 +1415,7 @@ namespace Harness { * extracts options and individual files in a multifile test */ export namespace TestCaseParser { - /** all the necesarry information to set the right compiler settings */ + /** all the necessary information to set the right compiler settings */ export interface CompilerSetting { flag: string; value: string; @@ -1876,7 +1876,7 @@ namespace Harness { } export function runJSString(code: string, callback: (error: Error, result: any) => void ) { - // List of names that get overriden by various test code we eval + // List of names that get overridden by various test code we eval var dangerNames: any = ['Array']; var globalBackup: any = {}; @@ -3650,7 +3650,7 @@ var Harness; } Runner.runCollateral = runCollateral; function runJSString(code, callback) { - // List of names that get overriden by various test code we eval + // List of names that get overridden by various test code we eval var dangerNames = ['Array']; var globalBackup = {}; var n = null; diff --git a/tests/baselines/reference/parserharness.symbols b/tests/baselines/reference/parserharness.symbols index 5ffaabe835b50..0298accad72ff 100644 --- a/tests/baselines/reference/parserharness.symbols +++ b/tests/baselines/reference/parserharness.symbols @@ -4221,7 +4221,7 @@ namespace Harness { export namespace TestCaseParser { >TestCaseParser : Symbol(TestCaseParser, Decl(parserharness.ts, 1408, 5)) - /** all the necesarry information to set the right compiler settings */ + /** all the necessary information to set the right compiler settings */ export interface CompilerSetting { >CompilerSetting : Symbol(CompilerSetting, Decl(parserharness.ts, 1413, 37)) @@ -5711,7 +5711,7 @@ namespace Harness { >Error : Symbol(Error, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >result : Symbol(result, Decl(parserharness.ts, 1874, 74)) - // List of names that get overriden by various test code we eval + // List of names that get overridden by various test code we eval var dangerNames: any = ['Array']; >dangerNames : Symbol(dangerNames, Decl(parserharness.ts, 1876, 15)) diff --git a/tests/baselines/reference/parserharness.types b/tests/baselines/reference/parserharness.types index 5066f2c31713b..96ad0d4429be1 100644 --- a/tests/baselines/reference/parserharness.types +++ b/tests/baselines/reference/parserharness.types @@ -9622,7 +9622,7 @@ namespace Harness { >TestCaseParser : typeof TestCaseParser > : ^^^^^^^^^^^^^^^^^^^^^ - /** all the necesarry information to set the right compiler settings */ + /** all the necessary information to set the right compiler settings */ export interface CompilerSetting { flag: string; >flag : string @@ -12827,7 +12827,7 @@ namespace Harness { >result : any > : ^^^ - // List of names that get overriden by various test code we eval + // List of names that get overridden by various test code we eval var dangerNames: any = ['Array']; >dangerNames : any > : ^^^ diff --git a/tests/baselines/reference/parserindenter.errors.txt b/tests/baselines/reference/parserindenter.errors.txt index f251b02ca4173..cb70a8bed07ad 100644 --- a/tests/baselines/reference/parserindenter.errors.txt +++ b/tests/baselines/reference/parserindenter.errors.txt @@ -197,7 +197,7 @@ parserindenter.ts(736,38): error TS2304: Cannot find name 'TypeScript'. ~~~~~~~~~~~~~~~~~~ !!! error TS2304: Cannot find name 'Dictionary_int_int'. - // by default the root (program) has zero indendation + // by default the root (program) has zero indentation this.tree.Root.SetIndentationOverride(""); this.ApplyScriptBlockIndentation(this.languageHostIndentation, this.tree); @@ -506,7 +506,7 @@ parserindenter.ts(736,38): error TS2304: Cannot find name 'TypeScript'. return null; } - // effective identation of the block + // effective indentation of the block indentationInfo = node.GetEffectiveIndentation(this); return indentationInfo; } @@ -527,7 +527,7 @@ parserindenter.ts(736,38): error TS2304: Cannot find name 'TypeScript'. return indentationInfo; } else { - // Indent all semicolons except the ones that belong to the for statement parts (initalizer, condition, itnrement) + // Indent all semicolons except the ones that belong to the for statement parts (initializer, condition, itnrement) if (node.AuthorNode.Details.Kind != AuthorParseNodeKind.apnkFor) { ~~~~~~~~~~~~~~~~~~~ !!! error TS2304: Cannot find name 'AuthorParseNodeKind'. diff --git a/tests/baselines/reference/parserindenter.js b/tests/baselines/reference/parserindenter.js index cdb6378d43bed..25221b199aaa4 100644 --- a/tests/baselines/reference/parserindenter.js +++ b/tests/baselines/reference/parserindenter.js @@ -39,7 +39,7 @@ namespace Formatting { this.scriptBlockBeginLineNumber = -1; this.offsetIndentationDeltas = new Dictionary_int_int(); // text offset -> indentation delta - // by default the root (program) has zero indendation + // by default the root (program) has zero indentation this.tree.Root.SetIndentationOverride(""); this.ApplyScriptBlockIndentation(this.languageHostIndentation, this.tree); @@ -260,7 +260,7 @@ namespace Formatting { return null; } - // effective identation of the block + // effective indentation of the block indentationInfo = node.GetEffectiveIndentation(this); return indentationInfo; } @@ -273,7 +273,7 @@ namespace Formatting { return indentationInfo; } else { - // Indent all semicolons except the ones that belong to the for statement parts (initalizer, condition, itnrement) + // Indent all semicolons except the ones that belong to the for statement parts (initializer, condition, itnrement) if (node.AuthorNode.Details.Kind != AuthorParseNodeKind.apnkFor) { // The passed node is actually either the program or the list because semicolon doesn't belong // to any statement in the tree, though the statement extends up to the semicolon position. @@ -774,7 +774,7 @@ var Formatting; this.indentationBag = new IndentationBag(this.snapshot); this.scriptBlockBeginLineNumber = -1; this.offsetIndentationDeltas = new Dictionary_int_int(); // text offset -> indentation delta - // by default the root (program) has zero indendation + // by default the root (program) has zero indentation this.tree.Root.SetIndentationOverride(""); this.ApplyScriptBlockIndentation(this.languageHostIndentation, this.tree); this.FillInheritedIndentation(this.tree); @@ -954,7 +954,7 @@ var Formatting; // if the open curly belongs to a non-indented object, do nothing here. return null; } - // effective identation of the block + // effective indentation of the block indentationInfo = node.GetEffectiveIndentation(this); return indentationInfo; } @@ -965,7 +965,7 @@ var Formatting; return indentationInfo; } else { - // Indent all semicolons except the ones that belong to the for statement parts (initalizer, condition, itnrement) + // Indent all semicolons except the ones that belong to the for statement parts (initializer, condition, itnrement) if (node.AuthorNode.Details.Kind != AuthorParseNodeKind.apnkFor) { // The passed node is actually either the program or the list because semicolon doesn't belong // to any statement in the tree, though the statement extends up to the semicolon position. diff --git a/tests/baselines/reference/parserindenter.symbols b/tests/baselines/reference/parserindenter.symbols index 6b50d9c0f9962..45e8eab36f013 100644 --- a/tests/baselines/reference/parserindenter.symbols +++ b/tests/baselines/reference/parserindenter.symbols @@ -83,7 +83,7 @@ namespace Formatting { >this : Symbol(Indenter, Decl(parserindenter.ts, 18, 22)) >offsetIndentationDeltas : Symbol(Indenter.offsetIndentationDeltas, Decl(parserindenter.ts, 22, 51)) - // by default the root (program) has zero indendation + // by default the root (program) has zero indentation this.tree.Root.SetIndentationOverride(""); >this.tree : Symbol(Indenter.tree, Decl(parserindenter.ts, 26, 46)) >this : Symbol(Indenter, Decl(parserindenter.ts, 18, 22)) @@ -668,7 +668,7 @@ namespace Formatting { return null; } - // effective identation of the block + // effective indentation of the block indentationInfo = node.GetEffectiveIndentation(this); >indentationInfo : Symbol(indentationInfo, Decl(parserindenter.ts, 246, 15)) >node : Symbol(node, Decl(parserindenter.ts, 245, 51)) @@ -704,7 +704,7 @@ namespace Formatting { >indentationInfo : Symbol(indentationInfo, Decl(parserindenter.ts, 265, 15)) } else { - // Indent all semicolons except the ones that belong to the for statement parts (initalizer, condition, itnrement) + // Indent all semicolons except the ones that belong to the for statement parts (initializer, condition, itnrement) if (node.AuthorNode.Details.Kind != AuthorParseNodeKind.apnkFor) { >node : Symbol(node, Decl(parserindenter.ts, 264, 71)) diff --git a/tests/baselines/reference/parserindenter.types b/tests/baselines/reference/parserindenter.types index 9364414750b53..c545c1764ca96 100644 --- a/tests/baselines/reference/parserindenter.types +++ b/tests/baselines/reference/parserindenter.types @@ -120,7 +120,7 @@ namespace Formatting { >Dictionary_int_int : any > : ^^^ - // by default the root (program) has zero indendation + // by default the root (program) has zero indentation this.tree.Root.SetIndentationOverride(""); >this.tree.Root.SetIndentationOverride("") : any > : ^^^ @@ -1781,7 +1781,7 @@ namespace Formatting { return null; } - // effective identation of the block + // effective indentation of the block indentationInfo = node.GetEffectiveIndentation(this); >indentationInfo = node.GetEffectiveIndentation(this) : any > : ^^^ @@ -1844,7 +1844,7 @@ namespace Formatting { > : ^^^^^^^^^^^^^^^ } else { - // Indent all semicolons except the ones that belong to the for statement parts (initalizer, condition, itnrement) + // Indent all semicolons except the ones that belong to the for statement parts (initializer, condition, itnrement) if (node.AuthorNode.Details.Kind != AuthorParseNodeKind.apnkFor) { >node.AuthorNode.Details.Kind != AuthorParseNodeKind.apnkFor : boolean > : ^^^^^^^ diff --git a/tests/baselines/reference/privateNameAndObjectRestSpread.errors.txt b/tests/baselines/reference/privateNameAndObjectRestSpread.errors.txt index d10a01dfdc006..b1bdc7cf36ed6 100644 --- a/tests/baselines/reference/privateNameAndObjectRestSpread.errors.txt +++ b/tests/baselines/reference/privateNameAndObjectRestSpread.errors.txt @@ -19,8 +19,8 @@ privateNameAndObjectRestSpread.ts(14,15): error TS2339: Property '#propStatic' d ~~~~~ !!! error TS2339: Property '#prop' does not exist on type '{}'. - const statics = { ... C}; - statics.#propStatic + const statistics = { ... C}; + statistics.#propStatic ~~~~~~~~~~~ !!! error TS2339: Property '#propStatic' does not exist on type '{ prototype: C; }'. const { ...sRest } = C; diff --git a/tests/baselines/reference/privateNameAndObjectRestSpread.js b/tests/baselines/reference/privateNameAndObjectRestSpread.js index abf84b30782d7..a079facd9fc2e 100644 --- a/tests/baselines/reference/privateNameAndObjectRestSpread.js +++ b/tests/baselines/reference/privateNameAndObjectRestSpread.js @@ -11,8 +11,8 @@ class C { const { ...rest } = other; rest.#prop; - const statics = { ... C}; - statics.#propStatic + const statistics = { ... C}; + statistics.#propStatic const { ...sRest } = C; sRest.#propStatic; } @@ -46,8 +46,8 @@ class C { __classPrivateFieldGet(obj, _C_prop, "f"); const rest = __rest(other, []); __classPrivateFieldGet(rest, _C_prop, "f"); - const statics = Object.assign({}, _a); - __classPrivateFieldGet(statics, _a, "f", _C_propStatic); + const statistics = Object.assign({}, _a); + __classPrivateFieldGet(statistics, _a, "f", _C_propStatic); const sRest = __rest(_a, []); __classPrivateFieldGet(sRest, _a, "f", _C_propStatic); } diff --git a/tests/baselines/reference/privateNameAndObjectRestSpread.symbols b/tests/baselines/reference/privateNameAndObjectRestSpread.symbols index c6bc689f788c1..e163fecf56458 100644 --- a/tests/baselines/reference/privateNameAndObjectRestSpread.symbols +++ b/tests/baselines/reference/privateNameAndObjectRestSpread.symbols @@ -29,12 +29,12 @@ class C { rest.#prop; >rest : Symbol(rest, Decl(privateNameAndObjectRestSpread.ts, 7, 15)) - const statics = { ... C}; ->statics : Symbol(statics, Decl(privateNameAndObjectRestSpread.ts, 10, 13)) + const statistics = { ... C}; +>statistics : Symbol(statistics, Decl(privateNameAndObjectRestSpread.ts, 10, 13)) >C : Symbol(C, Decl(privateNameAndObjectRestSpread.ts, 0, 0)) - statics.#propStatic ->statics : Symbol(statics, Decl(privateNameAndObjectRestSpread.ts, 10, 13)) + statistics.#propStatic +>statistics : Symbol(statistics, Decl(privateNameAndObjectRestSpread.ts, 10, 13)) const { ...sRest } = C; >sRest : Symbol(sRest, Decl(privateNameAndObjectRestSpread.ts, 12, 15)) diff --git a/tests/baselines/reference/privateNameAndObjectRestSpread.types b/tests/baselines/reference/privateNameAndObjectRestSpread.types index 94301bbcfec52..00181d99c1291 100644 --- a/tests/baselines/reference/privateNameAndObjectRestSpread.types +++ b/tests/baselines/reference/privateNameAndObjectRestSpread.types @@ -49,18 +49,18 @@ class C { >rest : {} > : ^^ - const statics = { ... C}; ->statics : { prototype: C; } + const statistics = { ... C}; +>statistics : { prototype: C; } > : ^^^^^^^^^^^^^^^^^ >{ ... C} : { prototype: C; } > : ^^^^^^^^^^^^^^^^^ >C : typeof C > : ^^^^^^^^ - statics.#propStatic ->statics.#propStatic : any + statistics.#propStatic +>statistics.#propStatic : any > : ^^^ ->statics : { prototype: C; } +>statistics : { prototype: C; } > : ^^^^^^^^^^^^^^^^^ const { ...sRest } = C; diff --git a/tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs/amd/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs.errors.txt b/tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs/amd/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs.errors.txt index b704a662fe3b1..f13f8ea9be04a 100644 --- a/tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs/amd/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs.errors.txt +++ b/tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs/amd/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs.errors.txt @@ -19,4 +19,4 @@ SameNameDTsNotSpecifiedWithAllowJs/tsconfig.json(1,3): error TS5107: Option 'mod ==== SameNameDTsNotSpecifiedWithAllowJs/a.d.ts (0 errors) ==== declare var a: number; ==== SameNameDTsNotSpecifiedWithAllowJs/a.js (0 errors) ==== - var test1 = 10; // Shouldnt get compiled \ No newline at end of file + var test1 = 10; // Shouldn't get compiled \ No newline at end of file diff --git a/tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs/node/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs.errors.txt b/tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs/node/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs.errors.txt index 03de92d63f76d..dddd21a5cd18b 100644 --- a/tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs/node/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs.errors.txt +++ b/tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs/node/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs.errors.txt @@ -16,4 +16,4 @@ SameNameDTsNotSpecifiedWithAllowJs/tsconfig.json(1,3): error TS5107: Option 'mod ==== SameNameDTsNotSpecifiedWithAllowJs/a.d.ts (0 errors) ==== declare var a: number; ==== SameNameDTsNotSpecifiedWithAllowJs/a.js (0 errors) ==== - var test1 = 10; // Shouldnt get compiled \ No newline at end of file + var test1 = 10; // Shouldn't get compiled \ No newline at end of file diff --git a/tests/baselines/reference/promiseDefinitionTest(target=es5).js b/tests/baselines/reference/promiseDefinitionTest(target=es5).js index d3b926f429c29..0d9af81e70ca8 100644 --- a/tests/baselines/reference/promiseDefinitionTest(target=es5).js +++ b/tests/baselines/reference/promiseDefinitionTest(target=es5).js @@ -18,7 +18,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge }); }; var __generator = (this && this.__generator) || function (thisArg, body) { - var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); + var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, tries: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; function verb(n) { return function (v) { return step([n, v]); }; } function step(op) { @@ -30,14 +30,14 @@ var __generator = (this && this.__generator) || function (thisArg, body) { case 0: case 1: t = op; break; case 4: _.label++; return { value: op[1], done: false }; case 5: _.label++; y = op[1]; op = [0]; continue; - case 7: op = _.ops.pop(); _.trys.pop(); continue; + case 7: op = _.ops.pop(); _.tries.pop(); continue; default: - if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } + if (!(t = _.tries, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } if (t[2]) _.ops.pop(); - _.trys.pop(); continue; + _.tries.pop(); continue; } op = body.call(thisArg, _); } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } diff --git a/tests/baselines/reference/quickInfoCommentsClass.baseline b/tests/baselines/reference/quickInfoCommentsClass.baseline index 710f58282c633..026793245f2e5 100644 --- a/tests/baselines/reference/quickInfoCommentsClass.baseline +++ b/tests/baselines/reference/quickInfoCommentsClass.baseline @@ -87,12 +87,12 @@ // | class c4 // | Class comment // | ---------------------------------------------------------------------- -// /** Class with statics*/ +// /** Class with statistics*/ // class c5 { // ^^ // | ---------------------------------------------------------------------- // | class c5 -// | Class with statics +// | Class with statistics // | ---------------------------------------------------------------------- // static s1: number; // } @@ -104,7 +104,7 @@ // ^^ // | ---------------------------------------------------------------------- // | constructor c5(): c5 -// | Class with statics +// | Class with statistics // | ---------------------------------------------------------------------- // var i5_c = c5; // ^^^^ @@ -114,14 +114,14 @@ // ^^ // | ---------------------------------------------------------------------- // | class c5 -// | Class with statics +// | Class with statistics // | ---------------------------------------------------------------------- -// /** class with statics and constructor*/ +// /** class with statistics and constructor*/ // class c6 { // ^^ // | ---------------------------------------------------------------------- // | class c6 -// | class with statics and constructor +// | class with statistics and constructor // | ---------------------------------------------------------------------- // /** s1 comment*/ // static s1: number; @@ -147,7 +147,7 @@ // ^^ // | ---------------------------------------------------------------------- // | class c6 -// | class with statics and constructor +// | class with statistics and constructor // | ---------------------------------------------------------------------- // // class a { @@ -847,7 +847,7 @@ ], "documentation": [ { - "text": "Class with statics", + "text": "Class with statistics", "kind": "text" } ] @@ -944,7 +944,7 @@ ], "documentation": [ { - "text": "Class with statics", + "text": "Class with statistics", "kind": "text" } ] @@ -1029,7 +1029,7 @@ ], "documentation": [ { - "text": "Class with statics", + "text": "Class with statistics", "kind": "text" } ] @@ -1064,7 +1064,7 @@ ], "documentation": [ { - "text": "class with statics and constructor", + "text": "class with statistics and constructor", "kind": "text" } ] @@ -1246,7 +1246,7 @@ ], "documentation": [ { - "text": "class with statics and constructor", + "text": "class with statistics and constructor", "kind": "text" } ] diff --git a/tests/baselines/reference/quickInfoCommentsCommentParsing.baseline b/tests/baselines/reference/quickInfoCommentsCommentParsing.baseline index 641280961c41d..c8cb6291f85c7 100644 --- a/tests/baselines/reference/quickInfoCommentsCommentParsing.baseline +++ b/tests/baselines/reference/quickInfoCommentsCommentParsing.baseline @@ -49,7 +49,7 @@ // /** multiple line jsdoc comments no longer merge // *New line1 // *New Line2*/ -// /** Shoul mege this line as well +// /** Shoul merge this line as well // * and this too*/ /** Another this one too*/ // function jsDocMultiLineMerge() { // } @@ -473,7 +473,7 @@ // * spanning on two lines and aligned perfectly // * @param b this is info about b // * spanning on two lines and aligned perfectly -// * spanning one more line alined perfectly +// * spanning one more line aligned perfectly // * spanning another line with more margin // * @param c this is info about b // * not aligned text about parameter will eat only one space @@ -492,11 +492,11 @@ // | (parameter) b: any // | this is info about b // | spanning on two lines and aligned perfectly -// | spanning one more line alined perfectly +// | spanning one more line aligned perfectly // | spanning another line with more margin // | @param b this is info about b // | spanning on two lines and aligned perfectly -// | spanning one more line alined perfectly +// | spanning one more line aligned perfectly // | spanning another line with more margin // | ---------------------------------------------------------------------- // ^ @@ -518,7 +518,7 @@ // | spanning on two lines and aligned perfectly // | @param b this is info about b // | spanning on two lines and aligned perfectly -// | spanning one more line alined perfectly +// | spanning one more line aligned perfectly // | spanning another line with more margin // | @param c this is info about b // | not aligned text about parameter will eat only one space @@ -4877,7 +4877,7 @@ ], "documentation": [ { - "text": "this is info about b\nspanning on two lines and aligned perfectly\nspanning one more line alined perfectly\n spanning another line with more margin", + "text": "this is info about b\nspanning on two lines and aligned perfectly\nspanning one more line aligned perfectly\n spanning another line with more margin", "kind": "text" } ], @@ -4894,7 +4894,7 @@ "kind": "space" }, { - "text": "this is info about b\nspanning on two lines and aligned perfectly\nspanning one more line alined perfectly\n spanning another line with more margin", + "text": "this is info about b\nspanning on two lines and aligned perfectly\nspanning one more line aligned perfectly\n spanning another line with more margin", "kind": "text" } ] @@ -5123,7 +5123,7 @@ "kind": "space" }, { - "text": "this is info about b\nspanning on two lines and aligned perfectly\nspanning one more line alined perfectly\n spanning another line with more margin", + "text": "this is info about b\nspanning on two lines and aligned perfectly\nspanning one more line aligned perfectly\n spanning another line with more margin", "kind": "text" } ] diff --git a/tests/baselines/reference/quickInfoDisplayPartsEnum1.baseline b/tests/baselines/reference/quickInfoDisplayPartsEnum1.baseline index 76df896caa42d..7a0a3fd0abf00 100644 --- a/tests/baselines/reference/quickInfoDisplayPartsEnum1.baseline +++ b/tests/baselines/reference/quickInfoDisplayPartsEnum1.baseline @@ -21,19 +21,19 @@ // | (enum member) E.e3 = 11 // | ---------------------------------------------------------------------- // } -// var eInstance: E; +// var instance: E; // ^^^^^^^^^ // | ---------------------------------------------------------------------- -// | var eInstance: E +// | var instance: E // | ---------------------------------------------------------------------- // ^ // | ---------------------------------------------------------------------- // | enum E // | ---------------------------------------------------------------------- -// eInstance = E.e1; +// instance = E.e1; // ^^^^^^^^^ // | ---------------------------------------------------------------------- -// | var eInstance: E +// | var instance: E // | ---------------------------------------------------------------------- // ^ // | ---------------------------------------------------------------------- @@ -43,10 +43,10 @@ // | ---------------------------------------------------------------------- // | (enum member) E.e1 = 0 // | ---------------------------------------------------------------------- -// eInstance = E.e2; +// instance = E.e2; // ^^^^^^^^^ // | ---------------------------------------------------------------------- -// | var eInstance: E +// | var instance: E // | ---------------------------------------------------------------------- // ^ // | ---------------------------------------------------------------------- @@ -56,10 +56,10 @@ // | ---------------------------------------------------------------------- // | (enum member) E.e2 = 10 // | ---------------------------------------------------------------------- -// eInstance = E.e3; +// instance = E.e3; // ^^^^^^^^^ // | ---------------------------------------------------------------------- -// | var eInstance: E +// | var instance: E // | ---------------------------------------------------------------------- // ^ // | ---------------------------------------------------------------------- @@ -379,7 +379,7 @@ "kind": "space" }, { - "text": "eInstance", + "text": "instance", "kind": "localName" }, { @@ -451,7 +451,7 @@ "kind": "space" }, { - "text": "eInstance", + "text": "instance", "kind": "localName" }, { @@ -585,7 +585,7 @@ "kind": "space" }, { - "text": "eInstance", + "text": "instance", "kind": "localName" }, { @@ -719,7 +719,7 @@ "kind": "space" }, { - "text": "eInstance", + "text": "instance", "kind": "localName" }, { diff --git a/tests/baselines/reference/quickInfoDisplayPartsEnum2.baseline b/tests/baselines/reference/quickInfoDisplayPartsEnum2.baseline index 74cea35177157..f745b4ceb57ca 100644 --- a/tests/baselines/reference/quickInfoDisplayPartsEnum2.baseline +++ b/tests/baselines/reference/quickInfoDisplayPartsEnum2.baseline @@ -21,19 +21,19 @@ // | (enum member) E["e3"] = 11 // | ---------------------------------------------------------------------- // } -// var eInstance: E; +// var instance: E; // ^^^^^^^^^ // | ---------------------------------------------------------------------- -// | var eInstance: E +// | var instance: E // | ---------------------------------------------------------------------- // ^ // | ---------------------------------------------------------------------- // | enum E // | ---------------------------------------------------------------------- -// eInstance = E.e1; +// instance = E.e1; // ^^^^^^^^^ // | ---------------------------------------------------------------------- -// | var eInstance: E +// | var instance: E // | ---------------------------------------------------------------------- // ^ // | ---------------------------------------------------------------------- @@ -43,10 +43,10 @@ // | ---------------------------------------------------------------------- // | (enum member) E["e1"] = 0 // | ---------------------------------------------------------------------- -// eInstance = E.e2; +// instance = E.e2; // ^^^^^^^^^ // | ---------------------------------------------------------------------- -// | var eInstance: E +// | var instance: E // | ---------------------------------------------------------------------- // ^ // | ---------------------------------------------------------------------- @@ -56,10 +56,10 @@ // | ---------------------------------------------------------------------- // | (enum member) E['e2'] = 10 // | ---------------------------------------------------------------------- -// eInstance = E.e3; +// instance = E.e3; // ^^^^^^^^^ // | ---------------------------------------------------------------------- -// | var eInstance: E +// | var instance: E // | ---------------------------------------------------------------------- // ^ // | ---------------------------------------------------------------------- @@ -391,7 +391,7 @@ "kind": "space" }, { - "text": "eInstance", + "text": "instance", "kind": "localName" }, { @@ -463,7 +463,7 @@ "kind": "space" }, { - "text": "eInstance", + "text": "instance", "kind": "localName" }, { @@ -601,7 +601,7 @@ "kind": "space" }, { - "text": "eInstance", + "text": "instance", "kind": "localName" }, { @@ -739,7 +739,7 @@ "kind": "space" }, { - "text": "eInstance", + "text": "instance", "kind": "localName" }, { diff --git a/tests/baselines/reference/quickInfoDisplayPartsEnum3.baseline b/tests/baselines/reference/quickInfoDisplayPartsEnum3.baseline index 81f3d2db91499..c9234010fd3a5 100644 --- a/tests/baselines/reference/quickInfoDisplayPartsEnum3.baseline +++ b/tests/baselines/reference/quickInfoDisplayPartsEnum3.baseline @@ -21,19 +21,19 @@ // | (enum member) E["e3"] = 11 // | ---------------------------------------------------------------------- // } -// var eInstance: E; +// var instance: E; // ^^^^^^^^^ // | ---------------------------------------------------------------------- -// | var eInstance: E +// | var instance: E // | ---------------------------------------------------------------------- // ^ // | ---------------------------------------------------------------------- // | enum E // | ---------------------------------------------------------------------- -// eInstance = E["e1"]; +// instance = E["e1"]; // ^^^^^^^^^ // | ---------------------------------------------------------------------- -// | var eInstance: E +// | var instance: E // | ---------------------------------------------------------------------- // ^ // | ---------------------------------------------------------------------- @@ -43,10 +43,10 @@ // | ---------------------------------------------------------------------- // | (enum member) E["e1"] = 0 // | ---------------------------------------------------------------------- -// eInstance = E["e2"]; +// instance = E["e2"]; // ^^^^^^^^^ // | ---------------------------------------------------------------------- -// | var eInstance: E +// | var instance: E // | ---------------------------------------------------------------------- // ^ // | ---------------------------------------------------------------------- @@ -56,10 +56,10 @@ // | ---------------------------------------------------------------------- // | (enum member) E['e2'] = 10 // | ---------------------------------------------------------------------- -// eInstance = E['e3']; +// instance = E['e3']; // ^^^^^^^^^ // | ---------------------------------------------------------------------- -// | var eInstance: E +// | var instance: E // | ---------------------------------------------------------------------- // ^ // | ---------------------------------------------------------------------- @@ -391,7 +391,7 @@ "kind": "space" }, { - "text": "eInstance", + "text": "instance", "kind": "localName" }, { @@ -463,7 +463,7 @@ "kind": "space" }, { - "text": "eInstance", + "text": "instance", "kind": "localName" }, { @@ -601,7 +601,7 @@ "kind": "space" }, { - "text": "eInstance", + "text": "instance", "kind": "localName" }, { @@ -739,7 +739,7 @@ "kind": "space" }, { - "text": "eInstance", + "text": "instance", "kind": "localName" }, { diff --git a/tests/baselines/reference/quickInfoForJSDocWithHttpLinks.baseline b/tests/baselines/reference/quickInfoForJSDocWithHttpLinks.baseline index ea0e79b3b58af..b3f8a359aa362 100644 --- a/tests/baselines/reference/quickInfoForJSDocWithHttpLinks.baseline +++ b/tests/baselines/reference/quickInfoForJSDocWithHttpLinks.baseline @@ -9,11 +9,11 @@ // // /** // * @typedef {Object} Oops -// * @property {number} https://wass +// * @property {number} https://was // ^^^^^ // | ---------------------------------------------------------------------- // | (property) https: number -// | ://wass +// | ://was // | ---------------------------------------------------------------------- // */ // @@ -150,7 +150,7 @@ ], "documentation": [ { - "text": "://wass", + "text": "://was", "kind": "text" } ] diff --git a/tests/baselines/reference/quickinfoTypeAtReturnPositionsInaccurate.errors.txt b/tests/baselines/reference/quickinfoTypeAtReturnPositionsInaccurate.errors.txt index 1277d0e937272..c5c397c01a05b 100644 --- a/tests/baselines/reference/quickinfoTypeAtReturnPositionsInaccurate.errors.txt +++ b/tests/baselines/reference/quickinfoTypeAtReturnPositionsInaccurate.errors.txt @@ -88,7 +88,7 @@ quickinfoTypeAtReturnPositionsInaccurate.ts(33,15): error TS2339: Property 'numE if (isNumClass(item)) { return item; } - // it seems like the compiler asumes the above condition is always + // it seems like the compiler assumes the above condition is always // truthy item.get(); diff --git a/tests/baselines/reference/quickinfoTypeAtReturnPositionsInaccurate.js b/tests/baselines/reference/quickinfoTypeAtReturnPositionsInaccurate.js index eaa4070da17bc..fec9375bc1822 100644 --- a/tests/baselines/reference/quickinfoTypeAtReturnPositionsInaccurate.js +++ b/tests/baselines/reference/quickinfoTypeAtReturnPositionsInaccurate.js @@ -83,7 +83,7 @@ class ComplexStore { if (isNumClass(item)) { return item; } - // it seems like the compiler asumes the above condition is always + // it seems like the compiler assumes the above condition is always // truthy item.get(); @@ -164,7 +164,7 @@ class ComplexStore { if (isNumClass(item)) { return item; } - // it seems like the compiler asumes the above condition is always + // it seems like the compiler assumes the above condition is always // truthy item.get(); return item; // type is never diff --git a/tests/baselines/reference/quickinfoTypeAtReturnPositionsInaccurate.symbols b/tests/baselines/reference/quickinfoTypeAtReturnPositionsInaccurate.symbols index 44003769a0180..4103ef1d1d0c5 100644 --- a/tests/baselines/reference/quickinfoTypeAtReturnPositionsInaccurate.symbols +++ b/tests/baselines/reference/quickinfoTypeAtReturnPositionsInaccurate.symbols @@ -225,7 +225,7 @@ class ComplexStore { return item; >item : Symbol(item, Decl(quickinfoTypeAtReturnPositionsInaccurate.ts, 77, 11)) } - // it seems like the compiler asumes the above condition is always + // it seems like the compiler assumes the above condition is always // truthy item.get(); diff --git a/tests/baselines/reference/quickinfoTypeAtReturnPositionsInaccurate.types b/tests/baselines/reference/quickinfoTypeAtReturnPositionsInaccurate.types index c849e2d42fbfb..aa595f27b061d 100644 --- a/tests/baselines/reference/quickinfoTypeAtReturnPositionsInaccurate.types +++ b/tests/baselines/reference/quickinfoTypeAtReturnPositionsInaccurate.types @@ -287,7 +287,7 @@ class ComplexStore { >item : Extract> > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ } - // it seems like the compiler asumes the above condition is always + // it seems like the compiler assumes the above condition is always // truthy item.get(); diff --git a/tests/baselines/reference/reassignStaticProp.errors.txt b/tests/baselines/reference/reassignStaticProp.errors.txt index d534815256c42..be01b921883be 100644 --- a/tests/baselines/reference/reassignStaticProp.errors.txt +++ b/tests/baselines/reference/reassignStaticProp.errors.txt @@ -7,7 +7,7 @@ reassignStaticProp.ts(5,12): error TS2717: Subsequent property declarations must static bar = 1; - static bar:string; // errror - duplicate id + static bar:string; // error - duplicate id ~~~ !!! error TS2300: Duplicate identifier 'bar'. ~~~ diff --git a/tests/baselines/reference/reassignStaticProp.js b/tests/baselines/reference/reassignStaticProp.js index 44a474814102d..24a16d9cdff82 100644 --- a/tests/baselines/reference/reassignStaticProp.js +++ b/tests/baselines/reference/reassignStaticProp.js @@ -5,7 +5,7 @@ class foo { static bar = 1; - static bar:string; // errror - duplicate id + static bar:string; // error - duplicate id } diff --git a/tests/baselines/reference/reassignStaticProp.symbols b/tests/baselines/reference/reassignStaticProp.symbols index 532284ea10566..879dd9eaa92b0 100644 --- a/tests/baselines/reference/reassignStaticProp.symbols +++ b/tests/baselines/reference/reassignStaticProp.symbols @@ -7,7 +7,7 @@ class foo { static bar = 1; >bar : Symbol(foo.bar, Decl(reassignStaticProp.ts, 0, 11), Decl(reassignStaticProp.ts, 2, 19)) - static bar:string; // errror - duplicate id + static bar:string; // error - duplicate id >bar : Symbol(foo.bar, Decl(reassignStaticProp.ts, 0, 11), Decl(reassignStaticProp.ts, 2, 19)) } diff --git a/tests/baselines/reference/reassignStaticProp.types b/tests/baselines/reference/reassignStaticProp.types index a0babde1f72eb..d39d6095e810e 100644 --- a/tests/baselines/reference/reassignStaticProp.types +++ b/tests/baselines/reference/reassignStaticProp.types @@ -11,7 +11,7 @@ class foo { >1 : 1 > : ^ - static bar:string; // errror - duplicate id + static bar:string; // error - duplicate id >bar : number > : ^^^^^^ diff --git a/tests/baselines/reference/recursiveConditionalCrash3.js b/tests/baselines/reference/recursiveConditionalCrash3.js index 9f08d945d8216..ccaae5c220a13 100644 --- a/tests/baselines/reference/recursiveConditionalCrash3.js +++ b/tests/baselines/reference/recursiveConditionalCrash3.js @@ -56,7 +56,7 @@ type SplitWithAllPossibleCombinations = /** - * This function will return all possibile keys that can be expanded on T, only to the N deep level + * This function will return all possible keys that can be expanded on T, only to the N deep level */ type KeysCanBeExpanded_ = N extends Depth['length'] ? never : T extends CanBeExpanded ? diff --git a/tests/baselines/reference/recursiveConditionalCrash3.symbols b/tests/baselines/reference/recursiveConditionalCrash3.symbols index e3ebf5970d05d..9bd1f1ffec06d 100644 --- a/tests/baselines/reference/recursiveConditionalCrash3.symbols +++ b/tests/baselines/reference/recursiveConditionalCrash3.symbols @@ -145,7 +145,7 @@ type SplitWithAllPossibleCombinations = /** - * This function will return all possibile keys that can be expanded on T, only to the N deep level + * This function will return all possible keys that can be expanded on T, only to the N deep level */ type KeysCanBeExpanded_ = N extends Depth['length'] ? never : >KeysCanBeExpanded_ : Symbol(KeysCanBeExpanded_, Decl(recursiveConditionalCrash3.ts, 51, 20)) diff --git a/tests/baselines/reference/recursiveConditionalCrash3.types b/tests/baselines/reference/recursiveConditionalCrash3.types index 0e54f551b7bbf..2b5328393acb5 100644 --- a/tests/baselines/reference/recursiveConditionalCrash3.types +++ b/tests/baselines/reference/recursiveConditionalCrash3.types @@ -107,7 +107,7 @@ type SplitWithAllPossibleCombinations = /** - * This function will return all possibile keys that can be expanded on T, only to the N deep level + * This function will return all possible keys that can be expanded on T, only to the N deep level */ type KeysCanBeExpanded_ = N extends Depth['length'] ? never : >KeysCanBeExpanded_ : KeysCanBeExpanded_ diff --git a/tests/baselines/reference/recursiveMappedTypes.errors.txt b/tests/baselines/reference/recursiveMappedTypes.errors.txt index 2bee149f07b85..6c354b5c533e2 100644 --- a/tests/baselines/reference/recursiveMappedTypes.errors.txt +++ b/tests/baselines/reference/recursiveMappedTypes.errors.txt @@ -96,7 +96,7 @@ recursiveMappedTypes.ts(73,13): error TS2615: Type of property '"each"' circular "type": "list", "minimum_count": number, "maximum_count": number, - "collapsable"?: boolean, //default to false, means all expanded + "collapsible"?: boolean, //default to false, means all expanded "each": Child; ~~~~~~ !!! error TS2502: '"each"' is referenced directly or indirectly in its own type annotation. diff --git a/tests/baselines/reference/recursiveMappedTypes.js b/tests/baselines/reference/recursiveMappedTypes.js index c00c408bfb6d5..e2ba82db0d84a 100644 --- a/tests/baselines/reference/recursiveMappedTypes.js +++ b/tests/baselines/reference/recursiveMappedTypes.js @@ -72,7 +72,7 @@ export interface ListWidget { "type": "list", "minimum_count": number, "maximum_count": number, - "collapsable"?: boolean, //default to false, means all expanded + "collapsible"?: boolean, //default to false, means all expanded "each": Child; } @@ -118,7 +118,7 @@ export interface ListWidget { "type": "list"; "minimum_count": number; "maximum_count": number; - "collapsable"?: boolean; + "collapsible"?: boolean; "each": Child; } export type TV = T[K] extends Record ? E : never; diff --git a/tests/baselines/reference/recursiveMappedTypes.symbols b/tests/baselines/reference/recursiveMappedTypes.symbols index 4e4b87a33195e..1df010211cae4 100644 --- a/tests/baselines/reference/recursiveMappedTypes.symbols +++ b/tests/baselines/reference/recursiveMappedTypes.symbols @@ -200,8 +200,8 @@ export interface ListWidget { "maximum_count": number, >"maximum_count" : Symbol(ListWidget["maximum_count"], Decl(recursiveMappedTypes.ts, 69, 28)) - "collapsable"?: boolean, //default to false, means all expanded ->"collapsable" : Symbol(ListWidget["collapsable"], Decl(recursiveMappedTypes.ts, 70, 28)) + "collapsible"?: boolean, //default to false, means all expanded +>"collapsible" : Symbol(ListWidget["collapsible"], Decl(recursiveMappedTypes.ts, 70, 28)) "each": Child; >"each" : Symbol(ListWidget["each"], Decl(recursiveMappedTypes.ts, 71, 28)) diff --git a/tests/baselines/reference/recursiveMappedTypes.types b/tests/baselines/reference/recursiveMappedTypes.types index 854728291721b..6342372ee7fe6 100644 --- a/tests/baselines/reference/recursiveMappedTypes.types +++ b/tests/baselines/reference/recursiveMappedTypes.types @@ -147,8 +147,8 @@ export interface ListWidget { >"maximum_count" : number > : ^^^^^^ - "collapsable"?: boolean, //default to false, means all expanded ->"collapsable" : boolean | undefined + "collapsible"?: boolean, //default to false, means all expanded +>"collapsible" : boolean | undefined > : ^^^^^^^^^^^^^^^^^^^ "each": Child; diff --git a/tests/baselines/reference/renameRest.baseline.jsonc b/tests/baselines/reference/renameRest.baseline.jsonc index 3c1eea43bd081..b6ac3b2502970 100644 --- a/tests/baselines/reference/renameRest.baseline.jsonc +++ b/tests/baselines/reference/renameRest.baseline.jsonc @@ -3,7 +3,7 @@ // interface Gen { // x: number; // /*RENAME*/<|[|parentRENAME|]: Gen;|> -// millenial: string; +// millennial: string; // } // let t: Gen; // var { x, ...rest } = t; @@ -16,7 +16,7 @@ // interface Gen { // x: number; // <|[|parentRENAME|]: Gen;|> -// millenial: string; +// millennial: string; // } // let t: Gen; // var { x, ...rest } = t; diff --git a/tests/baselines/reference/resolvingClassDeclarationWhenInBaseTypeResolution.errors.txt b/tests/baselines/reference/resolvingClassDeclarationWhenInBaseTypeResolution.errors.txt index 6ec9e9b8d5c28..d255d25d85a35 100644 --- a/tests/baselines/reference/resolvingClassDeclarationWhenInBaseTypeResolution.errors.txt +++ b/tests/baselines/reference/resolvingClassDeclarationWhenInBaseTypeResolution.errors.txt @@ -32,7 +32,7 @@ resolvingClassDeclarationWhenInBaseTypeResolution.ts(769,53): error TS2449: Clas !!! related TS2728 resolvingClassDeclarationWhenInBaseTypeResolution.ts:114:16: 'nitidus' is declared here. salomonseni() : caniventer { var x : caniventer; () => { var y = this; }; return x; } uchidai() : lavali.xanthognathus { var x : lavali.xanthognathus; () => { var y = this; }; return x; } - raffrayana() : lavali.otion { var x : lavali.otion; () => { var y = this; }; return x; } + raffrayana() : lavali.option { var x : lavali.option; () => { var y = this; }; return x; } Uranium() : minutus.inez, trivirgatus.falconeri> { var x : minutus.inez, trivirgatus.falconeri>; () => { var y = this; }; return x; } nayaur() : gabriellae.amicus { var x : gabriellae.amicus; () => { var y = this; }; return x; } } @@ -59,7 +59,7 @@ resolvingClassDeclarationWhenInBaseTypeResolution.ts(769,53): error TS2449: Clas } export class galapagoensis { isabellae() : panglima.amphibius { var x : panglima.amphibius; () => { var y = this; }; return x; } - rueppellii() : ruatanica.americanus { var x : ruatanica.americanus; () => { var y = this; }; return x; } + rueppellii() : ruatanica.americans { var x : ruatanica.americans; () => { var y = this; }; return x; } peregusna() : dogramacii.kaiseri { var x : dogramacii.kaiseri; () => { var y = this; }; return x; } gliroides() : howi.coludo { var x : howi.coludo; () => { var y = this; }; return x; } banakrisi() : macrorhinos.daphaenodon { var x : macrorhinos.daphaenodon; () => { var y = this; }; return x; } @@ -73,7 +73,7 @@ resolvingClassDeclarationWhenInBaseTypeResolution.ts(769,53): error TS2449: Clas hirta() : Lanthanum.jugularis { var x : Lanthanum.jugularis; () => { var y = this; }; return x; } virginianus() : durangae { var x : durangae; () => { var y = this; }; return x; } macrophyllum() : howi.marcanoi { var x : howi.marcanoi; () => { var y = this; }; return x; } - porcellus() : ruatanica.americanus { var x : ruatanica.americanus; () => { var y = this; }; return x; } + porcellus() : ruatanica.americans { var x : ruatanica.americans; () => { var y = this; }; return x; } } export class oralis extends caurinus.psilurus { ~~~~~~~~ @@ -89,7 +89,7 @@ resolvingClassDeclarationWhenInBaseTypeResolution.ts(769,53): error TS2449: Clas monax() : imperfecta.subspinosus { var x : imperfecta.subspinosus; () => { var y = this; }; return x; } unalascensis() : minutus.inez, gabriellae.echinatus>, dogramacii.aurata> { var x : minutus.inez, gabriellae.echinatus>, dogramacii.aurata>; () => { var y = this; }; return x; } wuchihensis() : howi.angulatus, petrophilus.minutilla> { var x : howi.angulatus, petrophilus.minutilla>; () => { var y = this; }; return x; } - leucippe() : lavali.otion { var x : lavali.otion; () => { var y = this; }; return x; } + leucippe() : lavali.option { var x : lavali.option; () => { var y = this; }; return x; } ordii() : daubentonii.arboreus { var x : daubentonii.arboreus; () => { var y = this; }; return x; } eisentrauti() : rendalli.zuluensis { var x : rendalli.zuluensis; () => { var y = this; }; return x; } } @@ -120,9 +120,9 @@ resolvingClassDeclarationWhenInBaseTypeResolution.ts(769,53): error TS2449: Clas } export class acariensis { levicula() : lavali.lepturus { var x : lavali.lepturus; () => { var y = this; }; return x; } - minous() : argurus.dauricus { var x : argurus.dauricus; () => { var y = this; }; return x; } - cinereiventer() : panamensis.setulosus { var x : panamensis.setulosus; () => { var y = this; }; return x; } - longicaudatus() : macrorhinos.marmosurus> { var x : macrorhinos.marmosurus>; () => { var y = this; }; return x; } + minous() : argurus.dauricus { var x : argurus.dauricus; () => { var y = this; }; return x; } + cinereiventer() : panamensis.setulosus { var x : panamensis.setulosus; () => { var y = this; }; return x; } + longicaudatus() : macrorhinos.marmosurus> { var x : macrorhinos.marmosurus>; () => { var y = this; }; return x; } baeodon() : argurus.netscheri, argurus.luctuosa> { var x : argurus.netscheri, argurus.luctuosa>; () => { var y = this; }; return x; } soricoides() : argurus.luctuosa { var x : argurus.luctuosa; () => { var y = this; }; return x; } datae() : daubentonii.arboreus> { var x : daubentonii.arboreus>; () => { var y = this; }; return x; } @@ -164,7 +164,7 @@ resolvingClassDeclarationWhenInBaseTypeResolution.ts(769,53): error TS2449: Clas dominicensis() : dammermani.melanops { var x : dammermani.melanops; () => { var y = this; }; return x; } taurus() : macrorhinos.konganensis { var x : macrorhinos.konganensis; () => { var y = this; }; return x; } tonganus() : argurus.netscheri { var x : argurus.netscheri; () => { var y = this; }; return x; } - silvatica() : rendalli.moojeni { var x : rendalli.moojeni; () => { var y = this; }; return x; } + silvatica() : rendalli.moojeni { var x : rendalli.moojeni; () => { var y = this; }; return x; } midas() : lavali.xanthognathus { var x : lavali.xanthognathus; () => { var y = this; }; return x; } bicornis() : dogramacii.kaiseri { var x : dogramacii.kaiseri; () => { var y = this; }; return x; } } @@ -186,7 +186,7 @@ resolvingClassDeclarationWhenInBaseTypeResolution.ts(769,53): error TS2449: Clas revoili() : lavali.wilsoni { var x : lavali.wilsoni; () => { var y = this; }; return x; } macrobullatus() : macrorhinos.daphaenodon { var x : macrorhinos.daphaenodon; () => { var y = this; }; return x; } compactus() : sagitta.stolzmanni { var x : sagitta.stolzmanni; () => { var y = this; }; return x; } - talpinus() : nitidus { var x : nitidus; () => { var y = this; }; return x; } + talpinus() : nitidus { var x : nitidus; () => { var y = this; }; return x; } stramineus() : gabriellae.amicus { var x : gabriellae.amicus; () => { var y = this; }; return x; } dartmouthi() : trivirgatus.mixtus { var x : trivirgatus.mixtus; () => { var y = this; }; return x; } ogilbyi() : argurus.dauricus { var x : argurus.dauricus; () => { var y = this; }; return x; } @@ -205,18 +205,18 @@ resolvingClassDeclarationWhenInBaseTypeResolution.ts(769,53): error TS2449: Clas occasius() : argurus.gilbertii { var x : argurus.gilbertii; () => { var y = this; }; return x; } damarensis() : julianae.galapagoensis { var x : julianae.galapagoensis; () => { var y = this; }; return x; } Neptunium() : panglima.abidi { var x : panglima.abidi; () => { var y = this; }; return x; } - griseoflavus() : ruatanica.americanus { var x : ruatanica.americanus; () => { var y = this; }; return x; } + griseoflavus() : ruatanica.americans { var x : ruatanica.americans; () => { var y = this; }; return x; } thar() : argurus.oreas { var x : argurus.oreas; () => { var y = this; }; return x; } alborufus() : panamensis.linulus { var x : panamensis.linulus; () => { var y = this; }; return x; } fusicaudus() : sagitta.stolzmanni { var x : sagitta.stolzmanni; () => { var y = this; }; return x; } - gordonorum() : howi.angulatus { var x : howi.angulatus; () => { var y = this; }; return x; } + gordonorum() : howi.angulatus { var x : howi.angulatus; () => { var y = this; }; return x; } ruber() : dammermani.siberu { var x : dammermani.siberu; () => { var y = this; }; return x; } desmarestianus() : julianae.steerii { var x : julianae.steerii; () => { var y = this; }; return x; } lutillus() : nigra.dolichurus { var x : nigra.dolichurus; () => { var y = this; }; return x; } salocco() : argurus.peninsulae { var x : argurus.peninsulae; () => { var y = this; }; return x; } } export class moojeni { - floweri() : lavali.otion { var x : lavali.otion; () => { var y = this; }; return x; } + floweri() : lavali.option { var x : lavali.option; () => { var y = this; }; return x; } montosa() : imperfecta.ciliolabrum { var x : imperfecta.ciliolabrum; () => { var y = this; }; return x; } miletus() : julianae.sumatrana { var x : julianae.sumatrana; () => { var y = this; }; return x; } heaneyi() : zuluensis { var x : zuluensis; () => { var y = this; }; return x; } @@ -232,7 +232,7 @@ resolvingClassDeclarationWhenInBaseTypeResolution.ts(769,53): error TS2449: Clas !!! error TS2449: Class 'falconeri' used before its declaration. !!! related TS2728 resolvingClassDeclarationWhenInBaseTypeResolution.ts:212:16: 'falconeri' is declared here. salvanius() : howi.coludo { var x : howi.coludo; () => { var y = this; }; return x; } - maritimus() : ruatanica.americanus { var x : ruatanica.americanus; () => { var y = this; }; return x; } + maritimus() : ruatanica.americans { var x : ruatanica.americans; () => { var y = this; }; return x; } edax() : lutreolus.cor>, rionegrensis.caniventer> { var x : lutreolus.cor>, rionegrensis.caniventer>; () => { var y = this; }; return x; } } } @@ -266,8 +266,8 @@ resolvingClassDeclarationWhenInBaseTypeResolution.ts(769,53): error TS2449: Clas export class falconeri { cabrali() : rendalli.moojeni>, daubentonii.arboreus> { var x : rendalli.moojeni>, daubentonii.arboreus>; () => { var y = this; }; return x; } gouldi() : nigra.dolichurus>, patas.uralensis> { var x : nigra.dolichurus>, patas.uralensis>; () => { var y = this; }; return x; } - fuscicollis() : samarensis.pelurus> { var x : samarensis.pelurus>; () => { var y = this; }; return x; } - martiensseni() : sagitta.cinereus>, dogramacii.koepckeae> { var x : sagitta.cinereus>, dogramacii.koepckeae>; () => { var y = this; }; return x; } + fuscicollis() : samarensis.pelurus> { var x : samarensis.pelurus>; () => { var y = this; }; return x; } + martiensseni() : sagitta.cinereus>, dogramacii.koepckeae> { var x : sagitta.cinereus>, dogramacii.koepckeae>; () => { var y = this; }; return x; } gaoligongensis() : dogramacii.koepckeae { var x : dogramacii.koepckeae; () => { var y = this; }; return x; } shawi() : minutus.inez> { var x : minutus.inez>; () => { var y = this; }; return x; } gmelini() : rionegrensis.caniventer { var x : rionegrensis.caniventer; () => { var y = this; }; return x; } @@ -298,7 +298,7 @@ resolvingClassDeclarationWhenInBaseTypeResolution.ts(769,53): error TS2449: Clas } } namespace ruatanica { - export class americanus extends imperfecta.ciliolabrum { + export class americans extends imperfecta.ciliolabrum { ~~~~~~~~~~~ !!! error TS2449: Class 'ciliolabrum' used before its declaration. !!! related TS2728 resolvingClassDeclarationWhenInBaseTypeResolution.ts:809:18: 'ciliolabrum' is declared here. @@ -326,7 +326,7 @@ resolvingClassDeclarationWhenInBaseTypeResolution.ts(769,53): error TS2449: Clas } export class beisa { } - export class otion extends howi.coludo { + export class option extends howi.coludo { ~~~~~~ !!! error TS2449: Class 'coludo' used before its declaration. !!! related TS2728 resolvingClassDeclarationWhenInBaseTypeResolution.ts:889:18: 'coludo' is declared here. @@ -354,7 +354,7 @@ resolvingClassDeclarationWhenInBaseTypeResolution.ts(769,53): error TS2449: Clas goudotii() : trivirgatus.falconeri { var x : trivirgatus.falconeri; () => { var y = this; }; return x; } pohlei() : Lanthanum.megalonyx { var x : Lanthanum.megalonyx; () => { var y = this; }; return x; } ineptus() : panamensis.setulosus { var x : panamensis.setulosus; () => { var y = this; }; return x; } - euryotis() : rendalli.moojeni> { var x : rendalli.moojeni>; () => { var y = this; }; return x; } + euryotis() : rendalli.moojeni> { var x : rendalli.moojeni>; () => { var y = this; }; return x; } maurisca() : Lanthanum.suillus { var x : Lanthanum.suillus; () => { var y = this; }; return x; } coyhaiquensis() : caurinus.mahaganus, panglima.abidi>, lutreolus.punicus> { var x : caurinus.mahaganus, panglima.abidi>, lutreolus.punicus>; () => { var y = this; }; return x; } } @@ -369,7 +369,7 @@ resolvingClassDeclarationWhenInBaseTypeResolution.ts(769,53): error TS2449: Clas roosmalenorum() : dogramacii.koepckeae { var x : dogramacii.koepckeae; () => { var y = this; }; return x; } rubicola() : rendalli.moojeni, gabriellae.echinatus>> { var x : rendalli.moojeni, gabriellae.echinatus>>; () => { var y = this; }; return x; } ikonnikovi() : argurus.luctuosa { var x : argurus.luctuosa; () => { var y = this; }; return x; } - paramicrus() : imperfecta.ciliolabrum> { var x : imperfecta.ciliolabrum>; () => { var y = this; }; return x; } + paramicrus() : imperfecta.ciliolabrum> { var x : imperfecta.ciliolabrum>; () => { var y = this; }; return x; } } export class lepturus extends Lanthanum.suillus { ferrumequinum() : argurus.netscheri { var x : argurus.netscheri; () => { var y = this; }; return x; } @@ -404,15 +404,15 @@ resolvingClassDeclarationWhenInBaseTypeResolution.ts(769,53): error TS2449: Clas Thulium() : julianae.durangae { var x : julianae.durangae; () => { var y = this; }; return x; } patrius() : Lanthanum.jugularis { var x : Lanthanum.jugularis; () => { var y = this; }; return x; } quadraticauda() : julianae.nudicaudus { var x : julianae.nudicaudus; () => { var y = this; }; return x; } - ater() : ruatanica.americanus { var x : ruatanica.americanus; () => { var y = this; }; return x; } + ater() : ruatanica.americans { var x : ruatanica.americans; () => { var y = this; }; return x; } } export class aurata { - grunniens() : nigra.gracilis, julianae.sumatrana>, ruatanica.americanus> { var x : nigra.gracilis, julianae.sumatrana>, ruatanica.americanus>; () => { var y = this; }; return x; } - howensis() : ruatanica.americanus { var x : ruatanica.americanus; () => { var y = this; }; return x; } + grunniens() : nigra.gracilis, julianae.sumatrana>, ruatanica.americans> { var x : nigra.gracilis, julianae.sumatrana>, ruatanica.americans>; () => { var y = this; }; return x; } + howensis() : ruatanica.americans { var x : ruatanica.americans; () => { var y = this; }; return x; } karlkoopmani() : caurinus.psilurus { var x : caurinus.psilurus; () => { var y = this; }; return x; } mirapitanga() : julianae.albidens { var x : julianae.albidens; () => { var y = this; }; return x; } ophiodon() : aurata { var x : aurata; () => { var y = this; }; return x; } - landeri() : samarensis.pelurus { var x : samarensis.pelurus; () => { var y = this; }; return x; } + landeri() : samarensis.pelurus { var x : samarensis.pelurus; () => { var y = this; }; return x; } sonomae() : trivirgatus.lotor, koepckeae> { var x : trivirgatus.lotor, koepckeae>; () => { var y = this; }; return x; } erythromos() : caurinus.johorensis, nigra.dolichurus> { var x : caurinus.johorensis, nigra.dolichurus>; () => { var y = this; }; return x; } } @@ -421,7 +421,7 @@ resolvingClassDeclarationWhenInBaseTypeResolution.ts(769,53): error TS2449: Clas export class schlegeli extends lavali.beisa { mittendorfi() : rionegrensis.caniventer { var x : rionegrensis.caniventer; () => { var y = this; }; return x; } blicki() : dogramacii.robustulus { var x : dogramacii.robustulus; () => { var y = this; }; return x; } - culionensis() : argurus.dauricus { var x : argurus.dauricus; () => { var y = this; }; return x; } + culionensis() : argurus.dauricus { var x : argurus.dauricus; () => { var y = this; }; return x; } scrofa() : petrophilus.sodyi { var x : petrophilus.sodyi; () => { var y = this; }; return x; } fernandoni() : quasiater.carolinensis { var x : quasiater.carolinensis; () => { var y = this; }; return x; } Tin() : sagitta.leptoceros> { var x : sagitta.leptoceros>; () => { var y = this; }; return x; } @@ -431,7 +431,7 @@ resolvingClassDeclarationWhenInBaseTypeResolution.ts(769,53): error TS2449: Clas frontalis() : macrorhinos.marmosurus>, samarensis.pallidus> { var x : macrorhinos.marmosurus>, samarensis.pallidus>; () => { var y = this; }; return x; } cuniculus() : patas.uralensis { var x : patas.uralensis; () => { var y = this; }; return x; } magdalenae() : julianae.gerbillus> { var x : julianae.gerbillus>; () => { var y = this; }; return x; } - andamanensis() : julianae.oralis { var x : julianae.oralis; () => { var y = this; }; return x; } + andamanensis() : julianae.oralis { var x : julianae.oralis; () => { var y = this; }; return x; } dispar() : panamensis.linulus { var x : panamensis.linulus; () => { var y = this; }; return x; } } } @@ -519,7 +519,7 @@ resolvingClassDeclarationWhenInBaseTypeResolution.ts(769,53): error TS2449: Clas } namespace caurinus { export class mahaganus extends panglima.fundatus { - martiniquensis(): ruatanica.hector>> { var x: ruatanica.hector>>; () => { var y = this; }; return x; } + martiniquensis(): ruatanica.hector>> { var x: ruatanica.hector>>; () => { var y = this; }; return x; } devius(): samarensis.pelurus, trivirgatus.falconeri>> { var x: samarensis.pelurus, trivirgatus.falconeri>>; () => { var y = this; }; return x; } masalai(): argurus.oreas { var x: argurus.oreas; () => { var y = this; }; return x; } kathleenae(): nigra.dolichurus { var x: nigra.dolichurus; () => { var y = this; }; return x; } @@ -555,7 +555,7 @@ resolvingClassDeclarationWhenInBaseTypeResolution.ts(769,53): error TS2449: Clas tristriatus(): rionegrensis.veraecrucis> { var x: rionegrensis.veraecrucis>; () => { var y = this; }; return x; } lasiura(): panglima.abidi>, Lanthanum.nitidus> { var x: panglima.abidi>, Lanthanum.nitidus>; () => { var y = this; }; return x; } gangetica(): argurus.luctuosa { var x: argurus.luctuosa; () => { var y = this; }; return x; } - brucei(): chrysaeolus.sarasinorum { var x: chrysaeolus.sarasinorum; () => { var y = this; }; return x; } + brucei(): chrysaeolus.sarasinorum { var x: chrysaeolus.sarasinorum; () => { var y = this; }; return x; } } } namespace sagitta { @@ -563,7 +563,7 @@ resolvingClassDeclarationWhenInBaseTypeResolution.ts(769,53): error TS2449: Clas ~~~~~~~~~~~~~ !!! error TS2449: Class 'portoricensis' used before its declaration. !!! related TS2728 resolvingClassDeclarationWhenInBaseTypeResolution.ts:851:18: 'portoricensis' is declared here. - maracajuensis(): samarensis.cahirinus { var x: samarensis.cahirinus; () => { var y = this; }; return x; } + maracajuensis(): samarensis.cahirinus { var x: samarensis.cahirinus; () => { var y = this; }; return x; } } } namespace minutus { @@ -645,7 +645,7 @@ resolvingClassDeclarationWhenInBaseTypeResolution.ts(769,53): error TS2449: Clas suricatta(): daubentonii.nigricans { var x: daubentonii.nigricans; () => { var y = this; }; return x; } jagorii(): julianae.galapagoensis { var x: julianae.galapagoensis; () => { var y = this; }; return x; } beecrofti(): sagitta.stolzmanni { var x: sagitta.stolzmanni; () => { var y = this; }; return x; } - imaizumii(): minutus.inez, gabriellae.echinatus>, dogramacii.aurata>, lavali.otion>, macrorhinos.konganensis> { var x: minutus.inez, gabriellae.echinatus>, dogramacii.aurata>, lavali.otion>, macrorhinos.konganensis>; () => { var y = this; }; return x; } + imaizumii(): minutus.inez, gabriellae.echinatus>, dogramacii.aurata>, lavali.option>, macrorhinos.konganensis> { var x: minutus.inez, gabriellae.echinatus>, dogramacii.aurata>, lavali.option>, macrorhinos.konganensis>; () => { var y = this; }; return x; } colocolo(): quasiater.bobrinskoi { var x: quasiater.bobrinskoi; () => { var y = this; }; return x; } wolfi(): petrophilus.rosalia> { var x: petrophilus.rosalia>; () => { var y = this; }; return x; } } @@ -656,7 +656,7 @@ resolvingClassDeclarationWhenInBaseTypeResolution.ts(769,53): error TS2449: Clas viaria(): chrysaeolus.sarasinorum { var x: chrysaeolus.sarasinorum; () => { var y = this; }; return x; } } export class cahirinus { - alashanicus(): nigra.caucasica { var x: nigra.caucasica; () => { var y = this; }; return x; } + alashanicus(): nigra.caucasica { var x: nigra.caucasica; () => { var y = this; }; return x; } flaviventer(): trivirgatus.tumidifrons> { var x: trivirgatus.tumidifrons>; () => { var y = this; }; return x; } bottai(): lutreolus.schlegeli { var x: lutreolus.schlegeli; () => { var y = this; }; return x; } pinetis(): argurus.oreas { var x: argurus.oreas; () => { var y = this; }; return x; } @@ -672,7 +672,7 @@ resolvingClassDeclarationWhenInBaseTypeResolution.ts(769,53): error TS2449: Clas hoplomyoides(): panglima.fundatus, nigra.gracilis> { var x: panglima.fundatus, nigra.gracilis>; () => { var y = this; }; return x; } gratiosus(): lavali.lepturus { var x: lavali.lepturus; () => { var y = this; }; return x; } rex(): lavali.wilsoni { var x: lavali.wilsoni; () => { var y = this; }; return x; } - bolami(): trivirgatus.tumidifrons { var x: trivirgatus.tumidifrons; () => { var y = this; }; return x; } + bolami(): trivirgatus.tumidifrons { var x: trivirgatus.tumidifrons; () => { var y = this; }; return x; } } } namespace daubentonii { @@ -733,7 +733,7 @@ resolvingClassDeclarationWhenInBaseTypeResolution.ts(769,53): error TS2449: Clas } namespace daubentonii { export class arboreus { - capreolus(): rendalli.crenulata, lavali.wilsoni> { var x: rendalli.crenulata, lavali.wilsoni>; () => { var y = this; }; return x; } + capreolus(): rendalli.crenulata, lavali.wilsoni> { var x: rendalli.crenulata, lavali.wilsoni>; () => { var y = this; }; return x; } moreni(): panglima.abidi { var x: panglima.abidi; () => { var y = this; }; return x; } hypoleucos(): nigra.gracilis { var x: nigra.gracilis; () => { var y = this; }; return x; } paedulcus(): minutus.portoricensis { var x: minutus.portoricensis; () => { var y = this; }; return x; } @@ -756,7 +756,7 @@ resolvingClassDeclarationWhenInBaseTypeResolution.ts(769,53): error TS2449: Clas muricauda(): panglima.fundatus> { var x: panglima.fundatus>; () => { var y = this; }; return x; } albicaudus(): sagitta.stolzmanni { var x: sagitta.stolzmanni; () => { var y = this; }; return x; } fallax(): ruatanica.hector { var x: ruatanica.hector; () => { var y = this; }; return x; } - attenuata(): macrorhinos.marmosurus> { var x: macrorhinos.marmosurus>; () => { var y = this; }; return x; } + attenuata(): macrorhinos.marmosurus> { var x: macrorhinos.marmosurus>; () => { var y = this; }; return x; } megalura(): howi.marcanoi { var x: howi.marcanoi; () => { var y = this; }; return x; } neblina(): samarensis.pelurus { var x: samarensis.pelurus; () => { var y = this; }; return x; } citellus(): daubentonii.arboreus { var x: daubentonii.arboreus; () => { var y = this; }; return x; } @@ -767,7 +767,7 @@ resolvingClassDeclarationWhenInBaseTypeResolution.ts(769,53): error TS2449: Clas namespace provocax { export class melanoleuca extends lavali.wilsoni { Neodymium(): macrorhinos.marmosurus, lutreolus.foina> { var x: macrorhinos.marmosurus, lutreolus.foina>; () => { var y = this; }; return x; } - baeri(): imperfecta.lasiurus { var x: imperfecta.lasiurus; () => { var y = this; }; return x; } + baeri(): imperfecta.lasiurus { var x: imperfecta.lasiurus; () => { var y = this; }; return x; } } } namespace sagitta { @@ -807,7 +807,7 @@ resolvingClassDeclarationWhenInBaseTypeResolution.ts(769,53): error TS2449: Clas dubosti(): nigra.thalia { var x: nigra.thalia; () => { var y = this; }; return x; } opossum(): nigra.dolichurus { var x: nigra.dolichurus; () => { var y = this; }; return x; } oreopolus(): minutus.portoricensis { var x: minutus.portoricensis; () => { var y = this; }; return x; } - amurensis(): daubentonii.arboreus { var x: daubentonii.arboreus; () => { var y = this; }; return x; } + amurensis(): daubentonii.arboreus { var x: daubentonii.arboreus; () => { var y = this; }; return x; } } } namespace petrophilus { @@ -817,7 +817,7 @@ resolvingClassDeclarationWhenInBaseTypeResolution.ts(769,53): error TS2449: Clas namespace lutreolus { export class punicus { strandi(): gabriellae.klossii { var x: gabriellae.klossii; () => { var y = this; }; return x; } - lar(): caurinus.mahaganus { var x: caurinus.mahaganus; () => { var y = this; }; return x; } + lar(): caurinus.mahaganus { var x: caurinus.mahaganus; () => { var y = this; }; return x; } erica(): dogramacii.koepckeae { var x: dogramacii.koepckeae; () => { var y = this; }; return x; } trichura(): macrorhinos.konganensis { var x: macrorhinos.konganensis; () => { var y = this; }; return x; } lemniscatus(): panglima.fundatus { var x: panglima.fundatus; () => { var y = this; }; return x; } @@ -835,7 +835,7 @@ resolvingClassDeclarationWhenInBaseTypeResolution.ts(769,53): error TS2449: Clas export class daphaenodon { bredanensis(): julianae.sumatrana { var x: julianae.sumatrana; () => { var y = this; }; return x; } othus(): howi.coludo { var x: howi.coludo; () => { var y = this; }; return x; } - hammondi(): julianae.gerbillus, gabriellae.echinatus>, dogramacii.aurata>, lavali.otion> { var x: julianae.gerbillus, gabriellae.echinatus>, dogramacii.aurata>, lavali.otion>; () => { var y = this; }; return x; } + hammondi(): julianae.gerbillus, gabriellae.echinatus>, dogramacii.aurata>, lavali.option> { var x: julianae.gerbillus, gabriellae.echinatus>, dogramacii.aurata>, lavali.option>; () => { var y = this; }; return x; } aureocollaris(): quasiater.carolinensis { var x: quasiater.carolinensis; () => { var y = this; }; return x; } flavipes(): petrophilus.minutilla { var x: petrophilus.minutilla; () => { var y = this; }; return x; } callosus(): trivirgatus.lotor { var x: trivirgatus.lotor; () => { var y = this; }; return x; } @@ -889,7 +889,7 @@ resolvingClassDeclarationWhenInBaseTypeResolution.ts(769,53): error TS2449: Clas fulvus(): argurus.germaini { var x: argurus.germaini; () => { var y = this; }; return x; } paranaensis(): dogramacii.koepckeae { var x: dogramacii.koepckeae; () => { var y = this; }; return x; } didactylus(): panglima.abidi> { var x: panglima.abidi>; () => { var y = this; }; return x; } - schreibersii(): nigra.gracilis { var x: nigra.gracilis; () => { var y = this; }; return x; } + schreibersii(): nigra.gracilis { var x: nigra.gracilis; () => { var y = this; }; return x; } orii(): dogramacii.kaiseri { var x: dogramacii.kaiseri; () => { var y = this; }; return x; } } export class subspinosus { @@ -1059,7 +1059,7 @@ resolvingClassDeclarationWhenInBaseTypeResolution.ts(769,53): error TS2449: Clas } namespace ruatanica { export class Praseodymium extends ruatanica.hector { - clara(): panglima.amphibius, argurus.dauricus> { var x: panglima.amphibius, argurus.dauricus>; () => { var y = this; }; return x; } + clara(): panglima.amphibius, argurus.dauricus> { var x: panglima.amphibius, argurus.dauricus>; () => { var y = this; }; return x; } spectabilis(): petrophilus.sodyi { var x: petrophilus.sodyi; () => { var y = this; }; return x; } kamensis(): trivirgatus.lotor, lavali.lepturus> { var x: trivirgatus.lotor, lavali.lepturus>; () => { var y = this; }; return x; } ruddi(): lutreolus.foina { var x: lutreolus.foina; () => { var y = this; }; return x; } diff --git a/tests/baselines/reference/resolvingClassDeclarationWhenInBaseTypeResolution.js b/tests/baselines/reference/resolvingClassDeclarationWhenInBaseTypeResolution.js index 8159727350125..6de870bbaa0a3 100644 --- a/tests/baselines/reference/resolvingClassDeclarationWhenInBaseTypeResolution.js +++ b/tests/baselines/reference/resolvingClassDeclarationWhenInBaseTypeResolution.js @@ -5,7 +5,7 @@ namespace rionegrensis { export class caniventer extends Lanthanum.nitidus { salomonseni() : caniventer { var x : caniventer; () => { var y = this; }; return x; } uchidai() : lavali.xanthognathus { var x : lavali.xanthognathus; () => { var y = this; }; return x; } - raffrayana() : lavali.otion { var x : lavali.otion; () => { var y = this; }; return x; } + raffrayana() : lavali.option { var x : lavali.option; () => { var y = this; }; return x; } Uranium() : minutus.inez, trivirgatus.falconeri> { var x : minutus.inez, trivirgatus.falconeri>; () => { var y = this; }; return x; } nayaur() : gabriellae.amicus { var x : gabriellae.amicus; () => { var y = this; }; return x; } } @@ -29,7 +29,7 @@ namespace julianae { } export class galapagoensis { isabellae() : panglima.amphibius { var x : panglima.amphibius; () => { var y = this; }; return x; } - rueppellii() : ruatanica.americanus { var x : ruatanica.americanus; () => { var y = this; }; return x; } + rueppellii() : ruatanica.americans { var x : ruatanica.americans; () => { var y = this; }; return x; } peregusna() : dogramacii.kaiseri { var x : dogramacii.kaiseri; () => { var y = this; }; return x; } gliroides() : howi.coludo { var x : howi.coludo; () => { var y = this; }; return x; } banakrisi() : macrorhinos.daphaenodon { var x : macrorhinos.daphaenodon; () => { var y = this; }; return x; } @@ -43,7 +43,7 @@ namespace julianae { hirta() : Lanthanum.jugularis { var x : Lanthanum.jugularis; () => { var y = this; }; return x; } virginianus() : durangae { var x : durangae; () => { var y = this; }; return x; } macrophyllum() : howi.marcanoi { var x : howi.marcanoi; () => { var y = this; }; return x; } - porcellus() : ruatanica.americanus { var x : ruatanica.americanus; () => { var y = this; }; return x; } + porcellus() : ruatanica.americans { var x : ruatanica.americans; () => { var y = this; }; return x; } } export class oralis extends caurinus.psilurus { cepapi() : caurinus.psilurus { var x : caurinus.psilurus; () => { var y = this; }; return x; } @@ -56,7 +56,7 @@ namespace julianae { monax() : imperfecta.subspinosus { var x : imperfecta.subspinosus; () => { var y = this; }; return x; } unalascensis() : minutus.inez, gabriellae.echinatus>, dogramacii.aurata> { var x : minutus.inez, gabriellae.echinatus>, dogramacii.aurata>; () => { var y = this; }; return x; } wuchihensis() : howi.angulatus, petrophilus.minutilla> { var x : howi.angulatus, petrophilus.minutilla>; () => { var y = this; }; return x; } - leucippe() : lavali.otion { var x : lavali.otion; () => { var y = this; }; return x; } + leucippe() : lavali.option { var x : lavali.option; () => { var y = this; }; return x; } ordii() : daubentonii.arboreus { var x : daubentonii.arboreus; () => { var y = this; }; return x; } eisentrauti() : rendalli.zuluensis { var x : rendalli.zuluensis; () => { var y = this; }; return x; } } @@ -84,9 +84,9 @@ namespace julianae { } export class acariensis { levicula() : lavali.lepturus { var x : lavali.lepturus; () => { var y = this; }; return x; } - minous() : argurus.dauricus { var x : argurus.dauricus; () => { var y = this; }; return x; } - cinereiventer() : panamensis.setulosus { var x : panamensis.setulosus; () => { var y = this; }; return x; } - longicaudatus() : macrorhinos.marmosurus> { var x : macrorhinos.marmosurus>; () => { var y = this; }; return x; } + minous() : argurus.dauricus { var x : argurus.dauricus; () => { var y = this; }; return x; } + cinereiventer() : panamensis.setulosus { var x : panamensis.setulosus; () => { var y = this; }; return x; } + longicaudatus() : macrorhinos.marmosurus> { var x : macrorhinos.marmosurus>; () => { var y = this; }; return x; } baeodon() : argurus.netscheri, argurus.luctuosa> { var x : argurus.netscheri, argurus.luctuosa>; () => { var y = this; }; return x; } soricoides() : argurus.luctuosa { var x : argurus.luctuosa; () => { var y = this; }; return x; } datae() : daubentonii.arboreus> { var x : daubentonii.arboreus>; () => { var y = this; }; return x; } @@ -122,7 +122,7 @@ namespace Lanthanum { dominicensis() : dammermani.melanops { var x : dammermani.melanops; () => { var y = this; }; return x; } taurus() : macrorhinos.konganensis { var x : macrorhinos.konganensis; () => { var y = this; }; return x; } tonganus() : argurus.netscheri { var x : argurus.netscheri; () => { var y = this; }; return x; } - silvatica() : rendalli.moojeni { var x : rendalli.moojeni; () => { var y = this; }; return x; } + silvatica() : rendalli.moojeni { var x : rendalli.moojeni; () => { var y = this; }; return x; } midas() : lavali.xanthognathus { var x : lavali.xanthognathus; () => { var y = this; }; return x; } bicornis() : dogramacii.kaiseri { var x : dogramacii.kaiseri; () => { var y = this; }; return x; } } @@ -141,7 +141,7 @@ namespace Lanthanum { revoili() : lavali.wilsoni { var x : lavali.wilsoni; () => { var y = this; }; return x; } macrobullatus() : macrorhinos.daphaenodon { var x : macrorhinos.daphaenodon; () => { var y = this; }; return x; } compactus() : sagitta.stolzmanni { var x : sagitta.stolzmanni; () => { var y = this; }; return x; } - talpinus() : nitidus { var x : nitidus; () => { var y = this; }; return x; } + talpinus() : nitidus { var x : nitidus; () => { var y = this; }; return x; } stramineus() : gabriellae.amicus { var x : gabriellae.amicus; () => { var y = this; }; return x; } dartmouthi() : trivirgatus.mixtus { var x : trivirgatus.mixtus; () => { var y = this; }; return x; } ogilbyi() : argurus.dauricus { var x : argurus.dauricus; () => { var y = this; }; return x; } @@ -160,18 +160,18 @@ namespace rendalli { occasius() : argurus.gilbertii { var x : argurus.gilbertii; () => { var y = this; }; return x; } damarensis() : julianae.galapagoensis { var x : julianae.galapagoensis; () => { var y = this; }; return x; } Neptunium() : panglima.abidi { var x : panglima.abidi; () => { var y = this; }; return x; } - griseoflavus() : ruatanica.americanus { var x : ruatanica.americanus; () => { var y = this; }; return x; } + griseoflavus() : ruatanica.americans { var x : ruatanica.americans; () => { var y = this; }; return x; } thar() : argurus.oreas { var x : argurus.oreas; () => { var y = this; }; return x; } alborufus() : panamensis.linulus { var x : panamensis.linulus; () => { var y = this; }; return x; } fusicaudus() : sagitta.stolzmanni { var x : sagitta.stolzmanni; () => { var y = this; }; return x; } - gordonorum() : howi.angulatus { var x : howi.angulatus; () => { var y = this; }; return x; } + gordonorum() : howi.angulatus { var x : howi.angulatus; () => { var y = this; }; return x; } ruber() : dammermani.siberu { var x : dammermani.siberu; () => { var y = this; }; return x; } desmarestianus() : julianae.steerii { var x : julianae.steerii; () => { var y = this; }; return x; } lutillus() : nigra.dolichurus { var x : nigra.dolichurus; () => { var y = this; }; return x; } salocco() : argurus.peninsulae { var x : argurus.peninsulae; () => { var y = this; }; return x; } } export class moojeni { - floweri() : lavali.otion { var x : lavali.otion; () => { var y = this; }; return x; } + floweri() : lavali.option { var x : lavali.option; () => { var y = this; }; return x; } montosa() : imperfecta.ciliolabrum { var x : imperfecta.ciliolabrum; () => { var y = this; }; return x; } miletus() : julianae.sumatrana { var x : julianae.sumatrana; () => { var y = this; }; return x; } heaneyi() : zuluensis { var x : zuluensis; () => { var y = this; }; return x; } @@ -184,7 +184,7 @@ namespace rendalli { } export class crenulata extends trivirgatus.falconeri { salvanius() : howi.coludo { var x : howi.coludo; () => { var y = this; }; return x; } - maritimus() : ruatanica.americanus { var x : ruatanica.americanus; () => { var y = this; }; return x; } + maritimus() : ruatanica.americans { var x : ruatanica.americans; () => { var y = this; }; return x; } edax() : lutreolus.cor>, rionegrensis.caniventer> { var x : lutreolus.cor>, rionegrensis.caniventer>; () => { var y = this; }; return x; } } } @@ -215,8 +215,8 @@ namespace trivirgatus { export class falconeri { cabrali() : rendalli.moojeni>, daubentonii.arboreus> { var x : rendalli.moojeni>, daubentonii.arboreus>; () => { var y = this; }; return x; } gouldi() : nigra.dolichurus>, patas.uralensis> { var x : nigra.dolichurus>, patas.uralensis>; () => { var y = this; }; return x; } - fuscicollis() : samarensis.pelurus> { var x : samarensis.pelurus>; () => { var y = this; }; return x; } - martiensseni() : sagitta.cinereus>, dogramacii.koepckeae> { var x : sagitta.cinereus>, dogramacii.koepckeae>; () => { var y = this; }; return x; } + fuscicollis() : samarensis.pelurus> { var x : samarensis.pelurus>; () => { var y = this; }; return x; } + martiensseni() : sagitta.cinereus>, dogramacii.koepckeae> { var x : sagitta.cinereus>, dogramacii.koepckeae>; () => { var y = this; }; return x; } gaoligongensis() : dogramacii.koepckeae { var x : dogramacii.koepckeae; () => { var y = this; }; return x; } shawi() : minutus.inez> { var x : minutus.inez>; () => { var y = this; }; return x; } gmelini() : rionegrensis.caniventer { var x : rionegrensis.caniventer; () => { var y = this; }; return x; } @@ -247,7 +247,7 @@ namespace quasiater { } } namespace ruatanica { - export class americanus extends imperfecta.ciliolabrum { + export class americans extends imperfecta.ciliolabrum { nasoloi() : macrorhinos.konganensis { var x : macrorhinos.konganensis; () => { var y = this; }; return x; } mystacalis() : howi.angulatus { var x : howi.angulatus; () => { var y = this; }; return x; } fardoulisi() : trivirgatus.oconnelli { var x : trivirgatus.oconnelli; () => { var y = this; }; return x; } @@ -272,7 +272,7 @@ namespace lavali { } export class beisa { } - export class otion extends howi.coludo { + export class option extends howi.coludo { bonaerensis() : provocax.melanoleuca { var x : provocax.melanoleuca; () => { var y = this; }; return x; } dussumieri() : nigra.gracilis { var x : nigra.gracilis; () => { var y = this; }; return x; } osvaldoreigi() : julianae.albidens { var x : julianae.albidens; () => { var y = this; }; return x; } @@ -297,7 +297,7 @@ namespace lavali { goudotii() : trivirgatus.falconeri { var x : trivirgatus.falconeri; () => { var y = this; }; return x; } pohlei() : Lanthanum.megalonyx { var x : Lanthanum.megalonyx; () => { var y = this; }; return x; } ineptus() : panamensis.setulosus { var x : panamensis.setulosus; () => { var y = this; }; return x; } - euryotis() : rendalli.moojeni> { var x : rendalli.moojeni>; () => { var y = this; }; return x; } + euryotis() : rendalli.moojeni> { var x : rendalli.moojeni>; () => { var y = this; }; return x; } maurisca() : Lanthanum.suillus { var x : Lanthanum.suillus; () => { var y = this; }; return x; } coyhaiquensis() : caurinus.mahaganus, panglima.abidi>, lutreolus.punicus> { var x : caurinus.mahaganus, panglima.abidi>, lutreolus.punicus>; () => { var y = this; }; return x; } } @@ -309,7 +309,7 @@ namespace lavali { roosmalenorum() : dogramacii.koepckeae { var x : dogramacii.koepckeae; () => { var y = this; }; return x; } rubicola() : rendalli.moojeni, gabriellae.echinatus>> { var x : rendalli.moojeni, gabriellae.echinatus>>; () => { var y = this; }; return x; } ikonnikovi() : argurus.luctuosa { var x : argurus.luctuosa; () => { var y = this; }; return x; } - paramicrus() : imperfecta.ciliolabrum> { var x : imperfecta.ciliolabrum>; () => { var y = this; }; return x; } + paramicrus() : imperfecta.ciliolabrum> { var x : imperfecta.ciliolabrum>; () => { var y = this; }; return x; } } export class lepturus extends Lanthanum.suillus { ferrumequinum() : argurus.netscheri { var x : argurus.netscheri; () => { var y = this; }; return x; } @@ -344,15 +344,15 @@ namespace dogramacii { Thulium() : julianae.durangae { var x : julianae.durangae; () => { var y = this; }; return x; } patrius() : Lanthanum.jugularis { var x : Lanthanum.jugularis; () => { var y = this; }; return x; } quadraticauda() : julianae.nudicaudus { var x : julianae.nudicaudus; () => { var y = this; }; return x; } - ater() : ruatanica.americanus { var x : ruatanica.americanus; () => { var y = this; }; return x; } + ater() : ruatanica.americans { var x : ruatanica.americans; () => { var y = this; }; return x; } } export class aurata { - grunniens() : nigra.gracilis, julianae.sumatrana>, ruatanica.americanus> { var x : nigra.gracilis, julianae.sumatrana>, ruatanica.americanus>; () => { var y = this; }; return x; } - howensis() : ruatanica.americanus { var x : ruatanica.americanus; () => { var y = this; }; return x; } + grunniens() : nigra.gracilis, julianae.sumatrana>, ruatanica.americans> { var x : nigra.gracilis, julianae.sumatrana>, ruatanica.americans>; () => { var y = this; }; return x; } + howensis() : ruatanica.americans { var x : ruatanica.americans; () => { var y = this; }; return x; } karlkoopmani() : caurinus.psilurus { var x : caurinus.psilurus; () => { var y = this; }; return x; } mirapitanga() : julianae.albidens { var x : julianae.albidens; () => { var y = this; }; return x; } ophiodon() : aurata { var x : aurata; () => { var y = this; }; return x; } - landeri() : samarensis.pelurus { var x : samarensis.pelurus; () => { var y = this; }; return x; } + landeri() : samarensis.pelurus { var x : samarensis.pelurus; () => { var y = this; }; return x; } sonomae() : trivirgatus.lotor, koepckeae> { var x : trivirgatus.lotor, koepckeae>; () => { var y = this; }; return x; } erythromos() : caurinus.johorensis, nigra.dolichurus> { var x : caurinus.johorensis, nigra.dolichurus>; () => { var y = this; }; return x; } } @@ -361,7 +361,7 @@ namespace lutreolus { export class schlegeli extends lavali.beisa { mittendorfi() : rionegrensis.caniventer { var x : rionegrensis.caniventer; () => { var y = this; }; return x; } blicki() : dogramacii.robustulus { var x : dogramacii.robustulus; () => { var y = this; }; return x; } - culionensis() : argurus.dauricus { var x : argurus.dauricus; () => { var y = this; }; return x; } + culionensis() : argurus.dauricus { var x : argurus.dauricus; () => { var y = this; }; return x; } scrofa() : petrophilus.sodyi { var x : petrophilus.sodyi; () => { var y = this; }; return x; } fernandoni() : quasiater.carolinensis { var x : quasiater.carolinensis; () => { var y = this; }; return x; } Tin() : sagitta.leptoceros> { var x : sagitta.leptoceros>; () => { var y = this; }; return x; } @@ -371,7 +371,7 @@ namespace lutreolus { frontalis() : macrorhinos.marmosurus>, samarensis.pallidus> { var x : macrorhinos.marmosurus>, samarensis.pallidus>; () => { var y = this; }; return x; } cuniculus() : patas.uralensis { var x : patas.uralensis; () => { var y = this; }; return x; } magdalenae() : julianae.gerbillus> { var x : julianae.gerbillus>; () => { var y = this; }; return x; } - andamanensis() : julianae.oralis { var x : julianae.oralis; () => { var y = this; }; return x; } + andamanensis() : julianae.oralis { var x : julianae.oralis; () => { var y = this; }; return x; } dispar() : panamensis.linulus { var x : panamensis.linulus; () => { var y = this; }; return x; } } } @@ -453,7 +453,7 @@ namespace minutus { } namespace caurinus { export class mahaganus extends panglima.fundatus { - martiniquensis(): ruatanica.hector>> { var x: ruatanica.hector>>; () => { var y = this; }; return x; } + martiniquensis(): ruatanica.hector>> { var x: ruatanica.hector>>; () => { var y = this; }; return x; } devius(): samarensis.pelurus, trivirgatus.falconeri>> { var x: samarensis.pelurus, trivirgatus.falconeri>>; () => { var y = this; }; return x; } masalai(): argurus.oreas { var x: argurus.oreas; () => { var y = this; }; return x; } kathleenae(): nigra.dolichurus { var x: nigra.dolichurus; () => { var y = this; }; return x; } @@ -486,12 +486,12 @@ namespace nigra { tristriatus(): rionegrensis.veraecrucis> { var x: rionegrensis.veraecrucis>; () => { var y = this; }; return x; } lasiura(): panglima.abidi>, Lanthanum.nitidus> { var x: panglima.abidi>, Lanthanum.nitidus>; () => { var y = this; }; return x; } gangetica(): argurus.luctuosa { var x: argurus.luctuosa; () => { var y = this; }; return x; } - brucei(): chrysaeolus.sarasinorum { var x: chrysaeolus.sarasinorum; () => { var y = this; }; return x; } + brucei(): chrysaeolus.sarasinorum { var x: chrysaeolus.sarasinorum; () => { var y = this; }; return x; } } } namespace sagitta { export class walkeri extends minutus.portoricensis { - maracajuensis(): samarensis.cahirinus { var x: samarensis.cahirinus; () => { var y = this; }; return x; } + maracajuensis(): samarensis.cahirinus { var x: samarensis.cahirinus; () => { var y = this; }; return x; } } } namespace minutus { @@ -561,7 +561,7 @@ namespace samarensis { suricatta(): daubentonii.nigricans { var x: daubentonii.nigricans; () => { var y = this; }; return x; } jagorii(): julianae.galapagoensis { var x: julianae.galapagoensis; () => { var y = this; }; return x; } beecrofti(): sagitta.stolzmanni { var x: sagitta.stolzmanni; () => { var y = this; }; return x; } - imaizumii(): minutus.inez, gabriellae.echinatus>, dogramacii.aurata>, lavali.otion>, macrorhinos.konganensis> { var x: minutus.inez, gabriellae.echinatus>, dogramacii.aurata>, lavali.otion>, macrorhinos.konganensis>; () => { var y = this; }; return x; } + imaizumii(): minutus.inez, gabriellae.echinatus>, dogramacii.aurata>, lavali.option>, macrorhinos.konganensis> { var x: minutus.inez, gabriellae.echinatus>, dogramacii.aurata>, lavali.option>, macrorhinos.konganensis>; () => { var y = this; }; return x; } colocolo(): quasiater.bobrinskoi { var x: quasiater.bobrinskoi; () => { var y = this; }; return x; } wolfi(): petrophilus.rosalia> { var x: petrophilus.rosalia>; () => { var y = this; }; return x; } } @@ -572,7 +572,7 @@ namespace samarensis { viaria(): chrysaeolus.sarasinorum { var x: chrysaeolus.sarasinorum; () => { var y = this; }; return x; } } export class cahirinus { - alashanicus(): nigra.caucasica { var x: nigra.caucasica; () => { var y = this; }; return x; } + alashanicus(): nigra.caucasica { var x: nigra.caucasica; () => { var y = this; }; return x; } flaviventer(): trivirgatus.tumidifrons> { var x: trivirgatus.tumidifrons>; () => { var y = this; }; return x; } bottai(): lutreolus.schlegeli { var x: lutreolus.schlegeli; () => { var y = this; }; return x; } pinetis(): argurus.oreas { var x: argurus.oreas; () => { var y = this; }; return x; } @@ -585,7 +585,7 @@ namespace sagitta { hoplomyoides(): panglima.fundatus, nigra.gracilis> { var x: panglima.fundatus, nigra.gracilis>; () => { var y = this; }; return x; } gratiosus(): lavali.lepturus { var x: lavali.lepturus; () => { var y = this; }; return x; } rex(): lavali.wilsoni { var x: lavali.wilsoni; () => { var y = this; }; return x; } - bolami(): trivirgatus.tumidifrons { var x: trivirgatus.tumidifrons; () => { var y = this; }; return x; } + bolami(): trivirgatus.tumidifrons { var x: trivirgatus.tumidifrons; () => { var y = this; }; return x; } } } namespace daubentonii { @@ -640,7 +640,7 @@ namespace argurus { } namespace daubentonii { export class arboreus { - capreolus(): rendalli.crenulata, lavali.wilsoni> { var x: rendalli.crenulata, lavali.wilsoni>; () => { var y = this; }; return x; } + capreolus(): rendalli.crenulata, lavali.wilsoni> { var x: rendalli.crenulata, lavali.wilsoni>; () => { var y = this; }; return x; } moreni(): panglima.abidi { var x: panglima.abidi; () => { var y = this; }; return x; } hypoleucos(): nigra.gracilis { var x: nigra.gracilis; () => { var y = this; }; return x; } paedulcus(): minutus.portoricensis { var x: minutus.portoricensis; () => { var y = this; }; return x; } @@ -663,7 +663,7 @@ namespace patas { muricauda(): panglima.fundatus> { var x: panglima.fundatus>; () => { var y = this; }; return x; } albicaudus(): sagitta.stolzmanni { var x: sagitta.stolzmanni; () => { var y = this; }; return x; } fallax(): ruatanica.hector { var x: ruatanica.hector; () => { var y = this; }; return x; } - attenuata(): macrorhinos.marmosurus> { var x: macrorhinos.marmosurus>; () => { var y = this; }; return x; } + attenuata(): macrorhinos.marmosurus> { var x: macrorhinos.marmosurus>; () => { var y = this; }; return x; } megalura(): howi.marcanoi { var x: howi.marcanoi; () => { var y = this; }; return x; } neblina(): samarensis.pelurus { var x: samarensis.pelurus; () => { var y = this; }; return x; } citellus(): daubentonii.arboreus { var x: daubentonii.arboreus; () => { var y = this; }; return x; } @@ -674,7 +674,7 @@ namespace patas { namespace provocax { export class melanoleuca extends lavali.wilsoni { Neodymium(): macrorhinos.marmosurus, lutreolus.foina> { var x: macrorhinos.marmosurus, lutreolus.foina>; () => { var y = this; }; return x; } - baeri(): imperfecta.lasiurus { var x: imperfecta.lasiurus; () => { var y = this; }; return x; } + baeri(): imperfecta.lasiurus { var x: imperfecta.lasiurus; () => { var y = this; }; return x; } } } namespace sagitta { @@ -714,7 +714,7 @@ namespace argurus { dubosti(): nigra.thalia { var x: nigra.thalia; () => { var y = this; }; return x; } opossum(): nigra.dolichurus { var x: nigra.dolichurus; () => { var y = this; }; return x; } oreopolus(): minutus.portoricensis { var x: minutus.portoricensis; () => { var y = this; }; return x; } - amurensis(): daubentonii.arboreus { var x: daubentonii.arboreus; () => { var y = this; }; return x; } + amurensis(): daubentonii.arboreus { var x: daubentonii.arboreus; () => { var y = this; }; return x; } } } namespace petrophilus { @@ -724,7 +724,7 @@ namespace petrophilus { namespace lutreolus { export class punicus { strandi(): gabriellae.klossii { var x: gabriellae.klossii; () => { var y = this; }; return x; } - lar(): caurinus.mahaganus { var x: caurinus.mahaganus; () => { var y = this; }; return x; } + lar(): caurinus.mahaganus { var x: caurinus.mahaganus; () => { var y = this; }; return x; } erica(): dogramacii.koepckeae { var x: dogramacii.koepckeae; () => { var y = this; }; return x; } trichura(): macrorhinos.konganensis { var x: macrorhinos.konganensis; () => { var y = this; }; return x; } lemniscatus(): panglima.fundatus { var x: panglima.fundatus; () => { var y = this; }; return x; } @@ -742,7 +742,7 @@ namespace macrorhinos { export class daphaenodon { bredanensis(): julianae.sumatrana { var x: julianae.sumatrana; () => { var y = this; }; return x; } othus(): howi.coludo { var x: howi.coludo; () => { var y = this; }; return x; } - hammondi(): julianae.gerbillus, gabriellae.echinatus>, dogramacii.aurata>, lavali.otion> { var x: julianae.gerbillus, gabriellae.echinatus>, dogramacii.aurata>, lavali.otion>; () => { var y = this; }; return x; } + hammondi(): julianae.gerbillus, gabriellae.echinatus>, dogramacii.aurata>, lavali.option> { var x: julianae.gerbillus, gabriellae.echinatus>, dogramacii.aurata>, lavali.option>; () => { var y = this; }; return x; } aureocollaris(): quasiater.carolinensis { var x: quasiater.carolinensis; () => { var y = this; }; return x; } flavipes(): petrophilus.minutilla { var x: petrophilus.minutilla; () => { var y = this; }; return x; } callosus(): trivirgatus.lotor { var x: trivirgatus.lotor; () => { var y = this; }; return x; } @@ -793,7 +793,7 @@ namespace imperfecta { fulvus(): argurus.germaini { var x: argurus.germaini; () => { var y = this; }; return x; } paranaensis(): dogramacii.koepckeae { var x: dogramacii.koepckeae; () => { var y = this; }; return x; } didactylus(): panglima.abidi> { var x: panglima.abidi>; () => { var y = this; }; return x; } - schreibersii(): nigra.gracilis { var x: nigra.gracilis; () => { var y = this; }; return x; } + schreibersii(): nigra.gracilis { var x: nigra.gracilis; () => { var y = this; }; return x; } orii(): dogramacii.kaiseri { var x: dogramacii.kaiseri; () => { var y = this; }; return x; } } export class subspinosus { @@ -963,7 +963,7 @@ namespace argurus { } namespace ruatanica { export class Praseodymium extends ruatanica.hector { - clara(): panglima.amphibius, argurus.dauricus> { var x: panglima.amphibius, argurus.dauricus>; () => { var y = this; }; return x; } + clara(): panglima.amphibius, argurus.dauricus> { var x: panglima.amphibius, argurus.dauricus>; () => { var y = this; }; return x; } spectabilis(): petrophilus.sodyi { var x: petrophilus.sodyi; () => { var y = this; }; return x; } kamensis(): trivirgatus.lotor, lavali.lepturus> { var x: trivirgatus.lotor, lavali.lepturus>; () => { var y = this; }; return x; } ruddi(): lutreolus.foina { var x: lutreolus.foina; () => { var y = this; }; return x; } @@ -1301,13 +1301,13 @@ var quasiater; quasiater.bobrinskoi = bobrinskoi; })(quasiater || (quasiater = {})); (function (ruatanica) { - class americanus extends imperfecta.ciliolabrum { + class americans extends imperfecta.ciliolabrum { nasoloi() { var x; () => { var y = this; }; return x; } mystacalis() { var x; () => { var y = this; }; return x; } fardoulisi() { var x; () => { var y = this; }; return x; } tumidus() { var x; () => { var y = this; }; return x; } } - ruatanica.americanus = americanus; + ruatanica.americans = americans; })(ruatanica || (ruatanica = {})); var lavali; (function (lavali) { @@ -1330,7 +1330,7 @@ var lavali; class beisa { } lavali.beisa = beisa; - class otion extends howi.coludo { + class option extends howi.coludo { bonaerensis() { var x; () => { var y = this; }; return x; } dussumieri() { var x; () => { var y = this; }; return x; } osvaldoreigi() { var x; () => { var y = this; }; return x; } @@ -1345,7 +1345,7 @@ var lavali; ilaeus() { var x; () => { var y = this; }; return x; } musschenbroekii() { var x; () => { var y = this; }; return x; } } - lavali.otion = otion; + lavali.option = option; class xanthognathus { nanulus() { var x; () => { var y = this; }; return x; } albigena() { var x; () => { var y = this; }; return x; } @@ -2174,7 +2174,7 @@ declare namespace rionegrensis { class caniventer extends Lanthanum.nitidus { salomonseni(): caniventer; uchidai(): lavali.xanthognathus; - raffrayana(): lavali.otion; + raffrayana(): lavali.option; Uranium(): minutus.inez, trivirgatus.falconeri>; nayaur(): gabriellae.amicus; } @@ -2198,7 +2198,7 @@ declare namespace julianae { } class galapagoensis { isabellae(): panglima.amphibius; - rueppellii(): ruatanica.americanus; + rueppellii(): ruatanica.americans; peregusna(): dogramacii.kaiseri; gliroides(): howi.coludo; banakrisi(): macrorhinos.daphaenodon; @@ -2212,7 +2212,7 @@ declare namespace julianae { hirta(): Lanthanum.jugularis; virginianus(): durangae; macrophyllum(): howi.marcanoi; - porcellus(): ruatanica.americanus; + porcellus(): ruatanica.americans; } class oralis extends caurinus.psilurus { cepapi(): caurinus.psilurus; @@ -2225,7 +2225,7 @@ declare namespace julianae { monax(): imperfecta.subspinosus; unalascensis(): minutus.inez, gabriellae.echinatus>, dogramacii.aurata>; wuchihensis(): howi.angulatus, petrophilus.minutilla>; - leucippe(): lavali.otion; + leucippe(): lavali.option; ordii(): daubentonii.arboreus; eisentrauti(): rendalli.zuluensis; } @@ -2253,9 +2253,9 @@ declare namespace julianae { } class acariensis { levicula(): lavali.lepturus; - minous(): argurus.dauricus; - cinereiventer(): panamensis.setulosus; - longicaudatus(): macrorhinos.marmosurus>; + minous(): argurus.dauricus; + cinereiventer(): panamensis.setulosus; + longicaudatus(): macrorhinos.marmosurus>; baeodon(): argurus.netscheri, argurus.luctuosa>; soricoides(): argurus.luctuosa; datae(): daubentonii.arboreus>; @@ -2291,7 +2291,7 @@ declare namespace Lanthanum { dominicensis(): dammermani.melanops; taurus(): macrorhinos.konganensis; tonganus(): argurus.netscheri; - silvatica(): rendalli.moojeni; + silvatica(): rendalli.moojeni; midas(): lavali.xanthognathus; bicornis(): dogramacii.kaiseri; } @@ -2310,7 +2310,7 @@ declare namespace Lanthanum { revoili(): lavali.wilsoni; macrobullatus(): macrorhinos.daphaenodon; compactus(): sagitta.stolzmanni; - talpinus(): nitidus; + talpinus(): nitidus; stramineus(): gabriellae.amicus; dartmouthi(): trivirgatus.mixtus; ogilbyi(): argurus.dauricus; @@ -2329,18 +2329,18 @@ declare namespace rendalli { occasius(): argurus.gilbertii; damarensis(): julianae.galapagoensis; Neptunium(): panglima.abidi; - griseoflavus(): ruatanica.americanus; + griseoflavus(): ruatanica.americans; thar(): argurus.oreas; alborufus(): panamensis.linulus; fusicaudus(): sagitta.stolzmanni; - gordonorum(): howi.angulatus; + gordonorum(): howi.angulatus; ruber(): dammermani.siberu; desmarestianus(): julianae.steerii; lutillus(): nigra.dolichurus; salocco(): argurus.peninsulae; } class moojeni { - floweri(): lavali.otion; + floweri(): lavali.option; montosa(): imperfecta.ciliolabrum; miletus(): julianae.sumatrana; heaneyi(): zuluensis; @@ -2353,7 +2353,7 @@ declare namespace rendalli { } class crenulata extends trivirgatus.falconeri { salvanius(): howi.coludo; - maritimus(): ruatanica.americanus; + maritimus(): ruatanica.americans; edax(): lutreolus.cor>, rionegrensis.caniventer>; } } @@ -2384,8 +2384,8 @@ declare namespace trivirgatus { class falconeri { cabrali(): rendalli.moojeni>, daubentonii.arboreus>; gouldi(): nigra.dolichurus>, patas.uralensis>; - fuscicollis(): samarensis.pelurus>; - martiensseni(): sagitta.cinereus>, dogramacii.koepckeae>; + fuscicollis(): samarensis.pelurus>; + martiensseni(): sagitta.cinereus>, dogramacii.koepckeae>; gaoligongensis(): dogramacii.koepckeae; shawi(): minutus.inez>; gmelini(): rionegrensis.caniventer; @@ -2416,7 +2416,7 @@ declare namespace quasiater { } } declare namespace ruatanica { - class americanus extends imperfecta.ciliolabrum { + class americans extends imperfecta.ciliolabrum { nasoloi(): macrorhinos.konganensis; mystacalis(): howi.angulatus; fardoulisi(): trivirgatus.oconnelli; @@ -2441,7 +2441,7 @@ declare namespace lavali { } class beisa { } - class otion extends howi.coludo { + class option extends howi.coludo { bonaerensis(): provocax.melanoleuca; dussumieri(): nigra.gracilis; osvaldoreigi(): julianae.albidens; @@ -2466,7 +2466,7 @@ declare namespace lavali { goudotii(): trivirgatus.falconeri; pohlei(): Lanthanum.megalonyx; ineptus(): panamensis.setulosus; - euryotis(): rendalli.moojeni>; + euryotis(): rendalli.moojeni>; maurisca(): Lanthanum.suillus; coyhaiquensis(): caurinus.mahaganus, panglima.abidi>, lutreolus.punicus>; } @@ -2478,7 +2478,7 @@ declare namespace lavali { roosmalenorum(): dogramacii.koepckeae; rubicola(): rendalli.moojeni, gabriellae.echinatus>>; ikonnikovi(): argurus.luctuosa; - paramicrus(): imperfecta.ciliolabrum>; + paramicrus(): imperfecta.ciliolabrum>; } class lepturus extends Lanthanum.suillus { ferrumequinum(): argurus.netscheri; @@ -2513,15 +2513,15 @@ declare namespace dogramacii { Thulium(): julianae.durangae; patrius(): Lanthanum.jugularis; quadraticauda(): julianae.nudicaudus; - ater(): ruatanica.americanus; + ater(): ruatanica.americans; } class aurata { - grunniens(): nigra.gracilis, julianae.sumatrana>, ruatanica.americanus>; - howensis(): ruatanica.americanus; + grunniens(): nigra.gracilis, julianae.sumatrana>, ruatanica.americans>; + howensis(): ruatanica.americans; karlkoopmani(): caurinus.psilurus; mirapitanga(): julianae.albidens; ophiodon(): aurata; - landeri(): samarensis.pelurus; + landeri(): samarensis.pelurus; sonomae(): trivirgatus.lotor, koepckeae>; erythromos(): caurinus.johorensis, nigra.dolichurus>; } @@ -2530,7 +2530,7 @@ declare namespace lutreolus { class schlegeli extends lavali.beisa { mittendorfi(): rionegrensis.caniventer; blicki(): dogramacii.robustulus; - culionensis(): argurus.dauricus; + culionensis(): argurus.dauricus; scrofa(): petrophilus.sodyi; fernandoni(): quasiater.carolinensis; Tin(): sagitta.leptoceros>; @@ -2540,7 +2540,7 @@ declare namespace lutreolus { frontalis(): macrorhinos.marmosurus>, samarensis.pallidus>; cuniculus(): patas.uralensis; magdalenae(): julianae.gerbillus>; - andamanensis(): julianae.oralis; + andamanensis(): julianae.oralis; dispar(): panamensis.linulus; } } @@ -2622,7 +2622,7 @@ declare namespace minutus { } declare namespace caurinus { class mahaganus extends panglima.fundatus { - martiniquensis(): ruatanica.hector>>; + martiniquensis(): ruatanica.hector>>; devius(): samarensis.pelurus, trivirgatus.falconeri>>; masalai(): argurus.oreas; kathleenae(): nigra.dolichurus; @@ -2655,12 +2655,12 @@ declare namespace nigra { tristriatus(): rionegrensis.veraecrucis>; lasiura(): panglima.abidi>, Lanthanum.nitidus>; gangetica(): argurus.luctuosa; - brucei(): chrysaeolus.sarasinorum; + brucei(): chrysaeolus.sarasinorum; } } declare namespace sagitta { class walkeri extends minutus.portoricensis { - maracajuensis(): samarensis.cahirinus; + maracajuensis(): samarensis.cahirinus; } } declare namespace minutus { @@ -2730,7 +2730,7 @@ declare namespace samarensis { suricatta(): daubentonii.nigricans; jagorii(): julianae.galapagoensis; beecrofti(): sagitta.stolzmanni; - imaizumii(): minutus.inez, gabriellae.echinatus>, dogramacii.aurata>, lavali.otion>, macrorhinos.konganensis>; + imaizumii(): minutus.inez, gabriellae.echinatus>, dogramacii.aurata>, lavali.option>, macrorhinos.konganensis>; colocolo(): quasiater.bobrinskoi; wolfi(): petrophilus.rosalia>; } @@ -2741,7 +2741,7 @@ declare namespace samarensis { viaria(): chrysaeolus.sarasinorum; } class cahirinus { - alashanicus(): nigra.caucasica; + alashanicus(): nigra.caucasica; flaviventer(): trivirgatus.tumidifrons>; bottai(): lutreolus.schlegeli; pinetis(): argurus.oreas; @@ -2754,7 +2754,7 @@ declare namespace sagitta { hoplomyoides(): panglima.fundatus, nigra.gracilis>; gratiosus(): lavali.lepturus; rex(): lavali.wilsoni; - bolami(): trivirgatus.tumidifrons; + bolami(): trivirgatus.tumidifrons; } } declare namespace daubentonii { @@ -2809,7 +2809,7 @@ declare namespace argurus { } declare namespace daubentonii { class arboreus { - capreolus(): rendalli.crenulata, lavali.wilsoni>; + capreolus(): rendalli.crenulata, lavali.wilsoni>; moreni(): panglima.abidi; hypoleucos(): nigra.gracilis; paedulcus(): minutus.portoricensis; @@ -2832,7 +2832,7 @@ declare namespace patas { muricauda(): panglima.fundatus>; albicaudus(): sagitta.stolzmanni; fallax(): ruatanica.hector; - attenuata(): macrorhinos.marmosurus>; + attenuata(): macrorhinos.marmosurus>; megalura(): howi.marcanoi; neblina(): samarensis.pelurus; citellus(): daubentonii.arboreus; @@ -2843,7 +2843,7 @@ declare namespace patas { declare namespace provocax { class melanoleuca extends lavali.wilsoni { Neodymium(): macrorhinos.marmosurus, lutreolus.foina>; - baeri(): imperfecta.lasiurus; + baeri(): imperfecta.lasiurus; } } declare namespace sagitta { @@ -2883,7 +2883,7 @@ declare namespace argurus { dubosti(): nigra.thalia; opossum(): nigra.dolichurus; oreopolus(): minutus.portoricensis; - amurensis(): daubentonii.arboreus; + amurensis(): daubentonii.arboreus; } } declare namespace petrophilus { @@ -2893,7 +2893,7 @@ declare namespace petrophilus { declare namespace lutreolus { class punicus { strandi(): gabriellae.klossii; - lar(): caurinus.mahaganus; + lar(): caurinus.mahaganus; erica(): dogramacii.koepckeae; trichura(): macrorhinos.konganensis; lemniscatus(): panglima.fundatus; @@ -2911,7 +2911,7 @@ declare namespace macrorhinos { class daphaenodon { bredanensis(): julianae.sumatrana; othus(): howi.coludo; - hammondi(): julianae.gerbillus, gabriellae.echinatus>, dogramacii.aurata>, lavali.otion>; + hammondi(): julianae.gerbillus, gabriellae.echinatus>, dogramacii.aurata>, lavali.option>; aureocollaris(): quasiater.carolinensis; flavipes(): petrophilus.minutilla; callosus(): trivirgatus.lotor; @@ -2962,7 +2962,7 @@ declare namespace imperfecta { fulvus(): argurus.germaini; paranaensis(): dogramacii.koepckeae; didactylus(): panglima.abidi>; - schreibersii(): nigra.gracilis; + schreibersii(): nigra.gracilis; orii(): dogramacii.kaiseri; } class subspinosus { @@ -3132,7 +3132,7 @@ declare namespace argurus { } declare namespace ruatanica { class Praseodymium extends ruatanica.hector { - clara(): panglima.amphibius, argurus.dauricus>; + clara(): panglima.amphibius, argurus.dauricus>; spectabilis(): petrophilus.sodyi; kamensis(): trivirgatus.lotor, lavali.lepturus>; ruddi(): lutreolus.foina; diff --git a/tests/baselines/reference/resolvingClassDeclarationWhenInBaseTypeResolution.symbols b/tests/baselines/reference/resolvingClassDeclarationWhenInBaseTypeResolution.symbols index d13a23467a82c..1863d995fcb66 100644 --- a/tests/baselines/reference/resolvingClassDeclarationWhenInBaseTypeResolution.symbols +++ b/tests/baselines/reference/resolvingClassDeclarationWhenInBaseTypeResolution.symbols @@ -34,13 +34,13 @@ namespace rionegrensis { >this : Symbol(caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 24)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 3, 42)) - raffrayana() : lavali.otion { var x : lavali.otion; () => { var y = this; }; return x; } + raffrayana() : lavali.option { var x : lavali.option; () => { var y = this; }; return x; } >raffrayana : Symbol(caniventer.raffrayana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 3, 105)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) ->otion : Symbol(lavali.otion, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 270, 3)) +>option : Symbol(lavali.option, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 270, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 4, 37)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) ->otion : Symbol(lavali.otion, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 270, 3)) +>option : Symbol(lavali.option, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 270, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 4, 67)) >this : Symbol(caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 24)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 4, 37)) @@ -301,13 +301,13 @@ namespace julianae { >this : Symbol(galapagoensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 25, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 27, 84)) - rueppellii() : ruatanica.americanus { var x : ruatanica.americanus; () => { var y = this; }; return x; } + rueppellii() : ruatanica.americans { var x : ruatanica.americans; () => { var y = this; }; return x; } >rueppellii : Symbol(galapagoensis.rueppellii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 27, 187)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) +>americans : Symbol(ruatanica.americans, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 28, 45)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) +>americans : Symbol(ruatanica.americans, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 28, 83)) >this : Symbol(galapagoensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 25, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 28, 45)) @@ -474,13 +474,13 @@ namespace julianae { >this : Symbol(albidens, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 34, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 41, 40)) - porcellus() : ruatanica.americanus { var x : ruatanica.americanus; () => { var y = this; }; return x; } + porcellus() : ruatanica.americans { var x : ruatanica.americans; () => { var y = this; }; return x; } >porcellus : Symbol(albidens.porcellus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 41, 96)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) +>americans : Symbol(ruatanica.americans, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 42, 44)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) +>americans : Symbol(ruatanica.americans, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 42, 82)) >this : Symbol(albidens, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 34, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 42, 44)) @@ -671,13 +671,13 @@ namespace julianae { >this : Symbol(oralis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 43, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 54, 123)) - leucippe() : lavali.otion { var x : lavali.otion; () => { var y = this; }; return x; } + leucippe() : lavali.option { var x : lavali.option; () => { var y = this; }; return x; } >leucippe : Symbol(oralis.leucippe, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 54, 263)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) ->otion : Symbol(lavali.otion, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 270, 3)) +>option : Symbol(lavali.option, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 270, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 55, 35)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) ->otion : Symbol(lavali.otion, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 270, 3)) +>option : Symbol(lavali.option, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 270, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 55, 65)) >this : Symbol(oralis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 43, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 55, 35)) @@ -1009,45 +1009,45 @@ namespace julianae { >this : Symbol(acariensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 80, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 82, 38)) - minous() : argurus.dauricus { var x : argurus.dauricus; () => { var y = this; }; return x; } + minous() : argurus.dauricus { var x : argurus.dauricus; () => { var y = this; }; return x; } >minous : Symbol(acariensis.minous, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 82, 96)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) >dauricus : Symbol(argurus.dauricus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 374, 19)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) >carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) ->otion : Symbol(lavali.otion, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 270, 3)) +>option : Symbol(lavali.option, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 270, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 83, 75)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) >dauricus : Symbol(argurus.dauricus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 374, 19)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) >carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) ->otion : Symbol(lavali.otion, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 270, 3)) +>option : Symbol(lavali.option, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 270, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 83, 147)) >this : Symbol(acariensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 80, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 83, 75)) - cinereiventer() : panamensis.setulosus { var x : panamensis.setulosus; () => { var y = this; }; return x; } + cinereiventer() : panamensis.setulosus { var x : panamensis.setulosus; () => { var y = this; }; return x; } >cinereiventer : Symbol(acariensis.cinereiventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 83, 172)) >panamensis : Symbol(panamensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 501, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 986, 1)) >setulosus : Symbol(panamensis.setulosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 987, 22)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) >walkeri : Symbol(sagitta.walkeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 488, 19)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) ->otion : Symbol(lavali.otion, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 270, 3)) +>option : Symbol(lavali.option, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 270, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 84, 79)) >panamensis : Symbol(panamensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 501, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 986, 1)) >setulosus : Symbol(panamensis.setulosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 987, 22)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) >walkeri : Symbol(sagitta.walkeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 488, 19)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) ->otion : Symbol(lavali.otion, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 270, 3)) +>option : Symbol(lavali.option, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 270, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 84, 148)) >this : Symbol(acariensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 80, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 84, 79)) - longicaudatus() : macrorhinos.marmosurus> { var x : macrorhinos.marmosurus>; () => { var y = this; }; return x; } + longicaudatus() : macrorhinos.marmosurus> { var x : macrorhinos.marmosurus>; () => { var y = this; }; return x; } >longicaudatus : Symbol(acariensis.longicaudatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 84, 173)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) >marmosurus : Symbol(macrorhinos.marmosurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 462, 23)) @@ -1057,7 +1057,7 @@ namespace julianae { >mahaganus : Symbol(caurinus.mahaganus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 450, 20)) >nudicaudus : Symbol(nudicaudus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 18, 3)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) ->otion : Symbol(lavali.otion, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 270, 3)) +>option : Symbol(lavali.option, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 270, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 85, 117)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) >marmosurus : Symbol(macrorhinos.marmosurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 462, 23)) @@ -1067,7 +1067,7 @@ namespace julianae { >mahaganus : Symbol(caurinus.mahaganus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 450, 20)) >nudicaudus : Symbol(nudicaudus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 18, 3)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) ->otion : Symbol(lavali.otion, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 270, 3)) +>option : Symbol(lavali.option, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 270, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 85, 224)) >this : Symbol(acariensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 80, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 85, 117)) @@ -1473,21 +1473,21 @@ namespace Lanthanum { >this : Symbol(nitidus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 112, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 120, 78)) - silvatica() : rendalli.moojeni { var x : rendalli.moojeni; () => { var y = this; }; return x; } + silvatica() : rendalli.moojeni { var x : rendalli.moojeni; () => { var y = this; }; return x; } >silvatica : Symbol(nitidus.silvatica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 120, 176)) >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1)) >moojeni : Symbol(rendalli.moojeni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 168, 3)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) >aurata : Symbol(dogramacii.aurata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 344, 3)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) ->otion : Symbol(lavali.otion, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 270, 3)) +>option : Symbol(lavali.option, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 270, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 121, 73)) >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1)) >moojeni : Symbol(rendalli.moojeni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 168, 3)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) >aurata : Symbol(dogramacii.aurata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 344, 3)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) ->otion : Symbol(lavali.otion, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 270, 3)) +>option : Symbol(lavali.option, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 270, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 121, 140)) >this : Symbol(nitidus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 112, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 121, 73)) @@ -1703,17 +1703,17 @@ namespace Lanthanum { >this : Symbol(jugularis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 134, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 139, 42)) - talpinus() : nitidus { var x : nitidus; () => { var y = this; }; return x; } + talpinus() : nitidus { var x : nitidus; () => { var y = this; }; return x; } >talpinus : Symbol(jugularis.talpinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 139, 103)) >nitidus : Symbol(nitidus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 112, 3)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) +>americans : Symbol(ruatanica.americans, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) >stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 140, 72)) >nitidus : Symbol(nitidus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 112, 3)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) +>americans : Symbol(ruatanica.americans, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) >stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 19)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 140, 139)) @@ -1972,13 +1972,13 @@ namespace rendalli { >this : Symbol(zuluensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 152, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 158, 78)) - griseoflavus() : ruatanica.americanus { var x : ruatanica.americanus; () => { var y = this; }; return x; } + griseoflavus() : ruatanica.americans { var x : ruatanica.americans; () => { var y = this; }; return x; } >griseoflavus : Symbol(zuluensis.griseoflavus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 158, 175)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) +>americans : Symbol(ruatanica.americans, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 159, 47)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) +>americans : Symbol(ruatanica.americans, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 159, 85)) >this : Symbol(zuluensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 152, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 159, 47)) @@ -2024,19 +2024,19 @@ namespace rendalli { >this : Symbol(zuluensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 152, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 162, 43)) - gordonorum() : howi.angulatus { var x : howi.angulatus; () => { var y = this; }; return x; } + gordonorum() : howi.angulatus { var x : howi.angulatus; () => { var y = this; }; return x; } >gordonorum : Symbol(zuluensis.gordonorum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 162, 104)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) >angulatus : Symbol(howi.angulatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 467, 16)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) +>americans : Symbol(ruatanica.americans, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) >germaini : Symbol(argurus.germaini, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 893, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 163, 79)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) >angulatus : Symbol(howi.angulatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 467, 16)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) +>americans : Symbol(ruatanica.americans, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) >germaini : Symbol(argurus.germaini, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 893, 19)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 163, 151)) @@ -2108,13 +2108,13 @@ namespace rendalli { >T0 : Symbol(T0, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 169, 23)) >T1 : Symbol(T1, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 169, 26)) - floweri() : lavali.otion { var x : lavali.otion; () => { var y = this; }; return x; } + floweri() : lavali.option { var x : lavali.option; () => { var y = this; }; return x; } >floweri : Symbol(moojeni.floweri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 169, 32)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) ->otion : Symbol(lavali.otion, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 270, 3)) +>option : Symbol(lavali.option, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 270, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 170, 34)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) ->otion : Symbol(lavali.otion, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 270, 3)) +>option : Symbol(lavali.option, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 270, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 170, 64)) >this : Symbol(moojeni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 168, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 170, 34)) @@ -2315,13 +2315,13 @@ namespace rendalli { >this : Symbol(crenulata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 180, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 182, 75)) - maritimus() : ruatanica.americanus { var x : ruatanica.americanus; () => { var y = this; }; return x; } + maritimus() : ruatanica.americans { var x : ruatanica.americans; () => { var y = this; }; return x; } >maritimus : Symbol(crenulata.maritimus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 182, 169)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) +>americans : Symbol(ruatanica.americans, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 183, 44)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) +>americans : Symbol(ruatanica.americans, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 183, 82)) >this : Symbol(crenulata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 180, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 183, 44)) @@ -2751,7 +2751,7 @@ namespace trivirgatus { >this : Symbol(falconeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 210, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 213, 139)) - fuscicollis() : samarensis.pelurus> { var x : samarensis.pelurus>; () => { var y = this; }; return x; } + fuscicollis() : samarensis.pelurus> { var x : samarensis.pelurus>; () => { var y = this; }; return x; } >fuscicollis : Symbol(falconeri.fuscicollis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 213, 300)) >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1)) >pelurus : Symbol(samarensis.pelurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 532, 22)) @@ -2760,7 +2760,7 @@ namespace trivirgatus { >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >nitidus : Symbol(Lanthanum.nitidus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 112, 3)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) +>americans : Symbol(ruatanica.americans, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) >stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 214, 126)) @@ -2771,21 +2771,21 @@ namespace trivirgatus { >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >nitidus : Symbol(Lanthanum.nitidus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 112, 3)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) +>americans : Symbol(ruatanica.americans, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) >stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 19)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 214, 244)) >this : Symbol(falconeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 210, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 214, 126)) - martiensseni() : sagitta.cinereus>, dogramacii.koepckeae> { var x : sagitta.cinereus>, dogramacii.koepckeae>; () => { var y = this; }; return x; } + martiensseni() : sagitta.cinereus>, dogramacii.koepckeae> { var x : sagitta.cinereus>, dogramacii.koepckeae>; () => { var y = this; }; return x; } >martiensseni : Symbol(falconeri.martiensseni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 214, 269)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) >cinereus : Symbol(sagitta.cinereus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 747, 19)) >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1)) >ciliolabrum : Symbol(imperfecta.ciliolabrum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 807, 5)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) ->otion : Symbol(lavali.otion, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 270, 3)) +>option : Symbol(lavali.option, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 270, 3)) >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1)) >sodyi : Symbol(petrophilus.sodyi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 824, 23)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) @@ -2800,7 +2800,7 @@ namespace trivirgatus { >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1)) >ciliolabrum : Symbol(imperfecta.ciliolabrum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 807, 5)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) ->otion : Symbol(lavali.otion, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 270, 3)) +>option : Symbol(lavali.option, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 270, 3)) >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1)) >sodyi : Symbol(petrophilus.sodyi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 824, 23)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) @@ -3178,8 +3178,8 @@ namespace quasiater { namespace ruatanica { >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) - export class americanus extends imperfecta.ciliolabrum { ->americanus : Symbol(americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) + export class americans extends imperfecta.ciliolabrum { +>americans : Symbol(americans, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) >imperfecta.ciliolabrum : Symbol(imperfecta.ciliolabrum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 807, 5)) >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1)) >ciliolabrum : Symbol(imperfecta.ciliolabrum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 807, 5)) @@ -3189,18 +3189,18 @@ namespace ruatanica { >foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 21)) nasoloi() : macrorhinos.konganensis { var x : macrorhinos.konganensis; () => { var y = this; }; return x; } ->nasoloi : Symbol(americanus.nasoloi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 246, 93)) +>nasoloi : Symbol(americans.nasoloi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 246, 93)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) >konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 23)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 247, 45)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) >konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 23)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 247, 86)) ->this : Symbol(americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) +>this : Symbol(americans, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 247, 45)) mystacalis() : howi.angulatus { var x : howi.angulatus; () => { var y = this; }; return x; } ->mystacalis : Symbol(americanus.mystacalis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 247, 111)) +>mystacalis : Symbol(americans.mystacalis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 247, 111)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) >angulatus : Symbol(howi.angulatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 467, 16)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) @@ -3215,29 +3215,29 @@ namespace ruatanica { >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) >stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 19)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 248, 159)) ->this : Symbol(americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) +>this : Symbol(americans, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 248, 83)) fardoulisi() : trivirgatus.oconnelli { var x : trivirgatus.oconnelli; () => { var y = this; }; return x; } ->fardoulisi : Symbol(americanus.fardoulisi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 248, 184)) +>fardoulisi : Symbol(americans.fardoulisi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 248, 184)) >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) >oconnelli : Symbol(trivirgatus.oconnelli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 219, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 249, 46)) >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) >oconnelli : Symbol(trivirgatus.oconnelli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 219, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 249, 85)) ->this : Symbol(americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) +>this : Symbol(americans, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 249, 46)) tumidus() : gabriellae.amicus { var x : gabriellae.amicus; () => { var y = this; }; return x; } ->tumidus : Symbol(americanus.tumidus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 249, 110)) +>tumidus : Symbol(americans.tumidus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 249, 110)) >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1)) >amicus : Symbol(gabriellae.amicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 769, 5)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 250, 39)) >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1)) >amicus : Symbol(gabriellae.amicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 769, 5)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 250, 74)) ->this : Symbol(americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) +>this : Symbol(americans, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 250, 39)) } } @@ -3452,8 +3452,8 @@ namespace lavali { export class beisa { >beisa : Symbol(beisa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 268, 3)) } - export class otion extends howi.coludo { ->otion : Symbol(otion, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 270, 3)) + export class option extends howi.coludo { +>option : Symbol(option, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 270, 3)) >howi.coludo : Symbol(howi.coludo, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 887, 16)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) >coludo : Symbol(howi.coludo, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 887, 16)) @@ -3463,18 +3463,18 @@ namespace lavali { >marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 16)) bonaerensis() : provocax.melanoleuca { var x : provocax.melanoleuca; () => { var y = this; }; return x; } ->bonaerensis : Symbol(otion.bonaerensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 271, 72)) +>bonaerensis : Symbol(option.bonaerensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 271, 72)) >provocax : Symbol(provocax, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 669, 1)) >melanoleuca : Symbol(provocax.melanoleuca, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 670, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 272, 46)) >provocax : Symbol(provocax, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 669, 1)) >melanoleuca : Symbol(provocax.melanoleuca, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 670, 20)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 272, 84)) ->this : Symbol(otion, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 270, 3)) +>this : Symbol(option, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 270, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 272, 46)) dussumieri() : nigra.gracilis { var x : nigra.gracilis; () => { var y = this; }; return x; } ->dussumieri : Symbol(otion.dussumieri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 272, 109)) +>dussumieri : Symbol(option.dussumieri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 272, 109)) >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1)) >gracilis : Symbol(nigra.gracilis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 515, 17)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) @@ -3489,11 +3489,11 @@ namespace lavali { >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) >kaiseri : Symbol(dogramacii.kaiseri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 329, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 273, 147)) ->this : Symbol(otion, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 270, 3)) +>this : Symbol(option, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 270, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 273, 77)) osvaldoreigi() : julianae.albidens { var x : julianae.albidens; () => { var y = this; }; return x; } ->osvaldoreigi : Symbol(otion.osvaldoreigi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 273, 172)) +>osvaldoreigi : Symbol(option.osvaldoreigi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 273, 172)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >albidens : Symbol(julianae.albidens, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 34, 3)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) @@ -3508,42 +3508,42 @@ namespace lavali { >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) >carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 274, 163)) ->this : Symbol(otion, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 270, 3)) +>this : Symbol(option, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 270, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 274, 86)) grevyi() : samarensis.pallidus { var x : samarensis.pallidus; () => { var y = this; }; return x; } ->grevyi : Symbol(otion.grevyi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 274, 188)) +>grevyi : Symbol(option.grevyi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 274, 188)) >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1)) >pallidus : Symbol(samarensis.pallidus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 563, 5)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 275, 40)) >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1)) >pallidus : Symbol(samarensis.pallidus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 563, 5)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 275, 77)) ->this : Symbol(otion, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 270, 3)) +>this : Symbol(option, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 270, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 275, 40)) hirtula() : lepturus { var x : lepturus; () => { var y = this; }; return x; } ->hirtula : Symbol(otion.hirtula, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 275, 102)) +>hirtula : Symbol(option.hirtula, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 275, 102)) >lepturus : Symbol(lepturus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 309, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 276, 30)) >lepturus : Symbol(lepturus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 309, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 276, 56)) ->this : Symbol(otion, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 270, 3)) +>this : Symbol(option, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 270, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 276, 30)) cristatus() : argurus.luctuosa { var x : argurus.luctuosa; () => { var y = this; }; return x; } ->cristatus : Symbol(otion.cristatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 276, 81)) +>cristatus : Symbol(option.cristatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 276, 81)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) >luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 277, 40)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) >luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 19)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 277, 74)) ->this : Symbol(otion, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 270, 3)) +>this : Symbol(option, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 270, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 277, 40)) darlingtoni() : sagitta.leptoceros { var x : sagitta.leptoceros; () => { var y = this; }; return x; } ->darlingtoni : Symbol(otion.darlingtoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 277, 99)) +>darlingtoni : Symbol(option.darlingtoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 277, 99)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) >leptoceros : Symbol(sagitta.leptoceros, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 578, 19)) >wilsoni : Symbol(wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 18)) @@ -3556,11 +3556,11 @@ namespace lavali { >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) >oconnelli : Symbol(trivirgatus.oconnelli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 219, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 278, 144)) ->this : Symbol(otion, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 270, 3)) +>this : Symbol(option, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 270, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 278, 76)) fontanierii() : panamensis.setulosus>, lutreolus.foina> { var x : panamensis.setulosus>, lutreolus.foina>; () => { var y = this; }; return x; } ->fontanierii : Symbol(otion.fontanierii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 278, 169)) +>fontanierii : Symbol(option.fontanierii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 278, 169)) >panamensis : Symbol(panamensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 501, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 986, 1)) >setulosus : Symbol(panamensis.setulosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 987, 22)) >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1)) @@ -3589,22 +3589,22 @@ namespace lavali { >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) >foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 21)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 279, 314)) ->this : Symbol(otion, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 270, 3)) +>this : Symbol(option, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 270, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 279, 161)) umbrosus() : howi.marcanoi { var x : howi.marcanoi; () => { var y = this; }; return x; } ->umbrosus : Symbol(otion.umbrosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 279, 339)) +>umbrosus : Symbol(option.umbrosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 279, 339)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) >marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 16)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 280, 36)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) >marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 16)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 280, 67)) ->this : Symbol(otion, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 270, 3)) +>this : Symbol(option, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 270, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 280, 36)) chiriquinus() : imperfecta.lasiurus { var x : imperfecta.lasiurus; () => { var y = this; }; return x; } ->chiriquinus : Symbol(otion.chiriquinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 280, 92)) +>chiriquinus : Symbol(option.chiriquinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 280, 92)) >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1)) >lasiurus : Symbol(imperfecta.lasiurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 786, 22)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) @@ -3619,22 +3619,22 @@ namespace lavali { >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) >psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 20)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 281, 158)) ->this : Symbol(otion, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 270, 3)) +>this : Symbol(option, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 270, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 281, 83)) orarius() : lutreolus.schlegeli { var x : lutreolus.schlegeli; () => { var y = this; }; return x; } ->orarius : Symbol(otion.orarius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 281, 183)) +>orarius : Symbol(option.orarius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 281, 183)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) >schlegeli : Symbol(lutreolus.schlegeli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 356, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 282, 41)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) >schlegeli : Symbol(lutreolus.schlegeli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 356, 21)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 282, 78)) ->this : Symbol(otion, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 270, 3)) +>this : Symbol(option, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 270, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 282, 41)) ilaeus() : caurinus.mahaganus { var x : caurinus.mahaganus; () => { var y = this; }; return x; } ->ilaeus : Symbol(otion.ilaeus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 282, 103)) +>ilaeus : Symbol(option.ilaeus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 282, 103)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) >mahaganus : Symbol(caurinus.mahaganus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 450, 20)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) @@ -3649,18 +3649,18 @@ namespace lavali { >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >sumatrana : Symbol(julianae.sumatrana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 58, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 283, 157)) ->this : Symbol(otion, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 270, 3)) +>this : Symbol(option, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 270, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 283, 80)) musschenbroekii() : trivirgatus.falconeri { var x : trivirgatus.falconeri; () => { var y = this; }; return x; } ->musschenbroekii : Symbol(otion.musschenbroekii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 283, 182)) +>musschenbroekii : Symbol(option.musschenbroekii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 283, 182)) >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) >falconeri : Symbol(trivirgatus.falconeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 210, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 284, 51)) >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) >falconeri : Symbol(trivirgatus.falconeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 210, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 284, 90)) ->this : Symbol(otion, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 270, 3)) +>this : Symbol(option, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 270, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 284, 51)) } export class xanthognathus { @@ -3813,7 +3813,7 @@ namespace lavali { >this : Symbol(xanthognathus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 285, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 295, 64)) - euryotis() : rendalli.moojeni> { var x : rendalli.moojeni>; () => { var y = this; }; return x; } + euryotis() : rendalli.moojeni> { var x : rendalli.moojeni>; () => { var y = this; }; return x; } >euryotis : Symbol(xanthognathus.euryotis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 295, 149)) >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1)) >moojeni : Symbol(rendalli.moojeni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 168, 3)) @@ -3824,7 +3824,7 @@ namespace lavali { >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >jugularis : Symbol(Lanthanum.jugularis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 134, 3)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) +>americans : Symbol(ruatanica.americans, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 296, 120)) >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1)) >moojeni : Symbol(rendalli.moojeni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 168, 3)) @@ -3835,7 +3835,7 @@ namespace lavali { >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >jugularis : Symbol(Lanthanum.jugularis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 134, 3)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) +>americans : Symbol(ruatanica.americans, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 296, 235)) >this : Symbol(xanthognathus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 285, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 296, 120)) @@ -4033,11 +4033,11 @@ namespace lavali { >this : Symbol(thaeleri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 299, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 307, 41)) - paramicrus() : imperfecta.ciliolabrum> { var x : imperfecta.ciliolabrum>; () => { var y = this; }; return x; } + paramicrus() : imperfecta.ciliolabrum> { var x : imperfecta.ciliolabrum>; () => { var y = this; }; return x; } >paramicrus : Symbol(thaeleri.paramicrus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 307, 100)) >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1)) >ciliolabrum : Symbol(imperfecta.ciliolabrum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 807, 5)) ->otion : Symbol(otion, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 270, 3)) +>option : Symbol(option, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 270, 3)) >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1)) >sodyi : Symbol(petrophilus.sodyi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 824, 23)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) @@ -4047,7 +4047,7 @@ namespace lavali { >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 308, 117)) >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1)) >ciliolabrum : Symbol(imperfecta.ciliolabrum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 807, 5)) ->otion : Symbol(otion, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 270, 3)) +>option : Symbol(option, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 270, 3)) >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1)) >sodyi : Symbol(petrophilus.sodyi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 824, 23)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) @@ -4496,13 +4496,13 @@ namespace dogramacii { >this : Symbol(kaiseri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 329, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 342, 47)) - ater() : ruatanica.americanus { var x : ruatanica.americanus; () => { var y = this; }; return x; } + ater() : ruatanica.americans { var x : ruatanica.americans; () => { var y = this; }; return x; } >ater : Symbol(kaiseri.ater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 342, 109)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) +>americans : Symbol(ruatanica.americans, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 343, 39)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) +>americans : Symbol(ruatanica.americans, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 343, 77)) >this : Symbol(kaiseri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 329, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 343, 39)) @@ -4510,7 +4510,7 @@ namespace dogramacii { export class aurata { >aurata : Symbol(aurata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 344, 3)) - grunniens() : nigra.gracilis, julianae.sumatrana>, ruatanica.americanus> { var x : nigra.gracilis, julianae.sumatrana>, ruatanica.americanus>; () => { var y = this; }; return x; } + grunniens() : nigra.gracilis, julianae.sumatrana>, ruatanica.americans> { var x : nigra.gracilis, julianae.sumatrana>, ruatanica.americans>; () => { var y = this; }; return x; } >grunniens : Symbol(aurata.grunniens, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 345, 23)) >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1)) >gracilis : Symbol(nigra.gracilis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 515, 17)) @@ -4524,7 +4524,7 @@ namespace dogramacii { >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >sumatrana : Symbol(julianae.sumatrana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 58, 3)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) +>americans : Symbol(ruatanica.americans, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 346, 150)) >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1)) >gracilis : Symbol(nigra.gracilis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 515, 17)) @@ -4538,18 +4538,18 @@ namespace dogramacii { >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >sumatrana : Symbol(julianae.sumatrana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 58, 3)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) +>americans : Symbol(ruatanica.americans, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 346, 294)) >this : Symbol(aurata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 344, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 346, 150)) - howensis() : ruatanica.americanus { var x : ruatanica.americanus; () => { var y = this; }; return x; } + howensis() : ruatanica.americans { var x : ruatanica.americans; () => { var y = this; }; return x; } >howensis : Symbol(aurata.howensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 346, 319)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) +>americans : Symbol(ruatanica.americans, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 347, 43)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) +>americans : Symbol(ruatanica.americans, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 347, 81)) >this : Symbol(aurata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 344, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 347, 43)) @@ -4593,21 +4593,21 @@ namespace dogramacii { >this : Symbol(aurata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 344, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 350, 29)) - landeri() : samarensis.pelurus { var x : samarensis.pelurus; () => { var y = this; }; return x; } + landeri() : samarensis.pelurus { var x : samarensis.pelurus; () => { var y = this; }; return x; } >landeri : Symbol(aurata.landeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 350, 78)) >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1)) >pelurus : Symbol(samarensis.pelurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 532, 22)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >jugularis : Symbol(Lanthanum.jugularis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 134, 3)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) +>americans : Symbol(ruatanica.americans, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 351, 83)) >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1)) >pelurus : Symbol(samarensis.pelurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 532, 22)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >jugularis : Symbol(Lanthanum.jugularis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 134, 3)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) +>americans : Symbol(ruatanica.americans, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 351, 162)) >this : Symbol(aurata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 344, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 351, 83)) @@ -4704,19 +4704,19 @@ namespace lutreolus { >this : Symbol(schlegeli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 356, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 359, 42)) - culionensis() : argurus.dauricus { var x : argurus.dauricus; () => { var y = this; }; return x; } + culionensis() : argurus.dauricus { var x : argurus.dauricus; () => { var y = this; }; return x; } >culionensis : Symbol(schlegeli.culionensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 359, 106)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) >dauricus : Symbol(argurus.dauricus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 374, 19)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) +>americans : Symbol(ruatanica.americans, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0)) >caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 24)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 360, 89)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) >dauricus : Symbol(argurus.dauricus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 374, 19)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) +>americans : Symbol(ruatanica.americans, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0)) >caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 24)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 360, 170)) @@ -4918,19 +4918,19 @@ namespace lutreolus { >this : Symbol(schlegeli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 356, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 369, 131)) - andamanensis() : julianae.oralis { var x : julianae.oralis; () => { var y = this; }; return x; } + andamanensis() : julianae.oralis { var x : julianae.oralis; () => { var y = this; }; return x; } >andamanensis : Symbol(schlegeli.andamanensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 369, 280)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >oralis : Symbol(julianae.oralis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 43, 3)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) +>americans : Symbol(ruatanica.americans, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1)) >zuluensis : Symbol(rendalli.zuluensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 152, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 370, 84)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >oralis : Symbol(julianae.oralis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 43, 3)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) +>americans : Symbol(ruatanica.americans, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1)) >zuluensis : Symbol(rendalli.zuluensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 152, 20)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 370, 159)) @@ -6057,7 +6057,7 @@ namespace caurinus { >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) >daphaenodon : Symbol(macrorhinos.daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 23)) - martiniquensis(): ruatanica.hector>> { var x: ruatanica.hector>>; () => { var y = this; }; return x; } + martiniquensis(): ruatanica.hector>> { var x: ruatanica.hector>>; () => { var y = this; }; return x; } >martiniquensis : Symbol(mahaganus.martiniquensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 451, 111)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) >hector : Symbol(ruatanica.hector, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 101, 21)) @@ -6072,7 +6072,7 @@ namespace caurinus { >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >nudicaudus : Symbol(julianae.nudicaudus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 18, 3)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) ->otion : Symbol(lavali.otion, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 270, 3)) +>option : Symbol(lavali.option, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 270, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 452, 168)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) >hector : Symbol(ruatanica.hector, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 101, 21)) @@ -6087,7 +6087,7 @@ namespace caurinus { >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >nudicaudus : Symbol(julianae.nudicaudus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 18, 3)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) ->otion : Symbol(lavali.otion, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 270, 3)) +>option : Symbol(lavali.option, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 270, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 452, 321)) >this : Symbol(mahaganus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 450, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 452, 168)) @@ -6443,21 +6443,21 @@ namespace nigra { >this : Symbol(thalia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 476, 17)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 484, 43)) - brucei(): chrysaeolus.sarasinorum { var x: chrysaeolus.sarasinorum; () => { var y = this; }; return x; } + brucei(): chrysaeolus.sarasinorum { var x: chrysaeolus.sarasinorum; () => { var y = this; }; return x; } >brucei : Symbol(thalia.brucei, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 484, 101)) >chrysaeolus : Symbol(chrysaeolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 602, 1)) >sarasinorum : Symbol(chrysaeolus.sarasinorum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 603, 23)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 20)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) +>americans : Symbol(ruatanica.americans, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 485, 87)) >chrysaeolus : Symbol(chrysaeolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 602, 1)) >sarasinorum : Symbol(chrysaeolus.sarasinorum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 603, 23)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 20)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) +>americans : Symbol(ruatanica.americans, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 485, 167)) >this : Symbol(thalia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 476, 17)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 485, 87)) @@ -6472,21 +6472,21 @@ namespace sagitta { >minutus : Symbol(minutus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 433, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 492, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 848, 1)) >portoricensis : Symbol(minutus.portoricensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 849, 19)) - maracajuensis(): samarensis.cahirinus { var x: samarensis.cahirinus; () => { var y = this; }; return x; } + maracajuensis(): samarensis.cahirinus { var x: samarensis.cahirinus; () => { var y = this; }; return x; } >maracajuensis : Symbol(walkeri.maracajuensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 489, 56)) >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1)) >cahirinus : Symbol(samarensis.cahirinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 569, 5)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >jugularis : Symbol(Lanthanum.jugularis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 134, 3)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) +>americans : Symbol(ruatanica.americans, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 490, 94)) >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1)) >cahirinus : Symbol(samarensis.cahirinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 569, 5)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >jugularis : Symbol(Lanthanum.jugularis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 134, 3)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) +>americans : Symbol(ruatanica.americans, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 490, 174)) >this : Symbol(walkeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 488, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 490, 94)) @@ -7379,7 +7379,7 @@ namespace samarensis { >this : Symbol(fuscus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 547, 5)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 559, 45)) - imaizumii(): minutus.inez, gabriellae.echinatus>, dogramacii.aurata>, lavali.otion>, macrorhinos.konganensis> { var x: minutus.inez, gabriellae.echinatus>, dogramacii.aurata>, lavali.otion>, macrorhinos.konganensis>; () => { var y = this; }; return x; } + imaizumii(): minutus.inez, gabriellae.echinatus>, dogramacii.aurata>, lavali.option>, macrorhinos.konganensis> { var x: minutus.inez, gabriellae.echinatus>, dogramacii.aurata>, lavali.option>, macrorhinos.konganensis>; () => { var y = this; }; return x; } >imaizumii : Symbol(fuscus.imaizumii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 559, 105)) >minutus : Symbol(minutus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 433, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 492, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 848, 1)) >inez : Symbol(minutus.inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 19)) @@ -7400,7 +7400,7 @@ namespace samarensis { >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) >aurata : Symbol(dogramacii.aurata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 344, 3)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) ->otion : Symbol(lavali.otion, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 270, 3)) +>option : Symbol(lavali.option, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 270, 3)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) >konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 23)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 560, 233)) @@ -7423,7 +7423,7 @@ namespace samarensis { >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) >aurata : Symbol(dogramacii.aurata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 344, 3)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) ->otion : Symbol(lavali.otion, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 270, 3)) +>option : Symbol(lavali.option, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 270, 3)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) >konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 23)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 560, 456)) @@ -7560,19 +7560,19 @@ namespace samarensis { >T0 : Symbol(T0, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 570, 27)) >T1 : Symbol(T1, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 570, 30)) - alashanicus(): nigra.caucasica { var x: nigra.caucasica; () => { var y = this; }; return x; } + alashanicus(): nigra.caucasica { var x: nigra.caucasica; () => { var y = this; }; return x; } >alashanicus : Symbol(cahirinus.alashanicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 570, 36)) >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1)) >caucasica : Symbol(nigra.caucasica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 763, 17)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) +>americans : Symbol(ruatanica.americans, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) >peninsulae : Symbol(argurus.peninsulae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 931, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 571, 86)) >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1)) >caucasica : Symbol(nigra.caucasica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 763, 17)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) +>americans : Symbol(ruatanica.americans, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) >peninsulae : Symbol(argurus.peninsulae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 931, 19)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 571, 160)) @@ -7767,21 +7767,21 @@ namespace sagitta { >this : Symbol(leptoceros, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 578, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 583, 35)) - bolami(): trivirgatus.tumidifrons { var x: trivirgatus.tumidifrons; () => { var y = this; }; return x; } + bolami(): trivirgatus.tumidifrons { var x: trivirgatus.tumidifrons; () => { var y = this; }; return x; } >bolami : Symbol(leptoceros.bolami, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 583, 91)) >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) >tumidifrons : Symbol(trivirgatus.tumidifrons, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 187, 23)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) >schlegeli : Symbol(lutreolus.schlegeli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 356, 21)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) +>americans : Symbol(ruatanica.americans, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 584, 90)) >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) >tumidifrons : Symbol(trivirgatus.tumidifrons, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 187, 23)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) >schlegeli : Symbol(lutreolus.schlegeli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 356, 21)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) +>americans : Symbol(ruatanica.americans, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 584, 173)) >this : Symbol(leptoceros, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 578, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 584, 90)) @@ -8237,7 +8237,7 @@ namespace daubentonii { >T0 : Symbol(T0, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 638, 26)) >T1 : Symbol(T1, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 638, 29)) - capreolus(): rendalli.crenulata, lavali.wilsoni> { var x: rendalli.crenulata, lavali.wilsoni>; () => { var y = this; }; return x; } + capreolus(): rendalli.crenulata, lavali.wilsoni> { var x: rendalli.crenulata, lavali.wilsoni>; () => { var y = this; }; return x; } >capreolus : Symbol(arboreus.capreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 638, 35)) >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1)) >crenulata : Symbol(rendalli.crenulata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 180, 3)) @@ -8246,7 +8246,7 @@ namespace daubentonii { >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >jugularis : Symbol(Lanthanum.jugularis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 134, 3)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) +>americans : Symbol(ruatanica.americans, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 18)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 639, 124)) @@ -8257,7 +8257,7 @@ namespace daubentonii { >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >jugularis : Symbol(Lanthanum.jugularis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 134, 3)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) +>americans : Symbol(ruatanica.americans, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 18)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 639, 238)) @@ -8581,12 +8581,12 @@ namespace patas { >this : Symbol(uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 17)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 661, 78)) - attenuata(): macrorhinos.marmosurus> { var x: macrorhinos.marmosurus>; () => { var y = this; }; return x; } + attenuata(): macrorhinos.marmosurus> { var x: macrorhinos.marmosurus>; () => { var y = this; }; return x; } >attenuata : Symbol(uralensis.attenuata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 661, 174)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) >marmosurus : Symbol(macrorhinos.marmosurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 462, 23)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) +>americans : Symbol(ruatanica.americans, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) >netscheri : Symbol(argurus.netscheri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 943, 19)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) @@ -8597,7 +8597,7 @@ namespace patas { >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) >marmosurus : Symbol(macrorhinos.marmosurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 462, 23)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) +>americans : Symbol(ruatanica.americans, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) >netscheri : Symbol(argurus.netscheri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 943, 19)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) @@ -8732,21 +8732,21 @@ namespace provocax { >this : Symbol(melanoleuca, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 670, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 672, 130)) - baeri(): imperfecta.lasiurus { var x: imperfecta.lasiurus; () => { var y = this; }; return x; } + baeri(): imperfecta.lasiurus { var x: imperfecta.lasiurus; () => { var y = this; }; return x; } >baeri : Symbol(melanoleuca.baeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 672, 275)) >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1)) >lasiurus : Symbol(imperfecta.lasiurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 786, 22)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >lepturus : Symbol(lavali.lepturus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 309, 3)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) +>americans : Symbol(ruatanica.americans, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 673, 81)) >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1)) >lasiurus : Symbol(imperfecta.lasiurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 786, 22)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >lepturus : Symbol(lavali.lepturus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 309, 3)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) +>americans : Symbol(ruatanica.americans, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 673, 156)) >this : Symbol(melanoleuca, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 670, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 673, 81)) @@ -9284,19 +9284,19 @@ namespace argurus { >this : Symbol(gilbertii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 700, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 712, 48)) - amurensis(): daubentonii.arboreus { var x: daubentonii.arboreus; () => { var y = this; }; return x; } + amurensis(): daubentonii.arboreus { var x: daubentonii.arboreus; () => { var y = this; }; return x; } >amurensis : Symbol(gilbertii.amurensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 712, 111)) >daubentonii : Symbol(daubentonii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 471, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 586, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 636, 1)) >arboreus : Symbol(daubentonii.arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 23)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) ->otion : Symbol(lavali.otion, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 270, 3)) +>option : Symbol(lavali.option, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 270, 3)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) >konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 23)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 713, 86)) >daubentonii : Symbol(daubentonii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 471, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 586, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 636, 1)) >arboreus : Symbol(daubentonii.arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 23)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) ->otion : Symbol(lavali.otion, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 270, 3)) +>option : Symbol(lavali.option, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 270, 3)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) >konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 23)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 713, 162)) @@ -9336,21 +9336,21 @@ namespace lutreolus { >this : Symbol(punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 722, 85)) - lar(): caurinus.mahaganus { var x: caurinus.mahaganus; () => { var y = this; }; return x; } + lar(): caurinus.mahaganus { var x: caurinus.mahaganus; () => { var y = this; }; return x; } >lar : Symbol(punicus.lar, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 722, 187)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) >mahaganus : Symbol(caurinus.mahaganus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 450, 20)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >nudicaudus : Symbol(julianae.nudicaudus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 18, 3)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) ->otion : Symbol(lavali.otion, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 270, 3)) +>option : Symbol(lavali.option, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 270, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 723, 74)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) >mahaganus : Symbol(caurinus.mahaganus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 450, 20)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >nudicaudus : Symbol(julianae.nudicaudus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 18, 3)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) ->otion : Symbol(lavali.otion, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 270, 3)) +>option : Symbol(lavali.option, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 270, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 723, 144)) >this : Symbol(punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 723, 74)) @@ -9545,7 +9545,7 @@ namespace macrorhinos { >this : Symbol(daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 23)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 740, 64)) - hammondi(): julianae.gerbillus, gabriellae.echinatus>, dogramacii.aurata>, lavali.otion> { var x: julianae.gerbillus, gabriellae.echinatus>, dogramacii.aurata>, lavali.otion>; () => { var y = this; }; return x; } + hammondi(): julianae.gerbillus, gabriellae.echinatus>, dogramacii.aurata>, lavali.option> { var x: julianae.gerbillus, gabriellae.echinatus>, dogramacii.aurata>, lavali.option>; () => { var y = this; }; return x; } >hammondi : Symbol(daphaenodon.hammondi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 740, 147)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >gerbillus : Symbol(julianae.gerbillus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 67, 3)) @@ -9564,7 +9564,7 @@ namespace macrorhinos { >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) >aurata : Symbol(dogramacii.aurata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 344, 3)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) ->otion : Symbol(lavali.otion, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 270, 3)) +>option : Symbol(lavali.option, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 270, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 741, 193)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >gerbillus : Symbol(julianae.gerbillus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 67, 3)) @@ -9583,7 +9583,7 @@ namespace macrorhinos { >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) >aurata : Symbol(dogramacii.aurata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 344, 3)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) ->otion : Symbol(lavali.otion, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 270, 3)) +>option : Symbol(lavali.option, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 270, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 741, 377)) >this : Symbol(daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 23)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 741, 193)) @@ -10167,21 +10167,21 @@ namespace imperfecta { >this : Symbol(lasiurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 786, 22)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 791, 130)) - schreibersii(): nigra.gracilis { var x: nigra.gracilis; () => { var y = this; }; return x; } + schreibersii(): nigra.gracilis { var x: nigra.gracilis; () => { var y = this; }; return x; } >schreibersii : Symbol(lasiurus.schreibersii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 791, 274)) >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1)) >gracilis : Symbol(nigra.gracilis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 515, 17)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) >luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 19)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) +>americans : Symbol(ruatanica.americans, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 792, 84)) >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1)) >gracilis : Symbol(nigra.gracilis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 515, 17)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) >luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 19)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) +>americans : Symbol(ruatanica.americans, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 792, 155)) >this : Symbol(lasiurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 786, 22)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 792, 84)) @@ -12173,7 +12173,7 @@ namespace ruatanica { >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1)) >amicus : Symbol(gabriellae.amicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 769, 5)) - clara(): panglima.amphibius, argurus.dauricus> { var x: panglima.amphibius, argurus.dauricus>; () => { var y = this; }; return x; } + clara(): panglima.amphibius, argurus.dauricus> { var x: panglima.amphibius, argurus.dauricus>; () => { var y = this; }; return x; } >clara : Symbol(Praseodymium.clara, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 961, 102)) >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1)) >amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 20)) @@ -12186,7 +12186,7 @@ namespace ruatanica { >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) >dauricus : Symbol(argurus.dauricus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 374, 19)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->americanus : Symbol(americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) +>americans : Symbol(americans, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0)) >caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 24)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 962, 168)) @@ -12201,7 +12201,7 @@ namespace ruatanica { >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) >dauricus : Symbol(argurus.dauricus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 374, 19)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->americanus : Symbol(americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) +>americans : Symbol(americans, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0)) >caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 24)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 962, 330)) diff --git a/tests/baselines/reference/resolvingClassDeclarationWhenInBaseTypeResolution.types b/tests/baselines/reference/resolvingClassDeclarationWhenInBaseTypeResolution.types index 866e043ddbec7..c44b76328a0d2 100644 --- a/tests/baselines/reference/resolvingClassDeclarationWhenInBaseTypeResolution.types +++ b/tests/baselines/reference/resolvingClassDeclarationWhenInBaseTypeResolution.types @@ -54,12 +54,12 @@ namespace rionegrensis { >x : lavali.xanthognathus > : ^^^^^^^^^^^^^^^^^^^^ - raffrayana() : lavali.otion { var x : lavali.otion; () => { var y = this; }; return x; } ->raffrayana : () => lavali.otion + raffrayana() : lavali.option { var x : lavali.option; () => { var y = this; }; return x; } +>raffrayana : () => lavali.option > : ^^^^^^ >lavali : any > : ^^^ ->x : lavali.otion +>x : lavali.option > : ^^^^^^^^^^^^ >lavali : any > : ^^^ @@ -69,7 +69,7 @@ namespace rionegrensis { > : ^^^^ >this : this > : ^^^^ ->x : lavali.otion +>x : lavali.option > : ^^^^^^^^^^^^ Uranium() : minutus.inez, trivirgatus.falconeri> { var x : minutus.inez, trivirgatus.falconeri>; () => { var y = this; }; return x; } @@ -425,12 +425,12 @@ namespace julianae { >x : panglima.amphibius > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - rueppellii() : ruatanica.americanus { var x : ruatanica.americanus; () => { var y = this; }; return x; } ->rueppellii : () => ruatanica.americanus + rueppellii() : ruatanica.americans { var x : ruatanica.americans; () => { var y = this; }; return x; } +>rueppellii : () => ruatanica.americans > : ^^^^^^ >ruatanica : any > : ^^^ ->x : ruatanica.americanus +>x : ruatanica.americans > : ^^^^^^^^^^^^^^^^^^^^ >ruatanica : any > : ^^^ @@ -440,7 +440,7 @@ namespace julianae { > : ^^^^ >this : this > : ^^^^ ->x : ruatanica.americanus +>x : ruatanica.americans > : ^^^^^^^^^^^^^^^^^^^^ peregusna() : dogramacii.kaiseri { var x : dogramacii.kaiseri; () => { var y = this; }; return x; } @@ -677,12 +677,12 @@ namespace julianae { >x : howi.marcanoi > : ^^^^^^^^^^^^^ - porcellus() : ruatanica.americanus { var x : ruatanica.americanus; () => { var y = this; }; return x; } ->porcellus : () => ruatanica.americanus + porcellus() : ruatanica.americans { var x : ruatanica.americans; () => { var y = this; }; return x; } +>porcellus : () => ruatanica.americans > : ^^^^^^ >ruatanica : any > : ^^^ ->x : ruatanica.americanus +>x : ruatanica.americans > : ^^^^^^^^^^^^^^^^^^^^ >ruatanica : any > : ^^^ @@ -692,7 +692,7 @@ namespace julianae { > : ^^^^ >this : this > : ^^^^ ->x : ruatanica.americanus +>x : ruatanica.americans > : ^^^^^^^^^^^^^^^^^^^^ } export class oralis extends caurinus.psilurus { @@ -949,12 +949,12 @@ namespace julianae { >x : howi.angulatus, petrophilus.minutilla> > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - leucippe() : lavali.otion { var x : lavali.otion; () => { var y = this; }; return x; } ->leucippe : () => lavali.otion + leucippe() : lavali.option { var x : lavali.option; () => { var y = this; }; return x; } +>leucippe : () => lavali.option > : ^^^^^^ >lavali : any > : ^^^ ->x : lavali.otion +>x : lavali.option > : ^^^^^^^^^^^^ >lavali : any > : ^^^ @@ -964,7 +964,7 @@ namespace julianae { > : ^^^^ >this : this > : ^^^^ ->x : lavali.otion +>x : lavali.option > : ^^^^^^^^^^^^ ordii() : daubentonii.arboreus { var x : daubentonii.arboreus; () => { var y = this; }; return x; } @@ -1439,8 +1439,8 @@ namespace julianae { >x : lavali.lepturus > : ^^^^^^^^^^^^^^^ - minous() : argurus.dauricus { var x : argurus.dauricus; () => { var y = this; }; return x; } ->minous : () => argurus.dauricus + minous() : argurus.dauricus { var x : argurus.dauricus; () => { var y = this; }; return x; } +>minous : () => argurus.dauricus > : ^^^^^^ >argurus : any > : ^^^ @@ -1448,7 +1448,7 @@ namespace julianae { > : ^^^ >lavali : any > : ^^^ ->x : argurus.dauricus +>x : argurus.dauricus > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ >argurus : any > : ^^^ @@ -1462,11 +1462,11 @@ namespace julianae { > : ^^^^ >this : this > : ^^^^ ->x : argurus.dauricus +>x : argurus.dauricus > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - cinereiventer() : panamensis.setulosus { var x : panamensis.setulosus; () => { var y = this; }; return x; } ->cinereiventer : () => panamensis.setulosus + cinereiventer() : panamensis.setulosus { var x : panamensis.setulosus; () => { var y = this; }; return x; } +>cinereiventer : () => panamensis.setulosus > : ^^^^^^ >panamensis : any > : ^^^ @@ -1474,7 +1474,7 @@ namespace julianae { > : ^^^ >lavali : any > : ^^^ ->x : panamensis.setulosus +>x : panamensis.setulosus > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ >panamensis : any > : ^^^ @@ -1488,11 +1488,11 @@ namespace julianae { > : ^^^^ >this : this > : ^^^^ ->x : panamensis.setulosus +>x : panamensis.setulosus > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - longicaudatus() : macrorhinos.marmosurus> { var x : macrorhinos.marmosurus>; () => { var y = this; }; return x; } ->longicaudatus : () => macrorhinos.marmosurus> + longicaudatus() : macrorhinos.marmosurus> { var x : macrorhinos.marmosurus>; () => { var y = this; }; return x; } +>longicaudatus : () => macrorhinos.marmosurus> > : ^^^^^^ >macrorhinos : any > : ^^^ @@ -1502,7 +1502,7 @@ namespace julianae { > : ^^^ >lavali : any > : ^^^ ->x : macrorhinos.marmosurus> +>x : macrorhinos.marmosurus> > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ >macrorhinos : any > : ^^^ @@ -1518,7 +1518,7 @@ namespace julianae { > : ^^^^ >this : this > : ^^^^ ->x : macrorhinos.marmosurus> +>x : macrorhinos.marmosurus> > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ baeodon() : argurus.netscheri, argurus.luctuosa> { var x : argurus.netscheri, argurus.luctuosa>; () => { var y = this; }; return x; } @@ -2089,8 +2089,8 @@ namespace Lanthanum { >x : argurus.netscheri > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - silvatica() : rendalli.moojeni { var x : rendalli.moojeni; () => { var y = this; }; return x; } ->silvatica : () => rendalli.moojeni + silvatica() : rendalli.moojeni { var x : rendalli.moojeni; () => { var y = this; }; return x; } +>silvatica : () => rendalli.moojeni > : ^^^^^^ >rendalli : any > : ^^^ @@ -2098,7 +2098,7 @@ namespace Lanthanum { > : ^^^ >lavali : any > : ^^^ ->x : rendalli.moojeni +>x : rendalli.moojeni > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ >rendalli : any > : ^^^ @@ -2112,7 +2112,7 @@ namespace Lanthanum { > : ^^^^ >this : this > : ^^^^ ->x : rendalli.moojeni +>x : rendalli.moojeni > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ midas() : lavali.xanthognathus { var x : lavali.xanthognathus; () => { var y = this; }; return x; } @@ -2425,14 +2425,14 @@ namespace Lanthanum { >x : sagitta.stolzmanni > : ^^^^^^^^^^^^^^^^^^ - talpinus() : nitidus { var x : nitidus; () => { var y = this; }; return x; } ->talpinus : () => nitidus + talpinus() : nitidus { var x : nitidus; () => { var y = this; }; return x; } +>talpinus : () => nitidus > : ^^^^^^ >ruatanica : any > : ^^^ >sagitta : any > : ^^^ ->x : nitidus +>x : nitidus > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ >ruatanica : any > : ^^^ @@ -2444,7 +2444,7 @@ namespace Lanthanum { > : ^^^^ >this : this > : ^^^^ ->x : nitidus +>x : nitidus > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ stramineus() : gabriellae.amicus { var x : gabriellae.amicus; () => { var y = this; }; return x; } @@ -2802,12 +2802,12 @@ namespace rendalli { >x : panglima.abidi > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - griseoflavus() : ruatanica.americanus { var x : ruatanica.americanus; () => { var y = this; }; return x; } ->griseoflavus : () => ruatanica.americanus + griseoflavus() : ruatanica.americans { var x : ruatanica.americans; () => { var y = this; }; return x; } +>griseoflavus : () => ruatanica.americans > : ^^^^^^ >ruatanica : any > : ^^^ ->x : ruatanica.americanus +>x : ruatanica.americans > : ^^^^^^^^^^^^^^^^^^^^ >ruatanica : any > : ^^^ @@ -2817,7 +2817,7 @@ namespace rendalli { > : ^^^^ >this : this > : ^^^^ ->x : ruatanica.americanus +>x : ruatanica.americans > : ^^^^^^^^^^^^^^^^^^^^ thar() : argurus.oreas { var x : argurus.oreas; () => { var y = this; }; return x; } @@ -2882,8 +2882,8 @@ namespace rendalli { >x : sagitta.stolzmanni > : ^^^^^^^^^^^^^^^^^^ - gordonorum() : howi.angulatus { var x : howi.angulatus; () => { var y = this; }; return x; } ->gordonorum : () => howi.angulatus + gordonorum() : howi.angulatus { var x : howi.angulatus; () => { var y = this; }; return x; } +>gordonorum : () => howi.angulatus > : ^^^^^^ >howi : any > : ^^^ @@ -2891,7 +2891,7 @@ namespace rendalli { > : ^^^ >argurus : any > : ^^^ ->x : howi.angulatus +>x : howi.angulatus > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ >howi : any > : ^^^ @@ -2905,7 +2905,7 @@ namespace rendalli { > : ^^^^ >this : this > : ^^^^ ->x : howi.angulatus +>x : howi.angulatus > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ruber() : dammermani.siberu { var x : dammermani.siberu; () => { var y = this; }; return x; } @@ -3000,12 +3000,12 @@ namespace rendalli { >moojeni : moojeni > : ^^^^^^^^^^^^^^^ - floweri() : lavali.otion { var x : lavali.otion; () => { var y = this; }; return x; } ->floweri : () => lavali.otion + floweri() : lavali.option { var x : lavali.option; () => { var y = this; }; return x; } +>floweri : () => lavali.option > : ^^^^^^ >lavali : any > : ^^^ ->x : lavali.otion +>x : lavali.option > : ^^^^^^^^^^^^ >lavali : any > : ^^^ @@ -3015,7 +3015,7 @@ namespace rendalli { > : ^^^^ >this : this > : ^^^^ ->x : lavali.otion +>x : lavali.option > : ^^^^^^^^^^^^ montosa() : imperfecta.ciliolabrum { var x : imperfecta.ciliolabrum; () => { var y = this; }; return x; } @@ -3284,12 +3284,12 @@ namespace rendalli { >x : howi.coludo > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - maritimus() : ruatanica.americanus { var x : ruatanica.americanus; () => { var y = this; }; return x; } ->maritimus : () => ruatanica.americanus + maritimus() : ruatanica.americans { var x : ruatanica.americans; () => { var y = this; }; return x; } +>maritimus : () => ruatanica.americans > : ^^^^^^ >ruatanica : any > : ^^^ ->x : ruatanica.americanus +>x : ruatanica.americans > : ^^^^^^^^^^^^^^^^^^^^ >ruatanica : any > : ^^^ @@ -3299,7 +3299,7 @@ namespace rendalli { > : ^^^^ >this : this > : ^^^^ ->x : ruatanica.americanus +>x : ruatanica.americans > : ^^^^^^^^^^^^^^^^^^^^ edax() : lutreolus.cor>, rionegrensis.caniventer> { var x : lutreolus.cor>, rionegrensis.caniventer>; () => { var y = this; }; return x; } @@ -3865,8 +3865,8 @@ namespace trivirgatus { >x : nigra.dolichurus>, patas.uralensis> > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - fuscicollis() : samarensis.pelurus> { var x : samarensis.pelurus>; () => { var y = this; }; return x; } ->fuscicollis : () => samarensis.pelurus> + fuscicollis() : samarensis.pelurus> { var x : samarensis.pelurus>; () => { var y = this; }; return x; } +>fuscicollis : () => samarensis.pelurus> > : ^^^^^^ >samarensis : any > : ^^^ @@ -3878,7 +3878,7 @@ namespace trivirgatus { > : ^^^ >sagitta : any > : ^^^ ->x : samarensis.pelurus> +>x : samarensis.pelurus> > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ >samarensis : any > : ^^^ @@ -3896,11 +3896,11 @@ namespace trivirgatus { > : ^^^^ >this : this > : ^^^^ ->x : samarensis.pelurus> +>x : samarensis.pelurus> > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - martiensseni() : sagitta.cinereus>, dogramacii.koepckeae> { var x : sagitta.cinereus>, dogramacii.koepckeae>; () => { var y = this; }; return x; } ->martiensseni : () => sagitta.cinereus>, dogramacii.koepckeae> + martiensseni() : sagitta.cinereus>, dogramacii.koepckeae> { var x : sagitta.cinereus>, dogramacii.koepckeae>; () => { var y = this; }; return x; } +>martiensseni : () => sagitta.cinereus>, dogramacii.koepckeae> > : ^^^^^^ >sagitta : any > : ^^^ @@ -3916,7 +3916,7 @@ namespace trivirgatus { > : ^^^ >dogramacii : any > : ^^^ ->x : sagitta.cinereus>, dogramacii.koepckeae> +>x : sagitta.cinereus>, dogramacii.koepckeae> > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ >sagitta : any > : ^^^ @@ -3938,7 +3938,7 @@ namespace trivirgatus { > : ^^^^ >this : this > : ^^^^ ->x : sagitta.cinereus>, dogramacii.koepckeae> +>x : sagitta.cinereus>, dogramacii.koepckeae> > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ gaoligongensis() : dogramacii.koepckeae { var x : dogramacii.koepckeae; () => { var y = this; }; return x; } @@ -4457,8 +4457,8 @@ namespace ruatanica { >ruatanica : typeof ruatanica > : ^^^^^^^^^^^^^^^^ - export class americanus extends imperfecta.ciliolabrum { ->americanus : americanus + export class americans extends imperfecta.ciliolabrum { +>americans : americans > : ^^^^^^^^^^ >imperfecta.ciliolabrum : imperfecta.ciliolabrum > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -4856,8 +4856,8 @@ namespace lavali { >beisa : beisa > : ^^^^^ } - export class otion extends howi.coludo { ->otion : otion + export class option extends howi.coludo { +>option : option > : ^^^^^ >howi.coludo : howi.coludo > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -5362,8 +5362,8 @@ namespace lavali { >x : panamensis.setulosus > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - euryotis() : rendalli.moojeni> { var x : rendalli.moojeni>; () => { var y = this; }; return x; } ->euryotis : () => rendalli.moojeni> + euryotis() : rendalli.moojeni> { var x : rendalli.moojeni>; () => { var y = this; }; return x; } +>euryotis : () => rendalli.moojeni> > : ^^^^^^ >rendalli : any > : ^^^ @@ -5375,7 +5375,7 @@ namespace lavali { > : ^^^ >ruatanica : any > : ^^^ ->x : rendalli.moojeni> +>x : rendalli.moojeni> > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ >rendalli : any > : ^^^ @@ -5393,7 +5393,7 @@ namespace lavali { > : ^^^^ >this : this > : ^^^^ ->x : rendalli.moojeni> +>x : rendalli.moojeni> > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ maurisca() : Lanthanum.suillus { var x : Lanthanum.suillus; () => { var y = this; }; return x; } @@ -5656,8 +5656,8 @@ namespace lavali { >x : argurus.luctuosa > : ^^^^^^^^^^^^^^^^ - paramicrus() : imperfecta.ciliolabrum> { var x : imperfecta.ciliolabrum>; () => { var y = this; }; return x; } ->paramicrus : () => imperfecta.ciliolabrum> + paramicrus() : imperfecta.ciliolabrum> { var x : imperfecta.ciliolabrum>; () => { var y = this; }; return x; } +>paramicrus : () => imperfecta.ciliolabrum> > : ^^^^^^ >imperfecta : any > : ^^^ @@ -5667,7 +5667,7 @@ namespace lavali { > : ^^^ >caurinus : any > : ^^^ ->x : imperfecta.ciliolabrum> +>x : imperfecta.ciliolabrum> > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ >imperfecta : any > : ^^^ @@ -5683,7 +5683,7 @@ namespace lavali { > : ^^^^ >this : this > : ^^^^ ->x : imperfecta.ciliolabrum> +>x : imperfecta.ciliolabrum> > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ } export class lepturus extends Lanthanum.suillus { @@ -6299,12 +6299,12 @@ namespace dogramacii { >x : julianae.nudicaudus > : ^^^^^^^^^^^^^^^^^^^ - ater() : ruatanica.americanus { var x : ruatanica.americanus; () => { var y = this; }; return x; } ->ater : () => ruatanica.americanus + ater() : ruatanica.americans { var x : ruatanica.americans; () => { var y = this; }; return x; } +>ater : () => ruatanica.americans > : ^^^^^^ >ruatanica : any > : ^^^ ->x : ruatanica.americanus +>x : ruatanica.americans > : ^^^^^^^^^^^^^^^^^^^^ >ruatanica : any > : ^^^ @@ -6314,15 +6314,15 @@ namespace dogramacii { > : ^^^^ >this : this > : ^^^^ ->x : ruatanica.americanus +>x : ruatanica.americans > : ^^^^^^^^^^^^^^^^^^^^ } export class aurata { >aurata : aurata > : ^^^^^^ - grunniens() : nigra.gracilis, julianae.sumatrana>, ruatanica.americanus> { var x : nigra.gracilis, julianae.sumatrana>, ruatanica.americanus>; () => { var y = this; }; return x; } ->grunniens : () => nigra.gracilis, julianae.sumatrana>, ruatanica.americanus> + grunniens() : nigra.gracilis, julianae.sumatrana>, ruatanica.americans> { var x : nigra.gracilis, julianae.sumatrana>, ruatanica.americans>; () => { var y = this; }; return x; } +>grunniens : () => nigra.gracilis, julianae.sumatrana>, ruatanica.americans> > : ^^^^^^ >nigra : any > : ^^^ @@ -6336,7 +6336,7 @@ namespace dogramacii { > : ^^^ >ruatanica : any > : ^^^ ->x : nigra.gracilis, julianae.sumatrana>, ruatanica.americanus> +>x : nigra.gracilis, julianae.sumatrana>, ruatanica.americans> > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ >nigra : any > : ^^^ @@ -6356,15 +6356,15 @@ namespace dogramacii { > : ^^^^ >this : this > : ^^^^ ->x : nigra.gracilis, julianae.sumatrana>, ruatanica.americanus> +>x : nigra.gracilis, julianae.sumatrana>, ruatanica.americans> > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - howensis() : ruatanica.americanus { var x : ruatanica.americanus; () => { var y = this; }; return x; } ->howensis : () => ruatanica.americanus + howensis() : ruatanica.americans { var x : ruatanica.americans; () => { var y = this; }; return x; } +>howensis : () => ruatanica.americans > : ^^^^^^ >ruatanica : any > : ^^^ ->x : ruatanica.americanus +>x : ruatanica.americans > : ^^^^^^^^^^^^^^^^^^^^ >ruatanica : any > : ^^^ @@ -6374,7 +6374,7 @@ namespace dogramacii { > : ^^^^ >this : this > : ^^^^ ->x : ruatanica.americanus +>x : ruatanica.americans > : ^^^^^^^^^^^^^^^^^^^^ karlkoopmani() : caurinus.psilurus { var x : caurinus.psilurus; () => { var y = this; }; return x; } @@ -6435,8 +6435,8 @@ namespace dogramacii { >x : aurata > : ^^^^^^ - landeri() : samarensis.pelurus { var x : samarensis.pelurus; () => { var y = this; }; return x; } ->landeri : () => samarensis.pelurus + landeri() : samarensis.pelurus { var x : samarensis.pelurus; () => { var y = this; }; return x; } +>landeri : () => samarensis.pelurus > : ^^^^^^ >samarensis : any > : ^^^ @@ -6444,7 +6444,7 @@ namespace dogramacii { > : ^^^ >ruatanica : any > : ^^^ ->x : samarensis.pelurus +>x : samarensis.pelurus > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ >samarensis : any > : ^^^ @@ -6458,7 +6458,7 @@ namespace dogramacii { > : ^^^^ >this : this > : ^^^^ ->x : samarensis.pelurus +>x : samarensis.pelurus > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ sonomae() : trivirgatus.lotor, koepckeae> { var x : trivirgatus.lotor, koepckeae>; () => { var y = this; }; return x; } @@ -6584,8 +6584,8 @@ namespace lutreolus { >x : dogramacii.robustulus > : ^^^^^^^^^^^^^^^^^^^^^ - culionensis() : argurus.dauricus { var x : argurus.dauricus; () => { var y = this; }; return x; } ->culionensis : () => argurus.dauricus + culionensis() : argurus.dauricus { var x : argurus.dauricus; () => { var y = this; }; return x; } +>culionensis : () => argurus.dauricus > : ^^^^^^ >argurus : any > : ^^^ @@ -6593,7 +6593,7 @@ namespace lutreolus { > : ^^^ >rionegrensis : any > : ^^^ ->x : argurus.dauricus +>x : argurus.dauricus > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ >argurus : any > : ^^^ @@ -6607,7 +6607,7 @@ namespace lutreolus { > : ^^^^ >this : this > : ^^^^ ->x : argurus.dauricus +>x : argurus.dauricus > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ scrofa() : petrophilus.sodyi { var x : petrophilus.sodyi; () => { var y = this; }; return x; } @@ -6868,8 +6868,8 @@ namespace lutreolus { >x : julianae.gerbillus> > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - andamanensis() : julianae.oralis { var x : julianae.oralis; () => { var y = this; }; return x; } ->andamanensis : () => julianae.oralis + andamanensis() : julianae.oralis { var x : julianae.oralis; () => { var y = this; }; return x; } +>andamanensis : () => julianae.oralis > : ^^^^^^ >julianae : any > : ^^^ @@ -6877,7 +6877,7 @@ namespace lutreolus { > : ^^^ >rendalli : any > : ^^^ ->x : julianae.oralis +>x : julianae.oralis > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ >julianae : any > : ^^^ @@ -6891,7 +6891,7 @@ namespace lutreolus { > : ^^^^ >this : this > : ^^^^ ->x : julianae.oralis +>x : julianae.oralis > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ dispar() : panamensis.linulus { var x : panamensis.linulus; () => { var y = this; }; return x; } @@ -8396,8 +8396,8 @@ namespace caurinus { >macrorhinos : any > : ^^^ - martiniquensis(): ruatanica.hector>> { var x: ruatanica.hector>>; () => { var y = this; }; return x; } ->martiniquensis : () => ruatanica.hector>> + martiniquensis(): ruatanica.hector>> { var x: ruatanica.hector>>; () => { var y = this; }; return x; } +>martiniquensis : () => ruatanica.hector>> > : ^^^^^^ >ruatanica : any > : ^^^ @@ -8413,7 +8413,7 @@ namespace caurinus { > : ^^^ >lavali : any > : ^^^ ->x : ruatanica.hector>> +>x : ruatanica.hector>> > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ >ruatanica : any > : ^^^ @@ -8435,7 +8435,7 @@ namespace caurinus { > : ^^^^ >this : this > : ^^^^ ->x : ruatanica.hector>> +>x : ruatanica.hector>> > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ devius(): samarensis.pelurus, trivirgatus.falconeri>> { var x: samarensis.pelurus, trivirgatus.falconeri>>; () => { var y = this; }; return x; } @@ -8904,8 +8904,8 @@ namespace nigra { >x : argurus.luctuosa > : ^^^^^^^^^^^^^^^^ - brucei(): chrysaeolus.sarasinorum { var x: chrysaeolus.sarasinorum; () => { var y = this; }; return x; } ->brucei : () => chrysaeolus.sarasinorum + brucei(): chrysaeolus.sarasinorum { var x: chrysaeolus.sarasinorum; () => { var y = this; }; return x; } +>brucei : () => chrysaeolus.sarasinorum > : ^^^^^^ >chrysaeolus : any > : ^^^ @@ -8913,7 +8913,7 @@ namespace nigra { > : ^^^ >ruatanica : any > : ^^^ ->x : chrysaeolus.sarasinorum +>x : chrysaeolus.sarasinorum > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ >chrysaeolus : any > : ^^^ @@ -8927,7 +8927,7 @@ namespace nigra { > : ^^^^ >this : this > : ^^^^ ->x : chrysaeolus.sarasinorum +>x : chrysaeolus.sarasinorum > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ } } @@ -8945,8 +8945,8 @@ namespace sagitta { >portoricensis : typeof minutus.portoricensis > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - maracajuensis(): samarensis.cahirinus { var x: samarensis.cahirinus; () => { var y = this; }; return x; } ->maracajuensis : () => samarensis.cahirinus + maracajuensis(): samarensis.cahirinus { var x: samarensis.cahirinus; () => { var y = this; }; return x; } +>maracajuensis : () => samarensis.cahirinus > : ^^^^^^ >samarensis : any > : ^^^ @@ -8954,7 +8954,7 @@ namespace sagitta { > : ^^^ >ruatanica : any > : ^^^ ->x : samarensis.cahirinus +>x : samarensis.cahirinus > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ >samarensis : any > : ^^^ @@ -8968,7 +8968,7 @@ namespace sagitta { > : ^^^^ >this : this > : ^^^^ ->x : samarensis.cahirinus +>x : samarensis.cahirinus > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ } } @@ -10200,8 +10200,8 @@ namespace samarensis { >x : sagitta.stolzmanni > : ^^^^^^^^^^^^^^^^^^ - imaizumii(): minutus.inez, gabriellae.echinatus>, dogramacii.aurata>, lavali.otion>, macrorhinos.konganensis> { var x: minutus.inez, gabriellae.echinatus>, dogramacii.aurata>, lavali.otion>, macrorhinos.konganensis>; () => { var y = this; }; return x; } ->imaizumii : () => minutus.inez, gabriellae.echinatus>, dogramacii.aurata>, lavali.otion>, macrorhinos.konganensis> + imaizumii(): minutus.inez, gabriellae.echinatus>, dogramacii.aurata>, lavali.option>, macrorhinos.konganensis> { var x: minutus.inez, gabriellae.echinatus>, dogramacii.aurata>, lavali.option>, macrorhinos.konganensis>; () => { var y = this; }; return x; } +>imaizumii : () => minutus.inez, gabriellae.echinatus>, dogramacii.aurata>, lavali.option>, macrorhinos.konganensis> > : ^^^^^^ >minutus : any > : ^^^ @@ -10225,7 +10225,7 @@ namespace samarensis { > : ^^^ >macrorhinos : any > : ^^^ ->x : minutus.inez, gabriellae.echinatus>, dogramacii.aurata>, lavali.otion>, macrorhinos.konganensis> +>x : minutus.inez, gabriellae.echinatus>, dogramacii.aurata>, lavali.option>, macrorhinos.konganensis> > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ >minutus : any > : ^^^ @@ -10255,7 +10255,7 @@ namespace samarensis { > : ^^^^ >this : this > : ^^^^ ->x : minutus.inez, gabriellae.echinatus>, dogramacii.aurata>, lavali.otion>, macrorhinos.konganensis> +>x : minutus.inez, gabriellae.echinatus>, dogramacii.aurata>, lavali.option>, macrorhinos.konganensis> > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ colocolo(): quasiater.bobrinskoi { var x: quasiater.bobrinskoi; () => { var y = this; }; return x; } @@ -10430,8 +10430,8 @@ namespace samarensis { >cahirinus : cahirinus > : ^^^^^^^^^^^^^^^^^ - alashanicus(): nigra.caucasica { var x: nigra.caucasica; () => { var y = this; }; return x; } ->alashanicus : () => nigra.caucasica + alashanicus(): nigra.caucasica { var x: nigra.caucasica; () => { var y = this; }; return x; } +>alashanicus : () => nigra.caucasica > : ^^^^^^ >nigra : any > : ^^^ @@ -10439,7 +10439,7 @@ namespace samarensis { > : ^^^ >argurus : any > : ^^^ ->x : nigra.caucasica +>x : nigra.caucasica > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ >nigra : any > : ^^^ @@ -10453,7 +10453,7 @@ namespace samarensis { > : ^^^^ >this : this > : ^^^^ ->x : nigra.caucasica +>x : nigra.caucasica > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ flaviventer(): trivirgatus.tumidifrons> { var x: trivirgatus.tumidifrons>; () => { var y = this; }; return x; } @@ -10703,8 +10703,8 @@ namespace sagitta { >x : lavali.wilsoni > : ^^^^^^^^^^^^^^ - bolami(): trivirgatus.tumidifrons { var x: trivirgatus.tumidifrons; () => { var y = this; }; return x; } ->bolami : () => trivirgatus.tumidifrons + bolami(): trivirgatus.tumidifrons { var x: trivirgatus.tumidifrons; () => { var y = this; }; return x; } +>bolami : () => trivirgatus.tumidifrons > : ^^^^^^ >trivirgatus : any > : ^^^ @@ -10712,7 +10712,7 @@ namespace sagitta { > : ^^^ >ruatanica : any > : ^^^ ->x : trivirgatus.tumidifrons +>x : trivirgatus.tumidifrons > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ >trivirgatus : any > : ^^^ @@ -10726,7 +10726,7 @@ namespace sagitta { > : ^^^^ >this : this > : ^^^^ ->x : trivirgatus.tumidifrons +>x : trivirgatus.tumidifrons > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ } } @@ -11376,8 +11376,8 @@ namespace daubentonii { >arboreus : arboreus > : ^^^^^^^^^^^^^^^^ - capreolus(): rendalli.crenulata, lavali.wilsoni> { var x: rendalli.crenulata, lavali.wilsoni>; () => { var y = this; }; return x; } ->capreolus : () => rendalli.crenulata, lavali.wilsoni> + capreolus(): rendalli.crenulata, lavali.wilsoni> { var x: rendalli.crenulata, lavali.wilsoni>; () => { var y = this; }; return x; } +>capreolus : () => rendalli.crenulata, lavali.wilsoni> > : ^^^^^^ >rendalli : any > : ^^^ @@ -11389,7 +11389,7 @@ namespace daubentonii { > : ^^^ >lavali : any > : ^^^ ->x : rendalli.crenulata, lavali.wilsoni> +>x : rendalli.crenulata, lavali.wilsoni> > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ >rendalli : any > : ^^^ @@ -11407,7 +11407,7 @@ namespace daubentonii { > : ^^^^ >this : this > : ^^^^ ->x : rendalli.crenulata, lavali.wilsoni> +>x : rendalli.crenulata, lavali.wilsoni> > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ moreni(): panglima.abidi { var x: panglima.abidi; () => { var y = this; }; return x; } @@ -11855,8 +11855,8 @@ namespace patas { >x : ruatanica.hector > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - attenuata(): macrorhinos.marmosurus> { var x: macrorhinos.marmosurus>; () => { var y = this; }; return x; } ->attenuata : () => macrorhinos.marmosurus> + attenuata(): macrorhinos.marmosurus> { var x: macrorhinos.marmosurus>; () => { var y = this; }; return x; } +>attenuata : () => macrorhinos.marmosurus> > : ^^^^^^ >macrorhinos : any > : ^^^ @@ -11868,7 +11868,7 @@ namespace patas { > : ^^^ >dogramacii : any > : ^^^ ->x : macrorhinos.marmosurus> +>x : macrorhinos.marmosurus> > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ >macrorhinos : any > : ^^^ @@ -11886,7 +11886,7 @@ namespace patas { > : ^^^^ >this : this > : ^^^^ ->x : macrorhinos.marmosurus> +>x : macrorhinos.marmosurus> > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ megalura(): howi.marcanoi { var x: howi.marcanoi; () => { var y = this; }; return x; } @@ -12060,8 +12060,8 @@ namespace provocax { >x : macrorhinos.marmosurus, lutreolus.foina> > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - baeri(): imperfecta.lasiurus { var x: imperfecta.lasiurus; () => { var y = this; }; return x; } ->baeri : () => imperfecta.lasiurus + baeri(): imperfecta.lasiurus { var x: imperfecta.lasiurus; () => { var y = this; }; return x; } +>baeri : () => imperfecta.lasiurus > : ^^^^^^ >imperfecta : any > : ^^^ @@ -12069,7 +12069,7 @@ namespace provocax { > : ^^^ >ruatanica : any > : ^^^ ->x : imperfecta.lasiurus +>x : imperfecta.lasiurus > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ >imperfecta : any > : ^^^ @@ -12083,7 +12083,7 @@ namespace provocax { > : ^^^^ >this : this > : ^^^^ ->x : imperfecta.lasiurus +>x : imperfecta.lasiurus > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ } } @@ -12813,8 +12813,8 @@ namespace argurus { >x : minutus.portoricensis > : ^^^^^^^^^^^^^^^^^^^^^ - amurensis(): daubentonii.arboreus { var x: daubentonii.arboreus; () => { var y = this; }; return x; } ->amurensis : () => daubentonii.arboreus + amurensis(): daubentonii.arboreus { var x: daubentonii.arboreus; () => { var y = this; }; return x; } +>amurensis : () => daubentonii.arboreus > : ^^^^^^ >daubentonii : any > : ^^^ @@ -12822,7 +12822,7 @@ namespace argurus { > : ^^^ >macrorhinos : any > : ^^^ ->x : daubentonii.arboreus +>x : daubentonii.arboreus > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ >daubentonii : any > : ^^^ @@ -12836,7 +12836,7 @@ namespace argurus { > : ^^^^ >this : this > : ^^^^ ->x : daubentonii.arboreus +>x : daubentonii.arboreus > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ } } @@ -12883,8 +12883,8 @@ namespace lutreolus { >x : gabriellae.klossii > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - lar(): caurinus.mahaganus { var x: caurinus.mahaganus; () => { var y = this; }; return x; } ->lar : () => caurinus.mahaganus + lar(): caurinus.mahaganus { var x: caurinus.mahaganus; () => { var y = this; }; return x; } +>lar : () => caurinus.mahaganus > : ^^^^^^ >caurinus : any > : ^^^ @@ -12892,7 +12892,7 @@ namespace lutreolus { > : ^^^ >lavali : any > : ^^^ ->x : caurinus.mahaganus +>x : caurinus.mahaganus > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ >caurinus : any > : ^^^ @@ -12906,7 +12906,7 @@ namespace lutreolus { > : ^^^^ >this : this > : ^^^^ ->x : caurinus.mahaganus +>x : caurinus.mahaganus > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ erica(): dogramacii.koepckeae { var x: dogramacii.koepckeae; () => { var y = this; }; return x; } @@ -13192,8 +13192,8 @@ namespace macrorhinos { >x : howi.coludo > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - hammondi(): julianae.gerbillus, gabriellae.echinatus>, dogramacii.aurata>, lavali.otion> { var x: julianae.gerbillus, gabriellae.echinatus>, dogramacii.aurata>, lavali.otion>; () => { var y = this; }; return x; } ->hammondi : () => julianae.gerbillus, gabriellae.echinatus>, dogramacii.aurata>, lavali.otion> + hammondi(): julianae.gerbillus, gabriellae.echinatus>, dogramacii.aurata>, lavali.option> { var x: julianae.gerbillus, gabriellae.echinatus>, dogramacii.aurata>, lavali.option>; () => { var y = this; }; return x; } +>hammondi : () => julianae.gerbillus, gabriellae.echinatus>, dogramacii.aurata>, lavali.option> > : ^^^^^^ >julianae : any > : ^^^ @@ -13213,7 +13213,7 @@ namespace macrorhinos { > : ^^^ >lavali : any > : ^^^ ->x : julianae.gerbillus, gabriellae.echinatus>, dogramacii.aurata>, lavali.otion> +>x : julianae.gerbillus, gabriellae.echinatus>, dogramacii.aurata>, lavali.option> > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ >julianae : any > : ^^^ @@ -13239,7 +13239,7 @@ namespace macrorhinos { > : ^^^^ >this : this > : ^^^^ ->x : julianae.gerbillus, gabriellae.echinatus>, dogramacii.aurata>, lavali.otion> +>x : julianae.gerbillus, gabriellae.echinatus>, dogramacii.aurata>, lavali.option> > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ aureocollaris(): quasiater.carolinensis { var x: quasiater.carolinensis; () => { var y = this; }; return x; } @@ -14036,8 +14036,8 @@ namespace imperfecta { >x : panglima.abidi> > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - schreibersii(): nigra.gracilis { var x: nigra.gracilis; () => { var y = this; }; return x; } ->schreibersii : () => nigra.gracilis + schreibersii(): nigra.gracilis { var x: nigra.gracilis; () => { var y = this; }; return x; } +>schreibersii : () => nigra.gracilis > : ^^^^^^ >nigra : any > : ^^^ @@ -14045,7 +14045,7 @@ namespace imperfecta { > : ^^^ >ruatanica : any > : ^^^ ->x : nigra.gracilis +>x : nigra.gracilis > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ >nigra : any > : ^^^ @@ -14059,7 +14059,7 @@ namespace imperfecta { > : ^^^^ >this : this > : ^^^^ ->x : nigra.gracilis +>x : nigra.gracilis > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ orii(): dogramacii.kaiseri { var x: dogramacii.kaiseri; () => { var y = this; }; return x; } @@ -16863,8 +16863,8 @@ namespace ruatanica { >gabriellae : any > : ^^^ - clara(): panglima.amphibius, argurus.dauricus> { var x: panglima.amphibius, argurus.dauricus>; () => { var y = this; }; return x; } ->clara : () => panglima.amphibius, argurus.dauricus> + clara(): panglima.amphibius, argurus.dauricus> { var x: panglima.amphibius, argurus.dauricus>; () => { var y = this; }; return x; } +>clara : () => panglima.amphibius, argurus.dauricus> > : ^^^^^^ >panglima : any > : ^^^ @@ -16880,7 +16880,7 @@ namespace ruatanica { > : ^^^ >rionegrensis : any > : ^^^ ->x : panglima.amphibius, argurus.dauricus> +>x : panglima.amphibius, argurus.dauricus> > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ >panglima : any > : ^^^ @@ -16902,7 +16902,7 @@ namespace ruatanica { > : ^^^^ >this : this > : ^^^^ ->x : panglima.amphibius, argurus.dauricus> +>x : panglima.amphibius, argurus.dauricus> > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ spectabilis(): petrophilus.sodyi { var x: petrophilus.sodyi; () => { var y = this; }; return x; } diff --git a/tests/baselines/reference/restInvalidArgumentType.errors.txt b/tests/baselines/reference/restInvalidArgumentType.errors.txt index 3282ee084ad9c..4a5a681955c7f 100644 --- a/tests/baselines/reference/restInvalidArgumentType.errors.txt +++ b/tests/baselines/reference/restInvalidArgumentType.errors.txt @@ -41,7 +41,7 @@ restInvalidArgumentType.ts(53,20): error TS2454: Variable 'e' is used before bei var {...r1} = p1; // Error, generic type paramterre var {...r2} = p2; // OK - var {...r3} = t; // Error, generic type paramter + var {...r3} = t; // Error, generic type parameter var {...r4} = i; // Error, index access ~~ !!! error TS2700: Rest types may only be created from object types. diff --git a/tests/baselines/reference/restInvalidArgumentType.js b/tests/baselines/reference/restInvalidArgumentType.js index dba7c38697c7c..26167a976b1ab 100644 --- a/tests/baselines/reference/restInvalidArgumentType.js +++ b/tests/baselines/reference/restInvalidArgumentType.js @@ -29,7 +29,7 @@ function f(p1: T, p2: T[]) { var {...r1} = p1; // Error, generic type paramterre var {...r2} = p2; // OK - var {...r3} = t; // Error, generic type paramter + var {...r3} = t; // Error, generic type parameter var {...r4} = i; // Error, index access var {...r5} = k; // Error, index @@ -96,7 +96,7 @@ function f(p1, p2) { var a = 0; var r1 = __rest(p1, []); // Error, generic type paramterre var r2 = __rest(p2, []); // OK - var r3 = __rest(t, []); // Error, generic type paramter + var r3 = __rest(t, []); // Error, generic type parameter var r4 = __rest(i, []); // Error, index access var r5 = __rest(k, []); // Error, index var r6 = __rest(mapped_generic, []); // Error, generic mapped object type diff --git a/tests/baselines/reference/restInvalidArgumentType.symbols b/tests/baselines/reference/restInvalidArgumentType.symbols index 30087943effbe..e645897a897f5 100644 --- a/tests/baselines/reference/restInvalidArgumentType.symbols +++ b/tests/baselines/reference/restInvalidArgumentType.symbols @@ -92,7 +92,7 @@ function f(p1: T, p2: T[]) { >r2 : Symbol(r2, Decl(restInvalidArgumentType.ts, 27, 9)) >p2 : Symbol(p2, Decl(restInvalidArgumentType.ts, 2, 42)) - var {...r3} = t; // Error, generic type paramter + var {...r3} = t; // Error, generic type parameter >r3 : Symbol(r3, Decl(restInvalidArgumentType.ts, 28, 9)) >t : Symbol(t, Decl(restInvalidArgumentType.ts, 3, 7)) diff --git a/tests/baselines/reference/restInvalidArgumentType.types b/tests/baselines/reference/restInvalidArgumentType.types index 51d0494cc7e04..e80324a46c096 100644 --- a/tests/baselines/reference/restInvalidArgumentType.types +++ b/tests/baselines/reference/restInvalidArgumentType.types @@ -115,7 +115,7 @@ function f(p1: T, p2: T[]) { >p2 : T[] > : ^^^ - var {...r3} = t; // Error, generic type paramter + var {...r3} = t; // Error, generic type parameter >r3 : T > : ^ >t : T diff --git a/tests/baselines/reference/reverseMappedTypeAssignableToIndex.js b/tests/baselines/reference/reverseMappedTypeAssignableToIndex.js index 8ad05b97d18c4..aa97304278c91 100644 --- a/tests/baselines/reference/reverseMappedTypeAssignableToIndex.js +++ b/tests/baselines/reference/reverseMappedTypeAssignableToIndex.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/reverseMappedTypeAssignableToIndex.ts] //// //// [reverseMappedTypeAssignableToIndex.ts] -// Simple mapped type and inferrence +// Simple mapped type and inference type Mapped = { [K in keyof T]: { name: T[K] } }; type InferFromMapped = T extends Mapped ? R : never; diff --git a/tests/baselines/reference/reverseMappedTypeAssignableToIndex.symbols b/tests/baselines/reference/reverseMappedTypeAssignableToIndex.symbols index 36c4f898eabcd..90491ad942b04 100644 --- a/tests/baselines/reference/reverseMappedTypeAssignableToIndex.symbols +++ b/tests/baselines/reference/reverseMappedTypeAssignableToIndex.symbols @@ -1,7 +1,7 @@ //// [tests/cases/compiler/reverseMappedTypeAssignableToIndex.ts] //// === reverseMappedTypeAssignableToIndex.ts === -// Simple mapped type and inferrence +// Simple mapped type and inference type Mapped = { [K in keyof T]: { name: T[K] } }; >Mapped : Symbol(Mapped, Decl(reverseMappedTypeAssignableToIndex.ts, 0, 0)) >T : Symbol(T, Decl(reverseMappedTypeAssignableToIndex.ts, 1, 12)) diff --git a/tests/baselines/reference/reverseMappedTypeAssignableToIndex.types b/tests/baselines/reference/reverseMappedTypeAssignableToIndex.types index 1903a58b2a25a..9424abe8f15f1 100644 --- a/tests/baselines/reference/reverseMappedTypeAssignableToIndex.types +++ b/tests/baselines/reference/reverseMappedTypeAssignableToIndex.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/reverseMappedTypeAssignableToIndex.ts] //// === reverseMappedTypeAssignableToIndex.ts === -// Simple mapped type and inferrence +// Simple mapped type and inference type Mapped = { [K in keyof T]: { name: T[K] } }; >Mapped : Mapped > : ^^^^^^^^^ diff --git a/tests/baselines/reference/sigantureIsSubTypeIfTheyAreIdentical.errors.txt b/tests/baselines/reference/sigantureIsSubTypeIfTheyAreIdentical.errors.txt index cf875d493556e..63410e1fe08c2 100644 --- a/tests/baselines/reference/sigantureIsSubTypeIfTheyAreIdentical.errors.txt +++ b/tests/baselines/reference/sigantureIsSubTypeIfTheyAreIdentical.errors.txt @@ -6,7 +6,7 @@ sigantureIsSubTypeIfTheyAreIdentical.ts(6,9): error TS2322: Type 'undefined' is interface ICache { get(key: string): T; } - class CacheService implements ICache { // Should not error that property type of get are incomaptible + class CacheService implements ICache { // Should not error that property type of get are incompatible get(key: string): T { return undefined; ~~~~~~ diff --git a/tests/baselines/reference/sigantureIsSubTypeIfTheyAreIdentical.js b/tests/baselines/reference/sigantureIsSubTypeIfTheyAreIdentical.js index a1d499963894f..ac2aa1f6b0277 100644 --- a/tests/baselines/reference/sigantureIsSubTypeIfTheyAreIdentical.js +++ b/tests/baselines/reference/sigantureIsSubTypeIfTheyAreIdentical.js @@ -4,7 +4,7 @@ interface ICache { get(key: string): T; } -class CacheService implements ICache { // Should not error that property type of get are incomaptible +class CacheService implements ICache { // Should not error that property type of get are incompatible get(key: string): T { return undefined; } diff --git a/tests/baselines/reference/sigantureIsSubTypeIfTheyAreIdentical.symbols b/tests/baselines/reference/sigantureIsSubTypeIfTheyAreIdentical.symbols index c3ab1dab71b20..6abfa8325bcd6 100644 --- a/tests/baselines/reference/sigantureIsSubTypeIfTheyAreIdentical.symbols +++ b/tests/baselines/reference/sigantureIsSubTypeIfTheyAreIdentical.symbols @@ -10,7 +10,7 @@ interface ICache { >key : Symbol(key, Decl(sigantureIsSubTypeIfTheyAreIdentical.ts, 1, 11)) >T : Symbol(T, Decl(sigantureIsSubTypeIfTheyAreIdentical.ts, 1, 8)) } -class CacheService implements ICache { // Should not error that property type of get are incomaptible +class CacheService implements ICache { // Should not error that property type of get are incompatible >CacheService : Symbol(CacheService, Decl(sigantureIsSubTypeIfTheyAreIdentical.ts, 2, 1)) >ICache : Symbol(ICache, Decl(sigantureIsSubTypeIfTheyAreIdentical.ts, 0, 0)) diff --git a/tests/baselines/reference/sigantureIsSubTypeIfTheyAreIdentical.types b/tests/baselines/reference/sigantureIsSubTypeIfTheyAreIdentical.types index f0b592b6bcb49..5536c25f8a2a4 100644 --- a/tests/baselines/reference/sigantureIsSubTypeIfTheyAreIdentical.types +++ b/tests/baselines/reference/sigantureIsSubTypeIfTheyAreIdentical.types @@ -8,7 +8,7 @@ interface ICache { >key : string > : ^^^^^^ } -class CacheService implements ICache { // Should not error that property type of get are incomaptible +class CacheService implements ICache { // Should not error that property type of get are incompatible >CacheService : CacheService > : ^^^^^^^^^^^^ diff --git a/tests/baselines/reference/signatureHelpCommentsClass.baseline b/tests/baselines/reference/signatureHelpCommentsClass.baseline index ad033f8f0a27d..edd3f6b784709 100644 --- a/tests/baselines/reference/signatureHelpCommentsClass.baseline +++ b/tests/baselines/reference/signatureHelpCommentsClass.baseline @@ -34,7 +34,7 @@ // | Constructor comment // | ---------------------------------------------------------------------- // var i4_c = c4; -// /** Class with statics*/ +// /** Class with statistics*/ // class c5 { // static s1: number; // } @@ -44,7 +44,7 @@ // | c5(): c5 // | ---------------------------------------------------------------------- // var i5_c = c5; -// /** class with statics and constructor*/ +// /** class with statistics and constructor*/ // class c6 { // /** s1 comment*/ // static s1: number; diff --git a/tests/baselines/reference/signatureHelpCommentsCommentParsing.baseline b/tests/baselines/reference/signatureHelpCommentsCommentParsing.baseline index 6ac04dc931142..075320111a035 100644 --- a/tests/baselines/reference/signatureHelpCommentsCommentParsing.baseline +++ b/tests/baselines/reference/signatureHelpCommentsCommentParsing.baseline @@ -49,7 +49,7 @@ // /** multiple line jsdoc comments no longer merge // *New line1 // *New Line2*/ -// /** Shoul mege this line as well +// /** Shoul merge this line as well // * and this too*/ /** Another this one too*/ // function jsDocMultiLineMerge() { // } @@ -404,7 +404,7 @@ // * spanning on two lines and aligned perfectly // * @param b this is info about b // * spanning on two lines and aligned perfectly -// * spanning one more line alined perfectly +// * spanning one more line aligned perfectly // * spanning another line with more margin // * @param c this is info about b // * not aligned text about parameter will eat only one space @@ -429,7 +429,7 @@ // | spanning on two lines and aligned perfectly // | @param b this is info about b // | spanning on two lines and aligned perfectly -// | spanning one more line alined perfectly +// | spanning one more line aligned perfectly // | spanning another line with more margin // | @param c this is info about b // | not aligned text about parameter will eat only one space @@ -7915,7 +7915,7 @@ "name": "b", "documentation": [ { - "text": "this is info about b\nspanning on two lines and aligned perfectly\nspanning one more line alined perfectly\n spanning another line with more margin", + "text": "this is info about b\nspanning on two lines and aligned perfectly\nspanning one more line aligned perfectly\n spanning another line with more margin", "kind": "text" } ], @@ -8006,7 +8006,7 @@ "kind": "space" }, { - "text": "this is info about b\nspanning on two lines and aligned perfectly\nspanning one more line alined perfectly\n spanning another line with more margin", + "text": "this is info about b\nspanning on two lines and aligned perfectly\nspanning one more line aligned perfectly\n spanning another line with more margin", "kind": "text" } ] @@ -8122,7 +8122,7 @@ "name": "b", "documentation": [ { - "text": "this is info about b\nspanning on two lines and aligned perfectly\nspanning one more line alined perfectly\n spanning another line with more margin", + "text": "this is info about b\nspanning on two lines and aligned perfectly\nspanning one more line aligned perfectly\n spanning another line with more margin", "kind": "text" } ], @@ -8213,7 +8213,7 @@ "kind": "space" }, { - "text": "this is info about b\nspanning on two lines and aligned perfectly\nspanning one more line alined perfectly\n spanning another line with more margin", + "text": "this is info about b\nspanning on two lines and aligned perfectly\nspanning one more line aligned perfectly\n spanning another line with more margin", "kind": "text" } ] @@ -8329,7 +8329,7 @@ "name": "b", "documentation": [ { - "text": "this is info about b\nspanning on two lines and aligned perfectly\nspanning one more line alined perfectly\n spanning another line with more margin", + "text": "this is info about b\nspanning on two lines and aligned perfectly\nspanning one more line aligned perfectly\n spanning another line with more margin", "kind": "text" } ], @@ -8420,7 +8420,7 @@ "kind": "space" }, { - "text": "this is info about b\nspanning on two lines and aligned perfectly\nspanning one more line alined perfectly\n spanning another line with more margin", + "text": "this is info about b\nspanning on two lines and aligned perfectly\nspanning one more line aligned perfectly\n spanning another line with more margin", "kind": "text" } ] diff --git a/tests/baselines/reference/sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues2(target=es5).js.map b/tests/baselines/reference/sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues2(target=es5).js.map index 5d1416b090c8b..d9800d7c6758f 100644 --- a/tests/baselines/reference/sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues2(target=es5).js.map +++ b/tests/baselines/reference/sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues2(target=es5).js.map @@ -1,3 +1,3 @@ //// [sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues2.js.map] -{"version":3,"file":"sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues2.js","sourceRoot":"","sources":["sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues2.ts"],"names":[],"mappings":";;AAMA,IAAI,MAAM,GAAU,CAAC,CAAC,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;AAC3C,IAAI,MAAM,GAAU,CAAC,CAAC,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC;AAC/C,IAAI,MAAM,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;AAC9B,SAAS,SAAS;IACd,OAAO,MAAM,CAAC;AAClB,CAAC;AAED,IAAI,WAAW,GAAsB,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC;AAC/D,IAAI,WAAW,GAAsB,CAAC,SAAS,EAAE,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC,CAAC;AACzE,IAAI,WAAW,GAAG,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;AAC7C,SAAS,cAAc;IACnB,OAAO,WAAW,CAAC;AACvB,CAAC;AAED,IAAI,KAAa,EAAE,aAAqB,EAAE,eAAuB,CAAC;AAClE,IAAI,OAAe,EAAE,KAAa,CAAC;AACnC,IAAI,QAAgB,EAAE,MAAc,EAAE,OAAe,EAAE,MAAc,CAAC;AACtE,IAAI,QAAgB,EAAE,UAA+B,EAAE,eAA8C,CAAC;AAEtG,KAA6B,UAAM,EAAN,iBAAM,EAAN,oBAAM,EAAN,IAAM,EAAE,CAAC;uBAA9B,UAAgB,EAAhB,KAAK,mBAAG,QAAQ,KAAA;IACpB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,KAA6B,WAAW,EAAX,MAAA,SAAS,EAAE,EAAX,gBAAW,EAAX,KAAW,EAAE,CAAC;mBAAnC,UAAgB,EAAhB,KAAK,mBAAG,QAAQ,KAAA;IACpB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,KAA6B,WAAgB,EAAhB,OAAC,MAAM,EAAE,MAAM,CAAC,EAAhB,gBAAgB,EAAhB,KAAgB,EAAE,CAAC;mBAAxC,UAAgB,EAAhB,KAAK,mBAAG,QAAQ,KAAA;IACpB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,KAG6B,WAAW,EAAX,2BAAW,EAAX,0BAAW,EAAX,KAAW,EAAE,CAAC;6BAHnC,UAGgB,EAHhB,qBAGJ,CAAC,QAAQ,EAAE,QAAQ,CAAC,KAAA,EAFpB,UAAyB,EAAzB,aAAa,mBAAG,SAAS,KAAA,EACzB,UAA6B,EAA7B,eAAe,mBAAG,WAAW,KAAA;IAE7B,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;AAC/B,CAAC;AACD,KAG6B,WAAgB,EAAhB,MAAA,cAAc,EAAE,EAAhB,gBAAgB,EAAhB,KAAgB,EAAE,CAAC;mBAHxC,UAGgB,EAHhB,qBAGJ,CAAC,QAAQ,EAAE,QAAQ,CAAC,KAAA,EAFpB,UAAyB,EAAzB,aAAa,mBAAG,SAAS,KAAA,EACzB,UAA6B,EAA7B,eAAe,mBAAG,WAAW,KAAA;IAE7B,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;AAC/B,CAAC;AACD,KAG6B,WAA0B,EAA1B,OAAC,WAAW,EAAE,WAAW,CAAC,EAA1B,gBAA0B,EAA1B,KAA0B,EAAE,CAAC;mBAHlD,UAGgB,EAHhB,qBAGJ,CAAC,QAAQ,EAAE,QAAQ,CAAC,KAAA,EAFpB,UAAyB,EAAzB,aAAa,mBAAG,SAAS,KAAA,EACzB,UAA6B,EAA7B,eAAe,mBAAG,WAAW,KAAA;IAE7B,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;AAC/B,CAAC;AAED,KAAuB,WAAM,EAAN,iBAAM,EAAN,qBAAM,EAAN,KAAM,EAAE,CAAC;IAA1B,qBAAY,EAAZ,OAAO,mBAAG,CAAC,CAAC,KAAA;IACd,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;AACzB,CAAC;AACD,KAAuB,WAAW,EAAX,MAAA,SAAS,EAAE,EAAX,gBAAW,EAAX,KAAW,EAAE,CAAC;IAA/B,gBAAY,EAAZ,OAAO,mBAAG,CAAC,CAAC,KAAA;IACd,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;AACzB,CAAC;AACD,KAAuB,WAAgB,EAAhB,OAAC,MAAM,EAAE,MAAM,CAAC,EAAhB,gBAAgB,EAAhB,KAAgB,EAAE,CAAC;IAApC,gBAAY,EAAZ,OAAO,mBAAG,CAAC,CAAC,KAAA;IACd,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;AACzB,CAAC;AACD,KAA2B,WAAW,EAAX,2BAAW,EAAX,0BAAW,EAAX,KAAW,EAAE,CAAC;IAAnC,0BAAgB,EAAhB,KAAK,mBAAG,QAAQ,KAAA;IAClB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,KAA2B,WAAgB,EAAhB,MAAA,cAAc,EAAE,EAAhB,gBAAgB,EAAhB,KAAgB,EAAE,CAAC;IAAxC,gBAAgB,EAAhB,KAAK,mBAAG,QAAQ,KAAA;IAClB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,KAA2B,WAA0B,EAA1B,OAAC,WAAW,EAAE,WAAW,CAAC,EAA1B,gBAA0B,EAA1B,KAA0B,EAAE,CAAC;IAAlD,gBAAgB,EAAhB,KAAK,mBAAG,QAAQ,KAAA;IAClB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AAED,KAA8D,WAAM,EAAN,iBAAM,EAAN,qBAAM,EAAN,KAAM,EAAE,CAAC;wBAAjE,UAAa,EAAb,QAAQ,mBAAG,CAAC,CAAC,KAAA,EAAE,UAAiB,EAAjB,MAAM,mBAAG,QAAQ,KAAA,EAAE,UAAiB,EAAjB,OAAO,mBAAG,OAAO,KAAA;IACrD,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;AACxB,CAAC;AACD,KAA8D,WAAW,EAAX,MAAA,SAAS,EAAE,EAAX,gBAAW,EAAX,KAAW,EAAE,CAAC;mBAAtE,UAAa,EAAb,QAAQ,mBAAG,CAAC,CAAC,KAAA,EAAE,UAAiB,EAAjB,MAAM,mBAAG,QAAQ,KAAA,EAAE,WAAiB,EAAjB,OAAO,oBAAG,OAAO,MAAA;IACrD,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;AACxB,CAAC;AACD,KAA8D,WAAgB,EAAhB,OAAC,MAAM,EAAE,MAAM,CAAC,EAAhB,gBAAgB,EAAhB,KAAgB,EAAE,CAAC;oBAA3E,YAAa,EAAb,QAAQ,oBAAG,CAAC,CAAC,MAAA,EAAE,YAAiB,EAAjB,MAAM,oBAAG,QAAQ,MAAA,EAAE,YAAiB,EAAjB,OAAO,oBAAG,OAAO,MAAA;IACrD,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;AACxB,CAAC;AACD,KAG6B,WAAW,EAAX,2BAAW,EAAX,0BAAW,EAAX,KAAW,EAAE,CAAC;8BAHrC,YAAiB,EAAjB,MAAM,oBAAG,QAAQ,MAAA,EAAE,YAGD,EAHC,uBAGrB,CAAC,QAAQ,EAAE,QAAQ,CAAC,MAAA,EAFpB,YAAyB,EAAzB,aAAa,oBAAG,SAAS,MAAA,EACzB,YAA6B,EAA7B,eAAe,oBAAG,WAAW,MAAA;IAE7B,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;AACxB,CAAC;AACD,KAG6B,WAAgB,EAAhB,MAAA,cAAc,EAAE,EAAhB,gBAAgB,EAAhB,KAAgB,EAAE,CAAC;oBAH1C,YAAiB,EAAjB,MAAM,oBAAG,QAAQ,MAAA,EAAE,YAGD,EAHC,uBAGrB,CAAC,QAAQ,EAAE,QAAQ,CAAC,MAAA,EAFpB,YAAyB,EAAzB,aAAa,oBAAG,SAAS,MAAA,EACzB,YAA6B,EAA7B,eAAe,oBAAG,WAAW,MAAA;IAE7B,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;AACxB,CAAC;AACD,KAG6B,WAA0B,EAA1B,OAAC,WAAW,EAAE,WAAW,CAAC,EAA1B,gBAA0B,EAA1B,KAA0B,EAAE,CAAC;oBAHpD,YAAiB,EAAjB,MAAM,oBAAG,QAAQ,MAAA,EAAE,YAGD,EAHC,uBAGrB,CAAC,QAAQ,EAAE,QAAQ,CAAC,MAAA,EAFpB,YAAyB,EAAzB,aAAa,oBAAG,SAAS,MAAA,EACzB,YAA6B,EAA7B,eAAe,oBAAG,WAAW,MAAA;IAE7B,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;AACxB,CAAC;AAED,KAAuC,WAAM,EAAN,iBAAM,EAAN,qBAAM,EAAN,KAAM,EAAE,CAAC;yBAA1C,YAAa,EAAb,QAAQ,oBAAG,CAAC,CAAC,MAAA,EAAK,UAAU,eAAA;IAC9B,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,KAAuC,WAAW,EAAX,MAAA,SAAS,EAAE,EAAX,gBAAW,EAAX,KAAW,EAAE,CAAC;oBAA/C,YAAa,EAAb,QAAQ,oBAAG,CAAC,CAAC,MAAA,EAAK,UAAU,eAAA;IAC9B,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,KAAuC,WAAgB,EAAhB,OAAC,MAAM,EAAE,MAAM,CAAC,EAAhB,gBAAgB,EAAhB,KAAgB,EAAE,CAAC;oBAApD,YAAa,EAAb,QAAQ,oBAAG,CAAC,CAAC,MAAA,EAAK,UAAU,eAAA;IAC9B,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC"} +{"version":3,"file":"sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues2.js","sourceRoot":"","sources":["sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues2.ts"],"names":[],"mappings":";;AAMA,IAAI,MAAM,GAAU,CAAC,CAAC,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;AAC3C,IAAI,MAAM,GAAU,CAAC,CAAC,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC;AAC/C,IAAI,MAAM,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;AAC9B,SAAS,SAAS;IACd,OAAO,MAAM,CAAC;AAClB,CAAC;AAED,IAAI,WAAW,GAAsB,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC;AAC/D,IAAI,WAAW,GAAsB,CAAC,SAAS,EAAE,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC,CAAC;AACzE,IAAI,WAAW,GAAG,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;AAC7C,SAAS,cAAc;IACnB,OAAO,WAAW,CAAC;AACvB,CAAC;AAED,IAAI,KAAa,EAAE,aAAqB,EAAE,eAAuB,CAAC;AAClE,IAAI,OAAe,EAAE,KAAa,CAAC;AACnC,IAAI,QAAgB,EAAE,MAAc,EAAE,OAAe,EAAE,MAAc,CAAC;AACtE,IAAI,QAAgB,EAAE,UAA+B,EAAE,eAA8C,CAAC;AAEtG,KAA6B,UAAM,EAAN,iBAAM,EAAN,oBAAM,EAAN,IAAM,EAAE,CAAC;uBAA9B,UAAgB,EAAhB,KAAK,mBAAG,QAAQ,KAAA;IACpB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,KAA6B,WAAW,EAAX,MAAA,SAAS,EAAE,EAAX,gBAAW,EAAX,KAAW,EAAE,CAAC;mBAAnC,UAAgB,EAAhB,KAAK,mBAAG,QAAQ,KAAA;IACpB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,KAA6B,WAAgB,EAAhB,OAAC,MAAM,EAAE,MAAM,CAAC,EAAhB,gBAAgB,EAAhB,KAAgB,EAAE,CAAC;mBAAxC,UAAgB,EAAhB,KAAK,mBAAG,QAAQ,KAAA;IACpB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,KAG6B,WAAW,EAAX,2BAAW,EAAX,0BAAW,EAAX,KAAW,EAAE,CAAC;6BAHnC,UAGgB,EAHhB,qBAGJ,CAAC,QAAQ,EAAE,QAAQ,CAAC,KAAA,EAFpB,UAAyB,EAAzB,aAAa,mBAAG,SAAS,KAAA,EACzB,UAA6B,EAA7B,eAAe,mBAAG,WAAW,KAAA;IAE7B,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;AAC/B,CAAC;AACD,KAG6B,WAAgB,EAAhB,MAAA,cAAc,EAAE,EAAhB,gBAAgB,EAAhB,KAAgB,EAAE,CAAC;mBAHxC,UAGgB,EAHhB,qBAGJ,CAAC,QAAQ,EAAE,QAAQ,CAAC,KAAA,EAFpB,UAAyB,EAAzB,aAAa,mBAAG,SAAS,KAAA,EACzB,UAA6B,EAA7B,eAAe,mBAAG,WAAW,KAAA;IAE7B,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;AAC/B,CAAC;AACD,KAG6B,WAA0B,EAA1B,OAAC,WAAW,EAAE,WAAW,CAAC,EAA1B,gBAA0B,EAA1B,KAA0B,EAAE,CAAC;mBAHlD,UAGgB,EAHhB,qBAGJ,CAAC,QAAQ,EAAE,QAAQ,CAAC,KAAA,EAFpB,UAAyB,EAAzB,aAAa,mBAAG,SAAS,KAAA,EACzB,UAA6B,EAA7B,eAAe,mBAAG,WAAW,KAAA;IAE7B,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;AAC/B,CAAC;AAED,KAAuB,WAAM,EAAN,iBAAM,EAAN,qBAAM,EAAN,KAAM,EAAE,CAAC;IAA1B,qBAAY,EAAZ,OAAO,mBAAG,CAAC,CAAC,KAAA;IACd,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;AACzB,CAAC;AACD,KAAuB,WAAW,EAAX,MAAA,SAAS,EAAE,EAAX,gBAAW,EAAX,KAAW,EAAE,CAAC;IAA/B,gBAAY,EAAZ,OAAO,mBAAG,CAAC,CAAC,KAAA;IACd,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;AACzB,CAAC;AACD,KAAuB,WAAgB,EAAhB,OAAC,MAAM,EAAE,MAAM,CAAC,EAAhB,gBAAgB,EAAhB,KAAgB,EAAE,CAAC;IAApC,gBAAY,EAAZ,OAAO,mBAAG,CAAC,CAAC,KAAA;IACd,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;AACzB,CAAC;AACD,KAA2B,WAAW,EAAX,2BAAW,EAAX,0BAAW,EAAX,KAAW,EAAE,CAAC;IAAnC,0BAAgB,EAAhB,KAAK,mBAAG,QAAQ,KAAA;IAClB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,KAA2B,WAAgB,EAAhB,MAAA,cAAc,EAAE,EAAhB,gBAAgB,EAAhB,KAAgB,EAAE,CAAC;IAAxC,gBAAgB,EAAhB,KAAK,mBAAG,QAAQ,KAAA;IAClB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,KAA2B,WAA0B,EAA1B,OAAC,WAAW,EAAE,WAAW,CAAC,EAA1B,gBAA0B,EAA1B,KAA0B,EAAE,CAAC;IAAlD,gBAAgB,EAAhB,KAAK,mBAAG,QAAQ,KAAA;IAClB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AAED,KAA8D,WAAM,EAAN,iBAAM,EAAN,qBAAM,EAAN,KAAM,EAAE,CAAC;wBAAjE,UAAa,EAAb,QAAQ,mBAAG,CAAC,CAAC,KAAA,EAAE,UAAiB,EAAjB,MAAM,mBAAG,QAAQ,KAAA,EAAE,UAAiB,EAAjB,OAAO,mBAAG,OAAO,KAAA;IACrD,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;AACxB,CAAC;AACD,KAA8D,WAAW,EAAX,MAAA,SAAS,EAAE,EAAX,gBAAW,EAAX,KAAW,EAAE,CAAC;mBAAtE,UAAa,EAAb,QAAQ,mBAAG,CAAC,CAAC,KAAA,EAAE,UAAiB,EAAjB,MAAM,mBAAG,QAAQ,KAAA,EAAE,WAAiB,EAAjB,OAAO,oBAAG,OAAO,MAAA;IACrD,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;AACxB,CAAC;AACD,KAA8D,WAAgB,EAAhB,OAAC,MAAM,EAAE,MAAM,CAAC,EAAhB,gBAAgB,EAAhB,KAAgB,EAAE,CAAC;oBAA3E,YAAa,EAAb,QAAQ,oBAAG,CAAC,CAAC,MAAA,EAAE,YAAiB,EAAjB,MAAM,oBAAG,QAAQ,MAAA,EAAE,YAAiB,EAAjB,OAAO,oBAAG,OAAO,MAAA;IACrD,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;AACxB,CAAC;AACD,KAG6B,WAAW,EAAX,2BAAW,EAAX,0BAAW,EAAX,KAAW,EAAE,CAAC;8BAHrC,YAAiB,EAAjB,MAAM,oBAAG,QAAQ,MAAA,EAAE,YAGD,EACH,uBAGrB,CAAC,QAAQ,EAAE,QAAQ,CAAC,MAAA,EAFpB,YAAyB,EAAzB,aAAa,oBAAG,SAAS,MAAA,EACzB,YAA6B,EAA7B,eAAe,oBAAG,WAAW,MAAA;IAE7B,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;AACxB,CAAC;AACD,KAG6B,WAAgB,EAAhB,MAAA,cAAc,EAAE,EAAhB,gBAAgB,EAAhB,KAAgB,EAAE,CAAC;oBAH1C,YAAiB,EAAjB,MAAM,oBAAG,QAAQ,MAAA,EAAE,YAGD,EACH,uBAGrB,CAAC,QAAQ,EAAE,QAAQ,CAAC,MAAA,EAFpB,YAAyB,EAAzB,aAAa,oBAAG,SAAS,MAAA,EACzB,YAA6B,EAA7B,eAAe,oBAAG,WAAW,MAAA;IAE7B,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;AACxB,CAAC;AACD,KAG6B,WAA0B,EAA1B,OAAC,WAAW,EAAE,WAAW,CAAC,EAA1B,gBAA0B,EAA1B,KAA0B,EAAE,CAAC;oBAHpD,YAAiB,EAAjB,MAAM,oBAAG,QAAQ,MAAA,EAAE,YAGD,EACH,uBAGrB,CAAC,QAAQ,EAAE,QAAQ,CAAC,MAAA,EAFpB,YAAyB,EAAzB,aAAa,oBAAG,SAAS,MAAA,EACzB,YAA6B,EAA7B,eAAe,oBAAG,WAAW,MAAA;IAE7B,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;AACxB,CAAC;AAED,KAAuC,WAAM,EAAN,iBAAM,EAAN,qBAAM,EAAN,KAAM,EAAE,CAAC;yBAA1C,YAAa,EAAb,QAAQ,oBAAG,CAAC,CAAC,MAAA,EAAK,UAAU,eAAA;IAC9B,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,KAAuC,WAAW,EAAX,MAAA,SAAS,EAAE,EAAX,gBAAW,EAAX,KAAW,EAAE,CAAC;oBAA/C,YAAa,EAAb,QAAQ,oBAAG,CAAC,CAAC,MAAA,EAAK,UAAU,eAAA;IAC9B,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,KAAuC,WAAgB,EAAhB,OAAC,MAAM,EAAE,MAAM,CAAC,EAAhB,gBAAgB,EAAhB,KAAgB,EAAE,CAAC;oBAApD,YAAa,EAAb,QAAQ,oBAAG,CAAC,CAAC,MAAA,EAAK,UAAU,eAAA;IAC9B,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC"} //// https://sokra.github.io/source-map-visualization#base64,InVzZSBzdHJpY3QiOw0KdmFyIF9hLCBfYiwgX2MsIF9kLCBfZSwgX2YsIF9nLCBfaCwgX2osIF9rLCBfbCwgX20sIF9vLCBfcCwgX3EsIF9yLCBfcywgX3QsIF91LCBfdiwgX3csIF94LCBfeSwgX3osIF8wLCBfMSwgXzIsIF8zLCBfNCwgXzUsIF82LCBfNywgXzgsIF85LCBfMTAsIF8xMSwgXzEyLCBfMTMsIF8xNCwgXzE1LCBfMTYsIF8xNywgXzE4LCBfMTksIF8yMCwgXzIxLCBfMjIsIF8yMywgXzI0LCBfMjUsIF8yNiwgXzI3LCBfMjgsIF8yOSwgXzMwLCBfMzEsIF8zMiwgXzMzLCBfMzQsIF8zNSwgXzM2LCBfMzcsIF8zODsNCnZhciByb2JvdEEgPSBbMSwgIm1vd2VyIiwgIm1vd2luZyJdOw0KdmFyIHJvYm90QiA9IFsyLCAidHJpbW1lciIsICJ0cmltbWluZyJdOw0KdmFyIHJvYm90cyA9IFtyb2JvdEEsIHJvYm90Ql07DQpmdW5jdGlvbiBnZXRSb2JvdHMoKSB7DQogICAgcmV0dXJuIHJvYm90czsNCn0NCnZhciBtdWx0aVJvYm90QSA9IFsibW93ZXIiLCBbIm1vd2luZyIsICIiXV07DQp2YXIgbXVsdGlSb2JvdEIgPSBbInRyaW1tZXIiLCBbInRyaW1taW5nIiwgImVkZ2luZyJdXTsNCnZhciBtdWx0aVJvYm90cyA9IFttdWx0aVJvYm90QSwgbXVsdGlSb2JvdEJdOw0KZnVuY3Rpb24gZ2V0TXVsdGlSb2JvdHMoKSB7DQogICAgcmV0dXJuIG11bHRpUm9ib3RzOw0KfQ0KdmFyIG5hbWVBLCBwcmltYXJ5U2tpbGxBLCBzZWNvbmRhcnlTa2lsbEE7DQp2YXIgbnVtYmVyQiwgbmFtZUI7DQp2YXIgbnVtYmVyQTIsIG5hbWVBMiwgc2tpbGxBMiwgbmFtZU1BOw0KdmFyIG51bWJlckEzLCByb2JvdEFJbmZvLCBtdWx0aVJvYm90QUluZm87DQpmb3IgKHZhciBfaSA9IDAsIHJvYm90c18xID0gcm9ib3RzOyBfaSA8IHJvYm90c18xLmxlbmd0aDsgX2krKykgew0KICAgIF9hID0gcm9ib3RzXzFbX2ldLCBfYiA9IF9hWzFdLCBuYW1lQSA9IF9iID09PSB2b2lkIDAgPyAibm9OYW1lIiA6IF9iOw0KICAgIGNvbnNvbGUubG9nKG5hbWVBKTsNCn0NCmZvciAodmFyIF8zOSA9IDAsIF80MCA9IGdldFJvYm90cygpOyBfMzkgPCBfNDAubGVuZ3RoOyBfMzkrKykgew0KICAgIF9jID0gXzQwW18zOV0sIF9kID0gX2NbMV0sIG5hbWVBID0gX2QgPT09IHZvaWQgMCA/ICJub05hbWUiIDogX2Q7DQogICAgY29uc29sZS5sb2cobmFtZUEpOw0KfQ0KZm9yICh2YXIgXzQxID0gMCwgXzQyID0gW3JvYm90QSwgcm9ib3RCXTsgXzQxIDwgXzQyLmxlbmd0aDsgXzQxKyspIHsNCiAgICBfZSA9IF80MltfNDFdLCBfZiA9IF9lWzFdLCBuYW1lQSA9IF9mID09PSB2b2lkIDAgPyAibm9OYW1lIiA6IF9mOw0KICAgIGNvbnNvbGUubG9nKG5hbWVBKTsNCn0NCmZvciAodmFyIF80MyA9IDAsIG11bHRpUm9ib3RzXzEgPSBtdWx0aVJvYm90czsgXzQzIDwgbXVsdGlSb2JvdHNfMS5sZW5ndGg7IF80MysrKSB7DQogICAgX2cgPSBtdWx0aVJvYm90c18xW180M10sIF9oID0gX2dbMV0sIF9qID0gX2ggPT09IHZvaWQgMCA/IFsic2tpbGwxIiwgInNraWxsMiJdIDogX2gsIF9rID0gX2pbMF0sIHByaW1hcnlTa2lsbEEgPSBfayA9PT0gdm9pZCAwID8gInByaW1hcnkiIDogX2ssIF9sID0gX2pbMV0sIHNlY29uZGFyeVNraWxsQSA9IF9sID09PSB2b2lkIDAgPyAic2Vjb25kYXJ5IiA6IF9sOw0KICAgIGNvbnNvbGUubG9nKHByaW1hcnlTa2lsbEEpOw0KfQ0KZm9yICh2YXIgXzQ0ID0gMCwgXzQ1ID0gZ2V0TXVsdGlSb2JvdHMoKTsgXzQ0IDwgXzQ1Lmxlbmd0aDsgXzQ0KyspIHsNCiAgICBfbSA9IF80NVtfNDRdLCBfbyA9IF9tWzFdLCBfcCA9IF9vID09PSB2b2lkIDAgPyBbInNraWxsMSIsICJza2lsbDIiXSA6IF9vLCBfcSA9IF9wWzBdLCBwcmltYXJ5U2tpbGxBID0gX3EgPT09IHZvaWQgMCA/ICJwcmltYXJ5IiA6IF9xLCBfciA9IF9wWzFdLCBzZWNvbmRhcnlTa2lsbEEgPSBfciA9PT0gdm9pZCAwID8gInNlY29uZGFyeSIgOiBfcjsNCiAgICBjb25zb2xlLmxvZyhwcmltYXJ5U2tpbGxBKTsNCn0NCmZvciAodmFyIF80NiA9IDAsIF80NyA9IFttdWx0aVJvYm90QSwgbXVsdGlSb2JvdEJdOyBfNDYgPCBfNDcubGVuZ3RoOyBfNDYrKykgew0KICAgIF9zID0gXzQ3W180Nl0sIF90ID0gX3NbMV0sIF91ID0gX3QgPT09IHZvaWQgMCA/IFsic2tpbGwxIiwgInNraWxsMiJdIDogX3QsIF92ID0gX3VbMF0sIHByaW1hcnlTa2lsbEEgPSBfdiA9PT0gdm9pZCAwID8gInByaW1hcnkiIDogX3YsIF93ID0gX3VbMV0sIHNlY29uZGFyeVNraWxsQSA9IF93ID09PSB2b2lkIDAgPyAic2Vjb25kYXJ5IiA6IF93Ow0KICAgIGNvbnNvbGUubG9nKHByaW1hcnlTa2lsbEEpOw0KfQ0KZm9yICh2YXIgXzQ4ID0gMCwgcm9ib3RzXzIgPSByb2JvdHM7IF80OCA8IHJvYm90c18yLmxlbmd0aDsgXzQ4KyspIHsNCiAgICBfeCA9IHJvYm90c18yW180OF1bMF0sIG51bWJlckIgPSBfeCA9PT0gdm9pZCAwID8gLTEgOiBfeDsNCiAgICBjb25zb2xlLmxvZyhudW1iZXJCKTsNCn0NCmZvciAodmFyIF80OSA9IDAsIF81MCA9IGdldFJvYm90cygpOyBfNDkgPCBfNTAubGVuZ3RoOyBfNDkrKykgew0KICAgIF95ID0gXzUwW180OV1bMF0sIG51bWJlckIgPSBfeSA9PT0gdm9pZCAwID8gLTEgOiBfeTsNCiAgICBjb25zb2xlLmxvZyhudW1iZXJCKTsNCn0NCmZvciAodmFyIF81MSA9IDAsIF81MiA9IFtyb2JvdEEsIHJvYm90Ql07IF81MSA8IF81Mi5sZW5ndGg7IF81MSsrKSB7DQogICAgX3ogPSBfNTJbXzUxXVswXSwgbnVtYmVyQiA9IF96ID09PSB2b2lkIDAgPyAtMSA6IF96Ow0KICAgIGNvbnNvbGUubG9nKG51bWJlckIpOw0KfQ0KZm9yICh2YXIgXzUzID0gMCwgbXVsdGlSb2JvdHNfMiA9IG11bHRpUm9ib3RzOyBfNTMgPCBtdWx0aVJvYm90c18yLmxlbmd0aDsgXzUzKyspIHsNCiAgICBfMCA9IG11bHRpUm9ib3RzXzJbXzUzXVswXSwgbmFtZUIgPSBfMCA9PT0gdm9pZCAwID8gIm5vTmFtZSIgOiBfMDsNCiAgICBjb25zb2xlLmxvZyhuYW1lQik7DQp9DQpmb3IgKHZhciBfNTQgPSAwLCBfNTUgPSBnZXRNdWx0aVJvYm90cygpOyBfNTQgPCBfNTUubGVuZ3RoOyBfNTQrKykgew0KICAgIF8xID0gXzU1W181NF1bMF0sIG5hbWVCID0gXzEgPT09IHZvaWQgMCA/ICJub05hbWUiIDogXzE7DQogICAgY29uc29sZS5sb2cobmFtZUIpOw0KfQ0KZm9yICh2YXIgXzU2ID0gMCwgXzU3ID0gW211bHRpUm9ib3RBLCBtdWx0aVJvYm90Ql07IF81NiA8IF81Ny5sZW5ndGg7IF81NisrKSB7DQogICAgXzIgPSBfNTdbXzU2XVswXSwgbmFtZUIgPSBfMiA9PT0gdm9pZCAwID8gIm5vTmFtZSIgOiBfMjsNCiAgICBjb25zb2xlLmxvZyhuYW1lQik7DQp9DQpmb3IgKHZhciBfNTggPSAwLCByb2JvdHNfMyA9IHJvYm90czsgXzU4IDwgcm9ib3RzXzMubGVuZ3RoOyBfNTgrKykgew0KICAgIF8zID0gcm9ib3RzXzNbXzU4XSwgXzQgPSBfM1swXSwgbnVtYmVyQTIgPSBfNCA9PT0gdm9pZCAwID8gLTEgOiBfNCwgXzUgPSBfM1sxXSwgbmFtZUEyID0gXzUgPT09IHZvaWQgMCA/ICJub05hbWUiIDogXzUsIF82ID0gXzNbMl0sIHNraWxsQTIgPSBfNiA9PT0gdm9pZCAwID8gInNraWxsIiA6IF82Ow0KICAgIGNvbnNvbGUubG9nKG5hbWVBMik7DQp9DQpmb3IgKHZhciBfNTkgPSAwLCBfNjAgPSBnZXRSb2JvdHMoKTsgXzU5IDwgXzYwLmxlbmd0aDsgXzU5KyspIHsNCiAgICBfNyA9IF82MFtfNTldLCBfOCA9IF83WzBdLCBudW1iZXJBMiA9IF84ID09PSB2b2lkIDAgPyAtMSA6IF84LCBfOSA9IF83WzFdLCBuYW1lQTIgPSBfOSA9PT0gdm9pZCAwID8gIm5vTmFtZSIgOiBfOSwgXzEwID0gXzdbMl0sIHNraWxsQTIgPSBfMTAgPT09IHZvaWQgMCA/ICJza2lsbCIgOiBfMTA7DQogICAgY29uc29sZS5sb2cobmFtZUEyKTsNCn0NCmZvciAodmFyIF82MSA9IDAsIF82MiA9IFtyb2JvdEEsIHJvYm90Ql07IF82MSA8IF82Mi5sZW5ndGg7IF82MSsrKSB7DQogICAgXzExID0gXzYyW182MV0sIF8xMiA9IF8xMVswXSwgbnVtYmVyQTIgPSBfMTIgPT09IHZvaWQgMCA/IC0xIDogXzEyLCBfMTMgPSBfMTFbMV0sIG5hbWVBMiA9IF8xMyA9PT0gdm9pZCAwID8gIm5vTmFtZSIgOiBfMTMsIF8xNCA9IF8xMVsyXSwgc2tpbGxBMiA9IF8xNCA9PT0gdm9pZCAwID8gInNraWxsIiA6IF8xNDsNCiAgICBjb25zb2xlLmxvZyhuYW1lQTIpOw0KfQ0KZm9yICh2YXIgXzYzID0gMCwgbXVsdGlSb2JvdHNfMyA9IG11bHRpUm9ib3RzOyBfNjMgPCBtdWx0aVJvYm90c18zLmxlbmd0aDsgXzYzKyspIHsNCiAgICBfMTUgPSBtdWx0aVJvYm90c18zW182M10sIF8xNiA9IF8xNVswXSwgbmFtZU1BID0gXzE2ID09PSB2b2lkIDAgPyAibm9OYW1lIiA6IF8xNiwgXzE3ID0gXzE1WzFdLCBfMTggPSBfMTcgPT09IHZvaWQgMCA/IFsic2tpbGwxIiwgInNraWxsMiJdIDogXzE3LCBfMTkgPSBfMThbMF0sIHByaW1hcnlTa2lsbEEgPSBfMTkgPT09IHZvaWQgMCA/ICJwcmltYXJ5IiA6IF8xOSwgXzIwID0gXzE4WzFdLCBzZWNvbmRhcnlTa2lsbEEgPSBfMjAgPT09IHZvaWQgMCA/ICJzZWNvbmRhcnkiIDogXzIwOw0KICAgIGNvbnNvbGUubG9nKG5hbWVNQSk7DQp9DQpmb3IgKHZhciBfNjQgPSAwLCBfNjUgPSBnZXRNdWx0aVJvYm90cygpOyBfNjQgPCBfNjUubGVuZ3RoOyBfNjQrKykgew0KICAgIF8yMSA9IF82NVtfNjRdLCBfMjIgPSBfMjFbMF0sIG5hbWVNQSA9IF8yMiA9PT0gdm9pZCAwID8gIm5vTmFtZSIgOiBfMjIsIF8yMyA9IF8yMVsxXSwgXzI0ID0gXzIzID09PSB2b2lkIDAgPyBbInNraWxsMSIsICJza2lsbDIiXSA6IF8yMywgXzI1ID0gXzI0WzBdLCBwcmltYXJ5U2tpbGxBID0gXzI1ID09PSB2b2lkIDAgPyAicHJpbWFyeSIgOiBfMjUsIF8yNiA9IF8yNFsxXSwgc2Vjb25kYXJ5U2tpbGxBID0gXzI2ID09PSB2b2lkIDAgPyAic2Vjb25kYXJ5IiA6IF8yNjsNCiAgICBjb25zb2xlLmxvZyhuYW1lTUEpOw0KfQ0KZm9yICh2YXIgXzY2ID0gMCwgXzY3ID0gW211bHRpUm9ib3RBLCBtdWx0aVJvYm90Ql07IF82NiA8IF82Ny5sZW5ndGg7IF82NisrKSB7DQogICAgXzI3ID0gXzY3W182Nl0sIF8yOCA9IF8yN1swXSwgbmFtZU1BID0gXzI4ID09PSB2b2lkIDAgPyAibm9OYW1lIiA6IF8yOCwgXzI5ID0gXzI3WzFdLCBfMzAgPSBfMjkgPT09IHZvaWQgMCA/IFsic2tpbGwxIiwgInNraWxsMiJdIDogXzI5LCBfMzEgPSBfMzBbMF0sIHByaW1hcnlTa2lsbEEgPSBfMzEgPT09IHZvaWQgMCA/ICJwcmltYXJ5IiA6IF8zMSwgXzMyID0gXzMwWzFdLCBzZWNvbmRhcnlTa2lsbEEgPSBfMzIgPT09IHZvaWQgMCA/ICJzZWNvbmRhcnkiIDogXzMyOw0KICAgIGNvbnNvbGUubG9nKG5hbWVNQSk7DQp9DQpmb3IgKHZhciBfNjggPSAwLCByb2JvdHNfNCA9IHJvYm90czsgXzY4IDwgcm9ib3RzXzQubGVuZ3RoOyBfNjgrKykgew0KICAgIF8zMyA9IHJvYm90c180W182OF0sIF8zNCA9IF8zM1swXSwgbnVtYmVyQTMgPSBfMzQgPT09IHZvaWQgMCA/IC0xIDogXzM0LCByb2JvdEFJbmZvID0gXzMzLnNsaWNlKDEpOw0KICAgIGNvbnNvbGUubG9nKG51bWJlckEzKTsNCn0NCmZvciAodmFyIF82OSA9IDAsIF83MCA9IGdldFJvYm90cygpOyBfNjkgPCBfNzAubGVuZ3RoOyBfNjkrKykgew0KICAgIF8zNSA9IF83MFtfNjldLCBfMzYgPSBfMzVbMF0sIG51bWJlckEzID0gXzM2ID09PSB2b2lkIDAgPyAtMSA6IF8zNiwgcm9ib3RBSW5mbyA9IF8zNS5zbGljZSgxKTsNCiAgICBjb25zb2xlLmxvZyhudW1iZXJBMyk7DQp9DQpmb3IgKHZhciBfNzEgPSAwLCBfNzIgPSBbcm9ib3RBLCByb2JvdEJdOyBfNzEgPCBfNzIubGVuZ3RoOyBfNzErKykgew0KICAgIF8zNyA9IF83MltfNzFdLCBfMzggPSBfMzdbMF0sIG51bWJlckEzID0gXzM4ID09PSB2b2lkIDAgPyAtMSA6IF8zOCwgcm9ib3RBSW5mbyA9IF8zNy5zbGljZSgxKTsNCiAgICBjb25zb2xlLmxvZyhudW1iZXJBMyk7DQp9DQovLyMgc291cmNlTWFwcGluZ1VSTD1zb3VyY2VNYXBWYWxpZGF0aW9uRGVzdHJ1Y3R1cmluZ0Zvck9mQXJyYXlCaW5kaW5nUGF0dGVybkRlZmF1bHRWYWx1ZXMyLmpzLm1hcA==,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic291cmNlTWFwVmFsaWRhdGlvbkRlc3RydWN0dXJpbmdGb3JPZkFycmF5QmluZGluZ1BhdHRlcm5EZWZhdWx0VmFsdWVzMi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInNvdXJjZU1hcFZhbGlkYXRpb25EZXN0cnVjdHVyaW5nRm9yT2ZBcnJheUJpbmRpbmdQYXR0ZXJuRGVmYXVsdFZhbHVlczIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFNQSxJQUFJLE1BQU0sR0FBVSxDQUFDLENBQUMsRUFBRSxPQUFPLEVBQUUsUUFBUSxDQUFDLENBQUM7QUFDM0MsSUFBSSxNQUFNLEdBQVUsQ0FBQyxDQUFDLEVBQUUsU0FBUyxFQUFFLFVBQVUsQ0FBQyxDQUFDO0FBQy9DLElBQUksTUFBTSxHQUFHLENBQUMsTUFBTSxFQUFFLE1BQU0sQ0FBQyxDQUFDO0FBQzlCLFNBQVMsU0FBUztJQUNkLE9BQU8sTUFBTSxDQUFDO0FBQ2xCLENBQUM7QUFFRCxJQUFJLFdBQVcsR0FBc0IsQ0FBQyxPQUFPLEVBQUUsQ0FBQyxRQUFRLEVBQUUsRUFBRSxDQUFDLENBQUMsQ0FBQztBQUMvRCxJQUFJLFdBQVcsR0FBc0IsQ0FBQyxTQUFTLEVBQUUsQ0FBQyxVQUFVLEVBQUUsUUFBUSxDQUFDLENBQUMsQ0FBQztBQUN6RSxJQUFJLFdBQVcsR0FBRyxDQUFDLFdBQVcsRUFBRSxXQUFXLENBQUMsQ0FBQztBQUM3QyxTQUFTLGNBQWM7SUFDbkIsT0FBTyxXQUFXLENBQUM7QUFDdkIsQ0FBQztBQUVELElBQUksS0FBYSxFQUFFLGFBQXFCLEVBQUUsZUFBdUIsQ0FBQztBQUNsRSxJQUFJLE9BQWUsRUFBRSxLQUFhLENBQUM7QUFDbkMsSUFBSSxRQUFnQixFQUFFLE1BQWMsRUFBRSxPQUFlLEVBQUUsTUFBYyxDQUFDO0FBQ3RFLElBQUksUUFBZ0IsRUFBRSxVQUErQixFQUFFLGVBQThDLENBQUM7QUFFdEcsS0FBNkIsVUFBTSxFQUFOLGlCQUFNLEVBQU4sb0JBQU0sRUFBTixJQUFNLEVBQUUsQ0FBQzt1QkFBOUIsVUFBZ0IsRUFBaEIsS0FBSyxtQkFBRyxRQUFRLEtBQUE7SUFDcEIsT0FBTyxDQUFDLEdBQUcsQ0FBQyxLQUFLLENBQUMsQ0FBQztBQUN2QixDQUFDO0FBQ0QsS0FBNkIsV0FBVyxFQUFYLE1BQUEsU0FBUyxFQUFFLEVBQVgsZ0JBQVcsRUFBWCxLQUFXLEVBQUUsQ0FBQzttQkFBbkMsVUFBZ0IsRUFBaEIsS0FBSyxtQkFBRyxRQUFRLEtBQUE7SUFDcEIsT0FBTyxDQUFDLEdBQUcsQ0FBQyxLQUFLLENBQUMsQ0FBQztBQUN2QixDQUFDO0FBQ0QsS0FBNkIsV0FBZ0IsRUFBaEIsT0FBQyxNQUFNLEVBQUUsTUFBTSxDQUFDLEVBQWhCLGdCQUFnQixFQUFoQixLQUFnQixFQUFFLENBQUM7bUJBQXhDLFVBQWdCLEVBQWhCLEtBQUssbUJBQUcsUUFBUSxLQUFBO0lBQ3BCLE9BQU8sQ0FBQyxHQUFHLENBQUMsS0FBSyxDQUFDLENBQUM7QUFDdkIsQ0FBQztBQUNELEtBRzZCLFdBQVcsRUFBWCwyQkFBVyxFQUFYLDBCQUFXLEVBQVgsS0FBVyxFQUFFLENBQUM7NkJBSG5DLFVBR2dCLEVBSGhCLHFCQUdKLENBQUMsUUFBUSxFQUFFLFFBQVEsQ0FBQyxLQUFBLEVBRnBCLFVBQXlCLEVBQXpCLGFBQWEsbUJBQUcsU0FBUyxLQUFBLEVBQ3pCLFVBQTZCLEVBQTdCLGVBQWUsbUJBQUcsV0FBVyxLQUFBO0lBRTdCLE9BQU8sQ0FBQyxHQUFHLENBQUMsYUFBYSxDQUFDLENBQUM7QUFDL0IsQ0FBQztBQUNELEtBRzZCLFdBQWdCLEVBQWhCLE1BQUEsY0FBYyxFQUFFLEVBQWhCLGdCQUFnQixFQUFoQixLQUFnQixFQUFFLENBQUM7bUJBSHhDLFVBR2dCLEVBSGhCLHFCQUdKLENBQUMsUUFBUSxFQUFFLFFBQVEsQ0FBQyxLQUFBLEVBRnBCLFVBQXlCLEVBQXpCLGFBQWEsbUJBQUcsU0FBUyxLQUFBLEVBQ3pCLFVBQTZCLEVBQTdCLGVBQWUsbUJBQUcsV0FBVyxLQUFBO0lBRTdCLE9BQU8sQ0FBQyxHQUFHLENBQUMsYUFBYSxDQUFDLENBQUM7QUFDL0IsQ0FBQztBQUNELEtBRzZCLFdBQTBCLEVBQTFCLE9BQUMsV0FBVyxFQUFFLFdBQVcsQ0FBQyxFQUExQixnQkFBMEIsRUFBMUIsS0FBMEIsRUFBRSxDQUFDO21CQUhsRCxVQUdnQixFQUhoQixxQkFHSixDQUFDLFFBQVEsRUFBRSxRQUFRLENBQUMsS0FBQSxFQUZwQixVQUF5QixFQUF6QixhQUFhLG1CQUFHLFNBQVMsS0FBQSxFQUN6QixVQUE2QixFQUE3QixlQUFlLG1CQUFHLFdBQVcsS0FBQTtJQUU3QixPQUFPLENBQUMsR0FBRyxDQUFDLGFBQWEsQ0FBQyxDQUFDO0FBQy9CLENBQUM7QUFFRCxLQUF1QixXQUFNLEVBQU4saUJBQU0sRUFBTixxQkFBTSxFQUFOLEtBQU0sRUFBRSxDQUFDO0lBQTFCLHFCQUFZLEVBQVosT0FBTyxtQkFBRyxDQUFDLENBQUMsS0FBQTtJQUNkLE9BQU8sQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLENBQUM7QUFDekIsQ0FBQztBQUNELEtBQXVCLFdBQVcsRUFBWCxNQUFBLFNBQVMsRUFBRSxFQUFYLGdCQUFXLEVBQVgsS0FBVyxFQUFFLENBQUM7SUFBL0IsZ0JBQVksRUFBWixPQUFPLG1CQUFHLENBQUMsQ0FBQyxLQUFBO0lBQ2QsT0FBTyxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsQ0FBQztBQUN6QixDQUFDO0FBQ0QsS0FBdUIsV0FBZ0IsRUFBaEIsT0FBQyxNQUFNLEVBQUUsTUFBTSxDQUFDLEVBQWhCLGdCQUFnQixFQUFoQixLQUFnQixFQUFFLENBQUM7SUFBcEMsZ0JBQVksRUFBWixPQUFPLG1CQUFHLENBQUMsQ0FBQyxLQUFBO0lBQ2QsT0FBTyxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsQ0FBQztBQUN6QixDQUFDO0FBQ0QsS0FBMkIsV0FBVyxFQUFYLDJCQUFXLEVBQVgsMEJBQVcsRUFBWCxLQUFXLEVBQUUsQ0FBQztJQUFuQywwQkFBZ0IsRUFBaEIsS0FBSyxtQkFBRyxRQUFRLEtBQUE7SUFDbEIsT0FBTyxDQUFDLEdBQUcsQ0FBQyxLQUFLLENBQUMsQ0FBQztBQUN2QixDQUFDO0FBQ0QsS0FBMkIsV0FBZ0IsRUFBaEIsTUFBQSxjQUFjLEVBQUUsRUFBaEIsZ0JBQWdCLEVBQWhCLEtBQWdCLEVBQUUsQ0FBQztJQUF4QyxnQkFBZ0IsRUFBaEIsS0FBSyxtQkFBRyxRQUFRLEtBQUE7SUFDbEIsT0FBTyxDQUFDLEdBQUcsQ0FBQyxLQUFLLENBQUMsQ0FBQztBQUN2QixDQUFDO0FBQ0QsS0FBMkIsV0FBMEIsRUFBMUIsT0FBQyxXQUFXLEVBQUUsV0FBVyxDQUFDLEVBQTFCLGdCQUEwQixFQUExQixLQUEwQixFQUFFLENBQUM7SUFBbEQsZ0JBQWdCLEVBQWhCLEtBQUssbUJBQUcsUUFBUSxLQUFBO0lBQ2xCLE9BQU8sQ0FBQyxHQUFHLENBQUMsS0FBSyxDQUFDLENBQUM7QUFDdkIsQ0FBQztBQUVELEtBQThELFdBQU0sRUFBTixpQkFBTSxFQUFOLHFCQUFNLEVBQU4sS0FBTSxFQUFFLENBQUM7d0JBQWpFLFVBQWEsRUFBYixRQUFRLG1CQUFHLENBQUMsQ0FBQyxLQUFBLEVBQUUsVUFBaUIsRUFBakIsTUFBTSxtQkFBRyxRQUFRLEtBQUEsRUFBRSxVQUFpQixFQUFqQixPQUFPLG1CQUFHLE9BQU8sS0FBQTtJQUNyRCxPQUFPLENBQUMsR0FBRyxDQUFDLE1BQU0sQ0FBQyxDQUFDO0FBQ3hCLENBQUM7QUFDRCxLQUE4RCxXQUFXLEVBQVgsTUFBQSxTQUFTLEVBQUUsRUFBWCxnQkFBVyxFQUFYLEtBQVcsRUFBRSxDQUFDO21CQUF0RSxVQUFhLEVBQWIsUUFBUSxtQkFBRyxDQUFDLENBQUMsS0FBQSxFQUFFLFVBQWlCLEVBQWpCLE1BQU0sbUJBQUcsUUFBUSxLQUFBLEVBQUUsV0FBaUIsRUFBakIsT0FBTyxvQkFBRyxPQUFPLE1BQUE7SUFDckQsT0FBTyxDQUFDLEdBQUcsQ0FBQyxNQUFNLENBQUMsQ0FBQztBQUN4QixDQUFDO0FBQ0QsS0FBOEQsV0FBZ0IsRUFBaEIsT0FBQyxNQUFNLEVBQUUsTUFBTSxDQUFDLEVBQWhCLGdCQUFnQixFQUFoQixLQUFnQixFQUFFLENBQUM7b0JBQTNFLFlBQWEsRUFBYixRQUFRLG9CQUFHLENBQUMsQ0FBQyxNQUFBLEVBQUUsWUFBaUIsRUFBakIsTUFBTSxvQkFBRyxRQUFRLE1BQUEsRUFBRSxZQUFpQixFQUFqQixPQUFPLG9CQUFHLE9BQU8sTUFBQTtJQUNyRCxPQUFPLENBQUMsR0FBRyxDQUFDLE1BQU0sQ0FBQyxDQUFDO0FBQ3hCLENBQUM7QUFDRCxLQUc2QixXQUFXLEVBQVgsMkJBQVcsRUFBWCwwQkFBVyxFQUFYLEtBQVcsRUFBRSxDQUFDOzhCQUhyQyxZQUFpQixFQUFqQixNQUFNLG9CQUFHLFFBQVEsTUFBQSxFQUFFLFlBR0QsRUFIQyx1QkFHckIsQ0FBQyxRQUFRLEVBQUUsUUFBUSxDQUFDLE1BQUEsRUFGcEIsWUFBeUIsRUFBekIsYUFBYSxvQkFBRyxTQUFTLE1BQUEsRUFDekIsWUFBNkIsRUFBN0IsZUFBZSxvQkFBRyxXQUFXLE1BQUE7SUFFN0IsT0FBTyxDQUFDLEdBQUcsQ0FBQyxNQUFNLENBQUMsQ0FBQztBQUN4QixDQUFDO0FBQ0QsS0FHNkIsV0FBZ0IsRUFBaEIsTUFBQSxjQUFjLEVBQUUsRUFBaEIsZ0JBQWdCLEVBQWhCLEtBQWdCLEVBQUUsQ0FBQztvQkFIMUMsWUFBaUIsRUFBakIsTUFBTSxvQkFBRyxRQUFRLE1BQUEsRUFBRSxZQUdELEVBSEMsdUJBR3JCLENBQUMsUUFBUSxFQUFFLFFBQVEsQ0FBQyxNQUFBLEVBRnBCLFlBQXlCLEVBQXpCLGFBQWEsb0JBQUcsU0FBUyxNQUFBLEVBQ3pCLFlBQTZCLEVBQTdCLGVBQWUsb0JBQUcsV0FBVyxNQUFBO0lBRTdCLE9BQU8sQ0FBQyxHQUFHLENBQUMsTUFBTSxDQUFDLENBQUM7QUFDeEIsQ0FBQztBQUNELEtBRzZCLFdBQTBCLEVBQTFCLE9BQUMsV0FBVyxFQUFFLFdBQVcsQ0FBQyxFQUExQixnQkFBMEIsRUFBMUIsS0FBMEIsRUFBRSxDQUFDO29CQUhwRCxZQUFpQixFQUFqQixNQUFNLG9CQUFHLFFBQVEsTUFBQSxFQUFFLFlBR0QsRUFIQyx1QkFHckIsQ0FBQyxRQUFRLEVBQUUsUUFBUSxDQUFDLE1BQUEsRUFGcEIsWUFBeUIsRUFBekIsYUFBYSxvQkFBRyxTQUFTLE1BQUEsRUFDekIsWUFBNkIsRUFBN0IsZUFBZSxvQkFBRyxXQUFXLE1BQUE7SUFFN0IsT0FBTyxDQUFDLEdBQUcsQ0FBQyxNQUFNLENBQUMsQ0FBQztBQUN4QixDQUFDO0FBRUQsS0FBdUMsV0FBTSxFQUFOLGlCQUFNLEVBQU4scUJBQU0sRUFBTixLQUFNLEVBQUUsQ0FBQzt5QkFBMUMsWUFBYSxFQUFiLFFBQVEsb0JBQUcsQ0FBQyxDQUFDLE1BQUEsRUFBSyxVQUFVLGVBQUE7SUFDOUIsT0FBTyxDQUFDLEdBQUcsQ0FBQyxRQUFRLENBQUMsQ0FBQztBQUMxQixDQUFDO0FBQ0QsS0FBdUMsV0FBVyxFQUFYLE1BQUEsU0FBUyxFQUFFLEVBQVgsZ0JBQVcsRUFBWCxLQUFXLEVBQUUsQ0FBQztvQkFBL0MsWUFBYSxFQUFiLFFBQVEsb0JBQUcsQ0FBQyxDQUFDLE1BQUEsRUFBSyxVQUFVLGVBQUE7SUFDOUIsT0FBTyxDQUFDLEdBQUcsQ0FBQyxRQUFRLENBQUMsQ0FBQztBQUMxQixDQUFDO0FBQ0QsS0FBdUMsV0FBZ0IsRUFBaEIsT0FBQyxNQUFNLEVBQUUsTUFBTSxDQUFDLEVBQWhCLGdCQUFnQixFQUFoQixLQUFnQixFQUFFLENBQUM7b0JBQXBELFlBQWEsRUFBYixRQUFRLG9CQUFHLENBQUMsQ0FBQyxNQUFBLEVBQUssVUFBVSxlQUFBO0lBQzlCLE9BQU8sQ0FBQyxHQUFHLENBQUMsUUFBUSxDQUFDLENBQUM7QUFDMUIsQ0FBQyJ9,ZGVjbGFyZSB2YXIgY29uc29sZTogewogICAgbG9nKG1zZzogYW55KTogdm9pZDsKfQp0eXBlIFJvYm90ID0gW251bWJlciwgc3RyaW5nLCBzdHJpbmddOwp0eXBlIE11bHRpU2tpbGxlZFJvYm90ID0gW3N0cmluZywgW3N0cmluZywgc3RyaW5nXV07CgpsZXQgcm9ib3RBOiBSb2JvdCA9IFsxLCAibW93ZXIiLCAibW93aW5nIl07CmxldCByb2JvdEI6IFJvYm90ID0gWzIsICJ0cmltbWVyIiwgInRyaW1taW5nIl07CmxldCByb2JvdHMgPSBbcm9ib3RBLCByb2JvdEJdOwpmdW5jdGlvbiBnZXRSb2JvdHMoKSB7CiAgICByZXR1cm4gcm9ib3RzOwp9CgpsZXQgbXVsdGlSb2JvdEE6IE11bHRpU2tpbGxlZFJvYm90ID0gWyJtb3dlciIsIFsibW93aW5nIiwgIiJdXTsKbGV0IG11bHRpUm9ib3RCOiBNdWx0aVNraWxsZWRSb2JvdCA9IFsidHJpbW1lciIsIFsidHJpbW1pbmciLCAiZWRnaW5nIl1dOwpsZXQgbXVsdGlSb2JvdHMgPSBbbXVsdGlSb2JvdEEsIG11bHRpUm9ib3RCXTsKZnVuY3Rpb24gZ2V0TXVsdGlSb2JvdHMoKSB7CiAgICByZXR1cm4gbXVsdGlSb2JvdHM7Cn0KCmxldCBuYW1lQTogc3RyaW5nLCBwcmltYXJ5U2tpbGxBOiBzdHJpbmcsIHNlY29uZGFyeVNraWxsQTogc3RyaW5nOwpsZXQgbnVtYmVyQjogbnVtYmVyLCBuYW1lQjogc3RyaW5nOwpsZXQgbnVtYmVyQTI6IG51bWJlciwgbmFtZUEyOiBzdHJpbmcsIHNraWxsQTI6IHN0cmluZywgbmFtZU1BOiBzdHJpbmc7CmxldCBudW1iZXJBMzogbnVtYmVyLCByb2JvdEFJbmZvOiAobnVtYmVyIHwgc3RyaW5nKVtdLCBtdWx0aVJvYm90QUluZm86IChzdHJpbmcgfCBbc3RyaW5nLCBzdHJpbmddKVtdOwoKZm9yIChbLCBuYW1lQSA9ICJub05hbWUiXSBvZiByb2JvdHMpIHsKICAgIGNvbnNvbGUubG9nKG5hbWVBKTsKfQpmb3IgKFssIG5hbWVBID0gIm5vTmFtZSJdIG9mIGdldFJvYm90cygpKSB7CiAgICBjb25zb2xlLmxvZyhuYW1lQSk7Cn0KZm9yIChbLCBuYW1lQSA9ICJub05hbWUiXSBvZiBbcm9ib3RBLCByb2JvdEJdKSB7CiAgICBjb25zb2xlLmxvZyhuYW1lQSk7Cn0KZm9yIChbLCBbCiAgICBwcmltYXJ5U2tpbGxBID0gInByaW1hcnkiLAogICAgc2Vjb25kYXJ5U2tpbGxBID0gInNlY29uZGFyeSIKXSA9IFsic2tpbGwxIiwgInNraWxsMiJdXSBvZiBtdWx0aVJvYm90cykgewogICAgY29uc29sZS5sb2cocHJpbWFyeVNraWxsQSk7Cn0KZm9yIChbLCBbCiAgICBwcmltYXJ5U2tpbGxBID0gInByaW1hcnkiLAogICAgc2Vjb25kYXJ5U2tpbGxBID0gInNlY29uZGFyeSIKXSA9IFsic2tpbGwxIiwgInNraWxsMiJdXSBvZiBnZXRNdWx0aVJvYm90cygpKSB7CiAgICBjb25zb2xlLmxvZyhwcmltYXJ5U2tpbGxBKTsKfQpmb3IgKFssIFsKICAgIHByaW1hcnlTa2lsbEEgPSAicHJpbWFyeSIsCiAgICBzZWNvbmRhcnlTa2lsbEEgPSAic2Vjb25kYXJ5IgpdID0gWyJza2lsbDEiLCAic2tpbGwyIl1dIG9mIFttdWx0aVJvYm90QSwgbXVsdGlSb2JvdEJdKSB7CiAgICBjb25zb2xlLmxvZyhwcmltYXJ5U2tpbGxBKTsKfQoKZm9yIChbbnVtYmVyQiA9IC0xXSBvZiByb2JvdHMpIHsKICAgIGNvbnNvbGUubG9nKG51bWJlckIpOwp9CmZvciAoW251bWJlckIgPSAtMV0gb2YgZ2V0Um9ib3RzKCkpIHsKICAgIGNvbnNvbGUubG9nKG51bWJlckIpOwp9CmZvciAoW251bWJlckIgPSAtMV0gb2YgW3JvYm90QSwgcm9ib3RCXSkgewogICAgY29uc29sZS5sb2cobnVtYmVyQik7Cn0KZm9yIChbbmFtZUIgPSAibm9OYW1lIl0gb2YgbXVsdGlSb2JvdHMpIHsKICAgIGNvbnNvbGUubG9nKG5hbWVCKTsKfQpmb3IgKFtuYW1lQiA9ICJub05hbWUiXSBvZiBnZXRNdWx0aVJvYm90cygpKSB7CiAgICBjb25zb2xlLmxvZyhuYW1lQik7Cn0KZm9yIChbbmFtZUIgPSAibm9OYW1lIl0gb2YgW211bHRpUm9ib3RBLCBtdWx0aVJvYm90Ql0pIHsKICAgIGNvbnNvbGUubG9nKG5hbWVCKTsKfQoKZm9yIChbbnVtYmVyQTIgPSAtMSwgbmFtZUEyID0gIm5vTmFtZSIsIHNraWxsQTIgPSAic2tpbGwiXSBvZiByb2JvdHMpIHsKICAgIGNvbnNvbGUubG9nKG5hbWVBMik7Cn0KZm9yIChbbnVtYmVyQTIgPSAtMSwgbmFtZUEyID0gIm5vTmFtZSIsIHNraWxsQTIgPSAic2tpbGwiXSBvZiBnZXRSb2JvdHMoKSkgewogICAgY29uc29sZS5sb2cobmFtZUEyKTsKfQpmb3IgKFtudW1iZXJBMiA9IC0xLCBuYW1lQTIgPSAibm9OYW1lIiwgc2tpbGxBMiA9ICJza2lsbCJdIG9mIFtyb2JvdEEsIHJvYm90Ql0pIHsKICAgIGNvbnNvbGUubG9nKG5hbWVBMik7Cn0KZm9yIChbbmFtZU1BID0gIm5vTmFtZSIsIFsKICAgIHByaW1hcnlTa2lsbEEgPSAicHJpbWFyeSIsCiAgICBzZWNvbmRhcnlTa2lsbEEgPSAic2Vjb25kYXJ5IgpdID0gWyJza2lsbDEiLCAic2tpbGwyIl1dIG9mIG11bHRpUm9ib3RzKSB7CiAgICBjb25zb2xlLmxvZyhuYW1lTUEpOwp9CmZvciAoW25hbWVNQSA9ICJub05hbWUiLCBbCiAgICBwcmltYXJ5U2tpbGxBID0gInByaW1hcnkiLAogICAgc2Vjb25kYXJ5U2tpbGxBID0gInNlY29uZGFyeSIKXSA9IFsic2tpbGwxIiwgInNraWxsMiJdXSBvZiBnZXRNdWx0aVJvYm90cygpKSB7CiAgICBjb25zb2xlLmxvZyhuYW1lTUEpOwp9CmZvciAoW25hbWVNQSA9ICJub05hbWUiLCBbCiAgICBwcmltYXJ5U2tpbGxBID0gInByaW1hcnkiLAogICAgc2Vjb25kYXJ5U2tpbGxBID0gInNlY29uZGFyeSIKXSA9IFsic2tpbGwxIiwgInNraWxsMiJdXSBvZiBbbXVsdGlSb2JvdEEsIG11bHRpUm9ib3RCXSkgewogICAgY29uc29sZS5sb2cobmFtZU1BKTsKfQoKZm9yIChbbnVtYmVyQTMgPSAtMSwgLi4ucm9ib3RBSW5mb10gb2Ygcm9ib3RzKSB7CiAgICBjb25zb2xlLmxvZyhudW1iZXJBMyk7Cn0KZm9yIChbbnVtYmVyQTMgPSAtMSwgLi4ucm9ib3RBSW5mb10gb2YgZ2V0Um9ib3RzKCkpIHsKICAgIGNvbnNvbGUubG9nKG51bWJlckEzKTsKfQpmb3IgKFtudW1iZXJBMyA9IC0xLCAuLi5yb2JvdEFJbmZvXSBvZiBbcm9ib3RBLCByb2JvdEJdKSB7CiAgICBjb25zb2xlLmxvZyhudW1iZXJBMyk7Cn0= diff --git a/tests/baselines/reference/sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValues2(target=es5).js.map b/tests/baselines/reference/sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValues2(target=es5).js.map index c1483e8445bc9..04e44d340c272 100644 --- a/tests/baselines/reference/sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValues2(target=es5).js.map +++ b/tests/baselines/reference/sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValues2(target=es5).js.map @@ -1,3 +1,3 @@ //// [sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValues2.js.map] -{"version":3,"file":"sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValues2.js","sourceRoot":"","sources":["sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValues2.ts"],"names":[],"mappings":";;AAgBA,IAAI,MAAM,GAAY,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,CAAC;AACnG,IAAI,WAAW,GAAiB,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE;IAChG,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC;AAE/E,SAAS,SAAS;IACd,OAAO,MAAM,CAAC;AAClB,CAAC;AAED,SAAS,cAAc;IACnB,OAAO,WAAW,CAAC;AACvB,CAAC;AAED,IAAI,KAAa,EAAE,QAAgB,EAAE,UAAkB,EAAE,CAAS,EAAE,MAAc,CAAC;AACnF,IAAI,IAAY,EAAE,OAAe,EAAE,SAAiB,EAAE,KAAa,CAAC;AAEpE,KAAkC,UAAM,EAAN,iBAAM,EAAN,oBAAM,EAAN,IAAM,EAAE,CAAC;IAArC,sBAAsB,EAAhB,KAAK,mBAAG,QAAQ,KAAA;IACxB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,KAAkC,WAAW,EAAX,MAAA,SAAS,EAAE,EAAX,gBAAW,EAAX,KAAW,EAAE,CAAC;IAA1C,kBAAsB,EAAhB,KAAK,mBAAG,QAAQ,KAAA;IACxB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,KAAkC,WAA4E,EAA5E,OAAC,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,EAA5E,gBAA4E,EAA5E,KAA4E,EAAE,CAAC;IAA3G,kBAAsB,EAAhB,KAAK,mBAAG,QAAQ,KAAA;IACxB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,KACsD,WAAW,EAAX,2BAAW,EAAX,0BAAW,EAAX,KAAW,EAAE,CAAC;IAD7D,8BACyC,EADzC,qBACH,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,KAAA,EAD/B,eAA6B,EAApB,QAAQ,mBAAG,SAAS,KAAA,EAAE,iBAAmC,EAAxB,UAAU,mBAAG,WAAW,KAAA;IAE/E,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,KACsD,WAAgB,EAAhB,MAAA,cAAc,EAAE,EAAhB,gBAAgB,EAAhB,KAAgB,EAAE,CAAC;IADlE,oBACyC,EADzC,qBACH,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,KAAA,EAD/B,eAA6B,EAApB,QAAQ,mBAAG,SAAS,KAAA,EAAE,iBAAmC,EAAxB,UAAU,mBAAG,WAAW,KAAA;IAE/E,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,KAEI,WAC8E,EAD9E,MAAc,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE;IAC9E,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,CAAC,EAD9E,gBAC8E,EAD9E,KAC8E,EAAE,CAAC;IAH9E,oBACyC,EADzC,qBACH,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,KAAA,EAD/B,eAA6B,EAApB,QAAQ,mBAAG,SAAS,KAAA,EAAE,iBAAmC,EAAxB,UAAU,mBAAG,WAAW,KAAA;IAI/E,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AAED,KAA4B,WAAM,EAAN,iBAAM,EAAN,qBAAM,EAAN,KAAM,EAAE,CAAC;IAA9B,uBAAe,EAAf,IAAI,mBAAG,QAAQ,KAAA;IAClB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,KAA4B,WAAW,EAAX,MAAA,SAAS,EAAE,EAAX,gBAAW,EAAX,KAAW,EAAE,CAAC;IAAnC,kBAAe,EAAf,IAAI,mBAAG,QAAQ,KAAA;IAClB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,KAA4B,WAA4E,EAA5E,OAAC,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,EAA5E,gBAA4E,EAA5E,KAA4E,EAAE,CAAC;IAApG,kBAAe,EAAf,IAAI,mBAAG,QAAQ,KAAA;IAClB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,KAKK,WAAW,EAAX,2BAAW,EAAX,0BAAW,EAAX,KAAW,EAAE,CAAC;IAJf,8BAGgD,EAHhD,qBAGI,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,KAAA,EAF5C,eAAmB,EAAnB,OAAO,mBAAG,SAAS,KAAA,EACnB,iBAAuB,EAAvB,SAAS,mBAAG,WAAW,KAAA;IAG3B,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,KAKK,WAAgB,EAAhB,MAAA,cAAc,EAAE,EAAhB,gBAAgB,EAAhB,KAAgB,EAAE,CAAC;IAJpB,oBAGgD,EAHhD,qBAGI,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,KAAA,EAF5C,eAAmB,EAAnB,OAAO,mBAAG,SAAS,KAAA,EACnB,iBAAuB,EAAvB,SAAS,mBAAG,WAAW,KAAA;IAG3B,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,KAKK,WACyE,EADzE,OAAC,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE;IACrE,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,CAAC,EADzE,gBACyE,EADzE,KACyE,EAAE,CAAC;IAL7E,oBAGgD,EAHhD,qBAGI,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,KAAA,EAF5C,eAAmB,EAAnB,OAAO,mBAAG,SAAS,KAAA,EACnB,iBAAuB,EAAvB,SAAS,mBAAG,WAAW,KAAA;IAI3B,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AAGD,KAA6D,WAAM,EAAN,iBAAM,EAAN,qBAAM,EAAN,KAAM,EAAE,CAAC;wBAAhE,YAAsB,EAAhB,KAAK,mBAAG,QAAQ,KAAA,EAAE,aAAyB,EAAlB,MAAM,mBAAG,SAAS,KAAA;IACnD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,KAA8D,WAAW,EAAX,MAAA,SAAS,EAAE,EAAX,gBAAW,EAAX,KAAW,EAAE,CAAC;mBAAtE,aAAsB,EAAhB,KAAK,oBAAG,QAAQ,MAAA,EAAE,cAAyB,EAAlB,MAAM,oBAAG,SAAS,MAAA;IACnD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,KAA8D,WAA4E,EAA5E,OAAC,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,EAA5E,gBAA4E,EAA5E,KAA4E,EAAE,CAAC;oBAAvI,cAAsB,EAAhB,KAAK,oBAAG,QAAQ,MAAA,EAAE,eAAyB,EAAlB,MAAM,oBAAG,SAAS,MAAA;IACnD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,KAMK,WAAW,EAAX,2BAAW,EAAX,0BAAW,EAAX,KAAW,EAAE,CAAC;8BALf,cAAsB,EAAhB,KAAK,oBAAG,QAAQ,MAAA,EACtB,gBAGgD,EAHhD,uBAGI,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,MAAA,EAF5C,iBAA6B,EAApB,QAAQ,oBAAG,SAAS,MAAA,EAC7B,mBAAmC,EAAxB,UAAU,oBAAG,WAAW,MAAA;IAGvC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,KAMK,WAAgB,EAAhB,MAAA,cAAc,EAAE,EAAhB,gBAAgB,EAAhB,KAAgB,EAAE,CAAC;oBALpB,cAAsB,EAAhB,KAAK,oBAAG,QAAQ,MAAA,EACtB,gBAGgD,EAHhD,uBAGI,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,MAAA,EAF5C,iBAA6B,EAApB,QAAQ,oBAAG,SAAS,MAAA,EAC7B,mBAAmC,EAAxB,UAAU,oBAAG,WAAW,MAAA;IAGvC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,KAMK,WACyE,EADzE,MAAc,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE;IACnF,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,CAAC,EADzE,gBACyE,EADzE,KACyE,EAAE,CAAC;oBAN7E,cAAsB,EAAhB,KAAK,oBAAG,QAAQ,MAAA,EACtB,gBAGgD,EAHhD,uBAGI,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,MAAA,EAF5C,iBAA6B,EAApB,QAAQ,oBAAG,SAAS,MAAA,EAC7B,mBAAmC,EAAxB,UAAU,oBAAG,WAAW,MAAA;IAIvC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AAED,KAAgD,WAAM,EAAN,iBAAM,EAAN,qBAAM,EAAN,KAAM,EAAE,CAAC;yBAAlD,cAAe,EAAf,IAAI,oBAAG,QAAQ,MAAA,EAAE,eAAkB,EAAlB,KAAK,oBAAI,SAAS,MAAA;IACtC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,KAAgD,WAAW,EAAX,MAAA,SAAS,EAAE,EAAX,gBAAW,EAAX,KAAW,EAAE,CAAC;oBAAvD,cAAe,EAAf,IAAI,oBAAG,QAAQ,MAAA,EAAE,eAAiB,EAAjB,KAAK,oBAAG,SAAS,MAAA;IACrC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,KAAgD,WAA4E,EAA5E,OAAC,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,EAA5E,gBAA4E,EAA5E,KAA4E,EAAE,CAAC;oBAAxH,cAAe,EAAf,IAAI,oBAAG,QAAQ,MAAA,EAAE,eAAkB,EAAlB,KAAK,oBAAI,SAAS,MAAA;IACtC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,KAMK,WAAW,EAAX,2BAAW,EAAX,0BAAW,EAAX,KAAW,EAAE,CAAC;8BALf,cAAe,EAAf,IAAI,oBAAG,QAAQ,MAAA,EACf,gBAGgD,EAHhD,uBAGI,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,MAAA,EAF5C,iBAAmB,EAAnB,OAAO,oBAAG,SAAS,MAAA,EACnB,mBAAuB,EAAvB,SAAS,oBAAG,WAAW,MAAA;IAG3B,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,KAMK,WAAgB,EAAhB,MAAA,cAAc,EAAE,EAAhB,gBAAgB,EAAhB,KAAgB,EAAE,CAAC;oBALpB,cAAe,EAAf,IAAI,oBAAG,QAAQ,MAAA,EACf,gBAGgD,EAHhD,uBAGI,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,MAAA,EAF5C,iBAAmB,EAAnB,OAAO,oBAAG,SAAS,MAAA,EACnB,mBAAuB,EAAvB,SAAS,oBAAG,WAAW,MAAA;IAG3B,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,KAMK,WACyE,EADzE,OAAC,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE;IACrE,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,CAAC,EADzE,gBACyE,EADzE,KACyE,EAAE,CAAC;oBAN7E,cAAe,EAAf,IAAI,oBAAG,QAAQ,MAAA,EACf,gBAGgD,EAHhD,uBAGI,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,MAAA,EAF5C,iBAAmB,EAAnB,OAAO,oBAAG,SAAS,MAAA,EACnB,mBAAuB,EAAvB,SAAS,oBAAG,WAAW,MAAA;IAI3B,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC"} +{"version":3,"file":"sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValues2.js","sourceRoot":"","sources":["sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValues2.ts"],"names":[],"mappings":";;AAgBA,IAAI,MAAM,GAAY,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,CAAC;AACnG,IAAI,WAAW,GAAiB,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE;IAChG,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC;AAE/E,SAAS,SAAS;IACd,OAAO,MAAM,CAAC;AAClB,CAAC;AAED,SAAS,cAAc;IACnB,OAAO,WAAW,CAAC;AACvB,CAAC;AAED,IAAI,KAAa,EAAE,QAAgB,EAAE,UAAkB,EAAE,CAAS,EAAE,MAAc,CAAC;AACnF,IAAI,IAAY,EAAE,OAAe,EAAE,SAAiB,EAAE,KAAa,CAAC;AAEpE,KAAkC,UAAM,EAAN,iBAAM,EAAN,oBAAM,EAAN,IAAM,EAAE,CAAC;IAArC,sBAAsB,EAAhB,KAAK,mBAAG,QAAQ,KAAA;IACxB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,KAAkC,WAAW,EAAX,MAAA,SAAS,EAAE,EAAX,gBAAW,EAAX,KAAW,EAAE,CAAC;IAA1C,kBAAsB,EAAhB,KAAK,mBAAG,QAAQ,KAAA;IACxB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,KAAkC,WAA4E,EAA5E,OAAC,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,EAA5E,gBAA4E,EAA5E,KAA4E,EAAE,CAAC;IAA3G,kBAAsB,EAAhB,KAAK,mBAAG,QAAQ,KAAA;IACxB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,KACsD,WAAW,EAAX,2BAAW,EAAX,0BAAW,EAAX,KAAW,EAAE,CAAC;IAD7D,8BACyC,EADzC,qBACH,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,KAAA,EAD/B,eAA6B,EAApB,QAAQ,mBAAG,SAAS,KAAA,EAAE,iBAAmC,EAAxB,UAAU,mBAAG,WAAW,KAAA;IAE/E,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,KACsD,WAAgB,EAAhB,MAAA,cAAc,EAAE,EAAhB,gBAAgB,EAAhB,KAAgB,EAAE,CAAC;IADlE,oBACyC,EADzC,qBACH,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,KAAA,EAD/B,eAA6B,EAApB,QAAQ,mBAAG,SAAS,KAAA,EAAE,iBAAmC,EAAxB,UAAU,mBAAG,WAAW,KAAA;IAE/E,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,KAEI,WAC8E,EAD9E,MAAc,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE;IAC9E,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,CAAC,EAD9E,gBAC8E,EAD9E,KAC8E,EAAE,CAAC;IAH9E,oBACyC,EADzC,qBACH,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,KAAA,EAD/B,eAA6B,EAApB,QAAQ,mBAAG,SAAS,KAAA,EAAE,iBAAmC,EAAxB,UAAU,mBAAG,WAAW,KAAA;IAI/E,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AAED,KAA4B,WAAM,EAAN,iBAAM,EAAN,qBAAM,EAAN,KAAM,EAAE,CAAC;IAA9B,uBAAe,EAAf,IAAI,mBAAG,QAAQ,KAAA;IAClB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,KAA4B,WAAW,EAAX,MAAA,SAAS,EAAE,EAAX,gBAAW,EAAX,KAAW,EAAE,CAAC;IAAnC,kBAAe,EAAf,IAAI,mBAAG,QAAQ,KAAA;IAClB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,KAA4B,WAA4E,EAA5E,OAAC,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,EAA5E,gBAA4E,EAA5E,KAA4E,EAAE,CAAC;IAApG,kBAAe,EAAf,IAAI,mBAAG,QAAQ,KAAA;IAClB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,KAKK,WAAW,EAAX,2BAAW,EAAX,0BAAW,EAAX,KAAW,EAAE,CAAC;IAJf,8BAGgD,EAHhD,qBAGI,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,KAAA,EAF5C,eAAmB,EAAnB,OAAO,mBAAG,SAAS,KAAA,EACnB,iBAAuB,EAAvB,SAAS,mBAAG,WAAW,KAAA;IAG3B,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,KAKK,WAAgB,EAAhB,MAAA,cAAc,EAAE,EAAhB,gBAAgB,EAAhB,KAAgB,EAAE,CAAC;IAJpB,oBAGgD,EAHhD,qBAGI,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,KAAA,EAF5C,eAAmB,EAAnB,OAAO,mBAAG,SAAS,KAAA,EACnB,iBAAuB,EAAvB,SAAS,mBAAG,WAAW,KAAA;IAG3B,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,KAKK,WACyE,EADzE,OAAC,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE;IACrE,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,CAAC,EADzE,gBACyE,EADzE,KACyE,EAAE,CAAC;IAL7E,oBAGgD,EAHhD,qBAGI,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,KAAA,EAF5C,eAAmB,EAAnB,OAAO,mBAAG,SAAS,KAAA,EACnB,iBAAuB,EAAvB,SAAS,mBAAG,WAAW,KAAA;IAI3B,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AAGD,KAA6D,WAAM,EAAN,iBAAM,EAAN,qBAAM,EAAN,KAAM,EAAE,CAAC;wBAAhE,YAAsB,EAAhB,KAAK,mBAAG,QAAQ,KAAA,EAAE,aAAyB,EAAlB,MAAM,mBAAG,SAAS,KAAA;IACnD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,KAA8D,WAAW,EAAX,MAAA,SAAS,EAAE,EAAX,gBAAW,EAAX,KAAW,EAAE,CAAC;mBAAtE,aAAsB,EAAhB,KAAK,oBAAG,QAAQ,MAAA,EAAE,cAAyB,EAAlB,MAAM,oBAAG,SAAS,MAAA;IACnD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,KAA8D,WAA4E,EAA5E,OAAC,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,EAA5E,gBAA4E,EAA5E,KAA4E,EAAE,CAAC;oBAAvI,cAAsB,EAAhB,KAAK,oBAAG,QAAQ,MAAA,EAAE,eAAyB,EAAlB,MAAM,oBAAG,SAAS,MAAA;IACnD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,KAMK,WAAW,EAAX,2BAAW,EAAX,0BAAW,EAAX,KAAW,EAAE,CAAC;8BALf,cAAsB,EAAhB,KAAK,oBAAG,QAAQ,MAAA,EACtB,gBAGgD,EAHhD,uBAGI,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,MAAA,EAF5C,iBAA6B,EAApB,QAAQ,oBAAG,SAAS,MAAA,EAC7B,mBAAmC,EAAxB,UAAU,oBAAG,WAAW,MAAA;IAGvC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,KAMK,WAAgB,EAAhB,MAAA,cAAc,EAAE,EAAhB,gBAAgB,EAAhB,KAAgB,EAAE,CAAC;oBALpB,cAAsB,EAAhB,KAAK,oBAAG,QAAQ,MAAA,EACtB,gBAGgD,EAHhD,uBAGI,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,MAAA,EAF5C,iBAA6B,EAApB,QAAQ,oBAAG,SAAS,MAAA,EAC7B,mBAAmC,EAAxB,UAAU,oBAAG,WAAW,MAAA;IAGvC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,KAMK,WACyE,EADzE,MAAc,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE;IACnF,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,CAAC,EADzE,gBACyE,EADzE,KACyE,EAAE,CAAC;oBAN7E,cAAsB,EAAhB,KAAK,oBAAG,QAAQ,MAAA,EACtB,gBAGgD,EAHhD,uBAGI,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,MAAA,EAF5C,iBAA6B,EAApB,QAAQ,oBAAG,SAAS,MAAA,EAC7B,mBAAmC,EAAxB,UAAU,oBAAG,WAAW,MAAA;IAIvC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AAED,KAAgD,WAAM,EAAN,iBAAM,EAAN,qBAAM,EAAN,KAAM,EAAE,CAAC;yBAAlD,cAAe,EAAf,IAAI,oBAAG,QAAQ,MAAA,EAAE,eAAkB,EAAlB,KAAK,oBAAI,SAAS,MAAA;IACtC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,KAAgD,WAAW,EAAX,MAAA,SAAS,EAAE,EAAX,gBAAW,EAAX,KAAW,EAAE,CAAC;oBAAvD,cAAe,EAAf,IAAI,oBAAG,QAAQ,MAAA,EAAE,eAAiB,EAAjB,KAAK,oBAAG,SAAS,MAAA;IACrC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,KAAgD,WAA4E,EAA5E,OAAC,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,EAA5E,gBAA4E,EAA5E,KAA4E,EAAE,CAAC;oBAAxH,cAAe,EAAf,IAAI,oBAAG,QAAQ,MAAA,EAAE,eAAkB,EAAlB,KAAK,oBAAI,SAAS,MAAA;IACtC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,KAMK,WAAW,EAAX,2BAAW,EAAX,0BAAW,EAAX,KAAW,EAAE,CAAC;8BALf,cAAe,EAAf,IAAI,oBAAG,QAAQ,MAAA,each,gBAGgD,EAHhD,uBAGI,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,MAAA,EAF5C,iBAAmB,EAAnB,OAAO,oBAAG,SAAS,MAAA,EACnB,mBAAuB,EAAvB,SAAS,oBAAG,WAAW,MAAA;IAG3B,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,KAMK,WAAgB,EAAhB,MAAA,cAAc,EAAE,EAAhB,gBAAgB,EAAhB,KAAgB,EAAE,CAAC;oBALpB,cAAe,EAAf,IAAI,oBAAG,QAAQ,MAAA,each,gBAGgD,EAHhD,uBAGI,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,MAAA,EAF5C,iBAAmB,EAAnB,OAAO,oBAAG,SAAS,MAAA,EACnB,mBAAuB,EAAvB,SAAS,oBAAG,WAAW,MAAA;IAG3B,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,KAMK,WACyE,EADzE,OAAC,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE;IACrE,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,CAAC,EADzE,gBACyE,EADzE,KACyE,EAAE,CAAC;oBAN7E,cAAe,EAAf,IAAI,oBAAG,QAAQ,MAAA,each,gBAGgD,EAHhD,uBAGI,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,MAAA,EAF5C,iBAAmB,EAAnB,OAAO,oBAAG,SAAS,MAAA,EACnB,mBAAuB,EAAvB,SAAS,oBAAG,WAAW,MAAA;IAI3B,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC"} //// https://sokra.github.io/source-map-visualization#base64,"use strict";
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45, _46, _47, _48, _49, _50, _51, _52, _53, _54, _55, _56, _57, _58, _59;
var robots = [{ name: "mower", skill: "mowing" }, { name: "trimmer", skill: "trimming" }];
var multiRobots = [{ name: "mower", skills: { primary: "mowing", secondary: "none" } },
    { name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }];
function getRobots() {
    return robots;
}
function getMultiRobots() {
    return multiRobots;
}
var nameA, primaryA, secondaryA, i, skillA;
var name, primary, secondary, skill;
for (var _i = 0, robots_1 = robots; _i < robots_1.length; _i++) {
    _a = robots_1[_i].name, nameA = _a === void 0 ? "noName" : _a;
    console.log(nameA);
}
for (var _60 = 0, _61 = getRobots(); _60 < _61.length; _60++) {
    _b = _61[_60].name, nameA = _b === void 0 ? "noName" : _b;
    console.log(nameA);
}
for (var _62 = 0, _63 = [{ name: "mower", skill: "mowing" }, { name: "trimmer", skill: "trimming" }]; _62 < _63.length; _62++) {
    _c = _63[_62].name, nameA = _c === void 0 ? "noName" : _c;
    console.log(nameA);
}
for (var _64 = 0, multiRobots_1 = multiRobots; _64 < multiRobots_1.length; _64++) {
    _d = multiRobots_1[_64].skills, _e = _d === void 0 ? { primary: "nosKill", secondary: "noSkill" } : _d, _f = _e.primary, primaryA = _f === void 0 ? "primary" : _f, _g = _e.secondary, secondaryA = _g === void 0 ? "secondary" : _g;
    console.log(primaryA);
}
for (var _65 = 0, _66 = getMultiRobots(); _65 < _66.length; _65++) {
    _h = _66[_65].skills, _j = _h === void 0 ? { primary: "nosKill", secondary: "noSkill" } : _h, _k = _j.primary, primaryA = _k === void 0 ? "primary" : _k, _l = _j.secondary, secondaryA = _l === void 0 ? "secondary" : _l;
    console.log(primaryA);
}
for (var _67 = 0, _68 = [{ name: "mower", skills: { primary: "mowing", secondary: "none" } },
    { name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }]; _67 < _68.length; _67++) {
    _m = _68[_67].skills, _o = _m === void 0 ? { primary: "nosKill", secondary: "noSkill" } : _m, _p = _o.primary, primaryA = _p === void 0 ? "primary" : _p, _q = _o.secondary, secondaryA = _q === void 0 ? "secondary" : _q;
    console.log(primaryA);
}
for (var _69 = 0, robots_2 = robots; _69 < robots_2.length; _69++) {
    _r = robots_2[_69].name, name = _r === void 0 ? "noName" : _r;
    console.log(nameA);
}
for (var _70 = 0, _71 = getRobots(); _70 < _71.length; _70++) {
    _s = _71[_70].name, name = _s === void 0 ? "noName" : _s;
    console.log(nameA);
}
for (var _72 = 0, _73 = [{ name: "mower", skill: "mowing" }, { name: "trimmer", skill: "trimming" }]; _72 < _73.length; _72++) {
    _t = _73[_72].name, name = _t === void 0 ? "noName" : _t;
    console.log(nameA);
}
for (var _74 = 0, multiRobots_2 = multiRobots; _74 < multiRobots_2.length; _74++) {
    _u = multiRobots_2[_74].skills, _v = _u === void 0 ? { primary: "noSkill", secondary: "noSkill" } : _u, _w = _v.primary, primary = _w === void 0 ? "primary" : _w, _x = _v.secondary, secondary = _x === void 0 ? "secondary" : _x;
    console.log(primaryA);
}
for (var _75 = 0, _76 = getMultiRobots(); _75 < _76.length; _75++) {
    _y = _76[_75].skills, _z = _y === void 0 ? { primary: "noSkill", secondary: "noSkill" } : _y, _0 = _z.primary, primary = _0 === void 0 ? "primary" : _0, _1 = _z.secondary, secondary = _1 === void 0 ? "secondary" : _1;
    console.log(primaryA);
}
for (var _77 = 0, _78 = [{ name: "mower", skills: { primary: "mowing", secondary: "none" } },
    { name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }]; _77 < _78.length; _77++) {
    _2 = _78[_77].skills, _3 = _2 === void 0 ? { primary: "noSkill", secondary: "noSkill" } : _2, _4 = _3.primary, primary = _4 === void 0 ? "primary" : _4, _5 = _3.secondary, secondary = _5 === void 0 ? "secondary" : _5;
    console.log(primaryA);
}
for (var _79 = 0, robots_3 = robots; _79 < robots_3.length; _79++) {
    _6 = robots_3[_79], _7 = _6.name, nameA = _7 === void 0 ? "noName" : _7, _8 = _6.skill, skillA = _8 === void 0 ? "noSkill" : _8;
    console.log(nameA);
}
for (var _80 = 0, _81 = getRobots(); _80 < _81.length; _80++) {
    _9 = _81[_80], _10 = _9.name, nameA = _10 === void 0 ? "noName" : _10, _11 = _9.skill, skillA = _11 === void 0 ? "noSkill" : _11;
    console.log(nameA);
}
for (var _82 = 0, _83 = [{ name: "mower", skill: "mowing" }, { name: "trimmer", skill: "trimming" }]; _82 < _83.length; _82++) {
    _12 = _83[_82], _13 = _12.name, nameA = _13 === void 0 ? "noName" : _13, _14 = _12.skill, skillA = _14 === void 0 ? "noSkill" : _14;
    console.log(nameA);
}
for (var _84 = 0, multiRobots_3 = multiRobots; _84 < multiRobots_3.length; _84++) {
    _15 = multiRobots_3[_84], _16 = _15.name, nameA = _16 === void 0 ? "noName" : _16, _17 = _15.skills, _18 = _17 === void 0 ? { primary: "noSkill", secondary: "noSkill" } : _17, _19 = _18.primary, primaryA = _19 === void 0 ? "primary" : _19, _20 = _18.secondary, secondaryA = _20 === void 0 ? "secondary" : _20;
    console.log(nameA);
}
for (var _85 = 0, _86 = getMultiRobots(); _85 < _86.length; _85++) {
    _21 = _86[_85], _22 = _21.name, nameA = _22 === void 0 ? "noName" : _22, _23 = _21.skills, _24 = _23 === void 0 ? { primary: "noSkill", secondary: "noSkill" } : _23, _25 = _24.primary, primaryA = _25 === void 0 ? "primary" : _25, _26 = _24.secondary, secondaryA = _26 === void 0 ? "secondary" : _26;
    console.log(nameA);
}
for (var _87 = 0, _88 = [{ name: "mower", skills: { primary: "mowing", secondary: "none" } },
    { name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }]; _87 < _88.length; _87++) {
    _27 = _88[_87], _28 = _27.name, nameA = _28 === void 0 ? "noName" : _28, _29 = _27.skills, _30 = _29 === void 0 ? { primary: "noSkill", secondary: "noSkill" } : _29, _31 = _30.primary, primaryA = _31 === void 0 ? "primary" : _31, _32 = _30.secondary, secondaryA = _32 === void 0 ? "secondary" : _32;
    console.log(nameA);
}
for (var _89 = 0, robots_4 = robots; _89 < robots_4.length; _89++) {
    _33 = robots_4[_89], _34 = _33.name, name = _34 === void 0 ? "noName" : _34, _35 = _33.skill, skill = _35 === void 0 ? "noSkill" : _35;
    console.log(nameA);
}
for (var _90 = 0, _91 = getRobots(); _90 < _91.length; _90++) {
    _36 = _91[_90], _37 = _36.name, name = _37 === void 0 ? "noName" : _37, _38 = _36.skill, skill = _38 === void 0 ? "noSkill" : _38;
    console.log(nameA);
}
for (var _92 = 0, _93 = [{ name: "mower", skill: "mowing" }, { name: "trimmer", skill: "trimming" }]; _92 < _93.length; _92++) {
    _39 = _93[_92], _40 = _39.name, name = _40 === void 0 ? "noName" : _40, _41 = _39.skill, skill = _41 === void 0 ? "noSkill" : _41;
    console.log(nameA);
}
for (var _94 = 0, multiRobots_4 = multiRobots; _94 < multiRobots_4.length; _94++) {
    _42 = multiRobots_4[_94], _43 = _42.name, name = _43 === void 0 ? "noName" : _43, _44 = _42.skills, _45 = _44 === void 0 ? { primary: "noSkill", secondary: "noSkill" } : _44, _46 = _45.primary, primary = _46 === void 0 ? "primary" : _46, _47 = _45.secondary, secondary = _47 === void 0 ? "secondary" : _47;
    console.log(nameA);
}
for (var _95 = 0, _96 = getMultiRobots(); _95 < _96.length; _95++) {
    _48 = _96[_95], _49 = _48.name, name = _49 === void 0 ? "noName" : _49, _50 = _48.skills, _51 = _50 === void 0 ? { primary: "noSkill", secondary: "noSkill" } : _50, _52 = _51.primary, primary = _52 === void 0 ? "primary" : _52, _53 = _51.secondary, secondary = _53 === void 0 ? "secondary" : _53;
    console.log(nameA);
}
for (var _97 = 0, _98 = [{ name: "mower", skills: { primary: "mowing", secondary: "none" } },
    { name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }]; _97 < _98.length; _97++) {
    _54 = _98[_97], _55 = _54.name, name = _55 === void 0 ? "noName" : _55, _56 = _54.skills, _57 = _56 === void 0 ? { primary: "noSkill", secondary: "noSkill" } : _56, _58 = _57.primary, primary = _58 === void 0 ? "primary" : _58, _59 = _57.secondary, secondary = _59 === void 0 ? "secondary" : _59;
    console.log(nameA);
}
//# sourceMappingURL=sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValues2.js.map,{"version":3,"file":"sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValues2.js","sourceRoot":"","sources":["sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValues2.ts"],"names":[],"mappings":";;AAgBA,IAAI,MAAM,GAAY,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,CAAC;AACnG,IAAI,WAAW,GAAiB,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE;IAChG,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC;AAE/E,SAAS,SAAS;IACd,OAAO,MAAM,CAAC;AAClB,CAAC;AAED,SAAS,cAAc;IACnB,OAAO,WAAW,CAAC;AACvB,CAAC;AAED,IAAI,KAAa,EAAE,QAAgB,EAAE,UAAkB,EAAE,CAAS,EAAE,MAAc,CAAC;AACnF,IAAI,IAAY,EAAE,OAAe,EAAE,SAAiB,EAAE,KAAa,CAAC;AAEpE,KAAkC,UAAM,EAAN,iBAAM,EAAN,oBAAM,EAAN,IAAM,EAAE,CAAC;IAArC,sBAAsB,EAAhB,KAAK,mBAAG,QAAQ,KAAA;IACxB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,KAAkC,WAAW,EAAX,MAAA,SAAS,EAAE,EAAX,gBAAW,EAAX,KAAW,EAAE,CAAC;IAA1C,kBAAsB,EAAhB,KAAK,mBAAG,QAAQ,KAAA;IACxB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,KAAkC,WAA4E,EAA5E,OAAC,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,EAA5E,gBAA4E,EAA5E,KAA4E,EAAE,CAAC;IAA3G,kBAAsB,EAAhB,KAAK,mBAAG,QAAQ,KAAA;IACxB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,KACsD,WAAW,EAAX,2BAAW,EAAX,0BAAW,EAAX,KAAW,EAAE,CAAC;IAD7D,8BACyC,EADzC,qBACH,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,KAAA,EAD/B,eAA6B,EAApB,QAAQ,mBAAG,SAAS,KAAA,EAAE,iBAAmC,EAAxB,UAAU,mBAAG,WAAW,KAAA;IAE/E,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,KACsD,WAAgB,EAAhB,MAAA,cAAc,EAAE,EAAhB,gBAAgB,EAAhB,KAAgB,EAAE,CAAC;IADlE,oBACyC,EADzC,qBACH,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,KAAA,EAD/B,eAA6B,EAApB,QAAQ,mBAAG,SAAS,KAAA,EAAE,iBAAmC,EAAxB,UAAU,mBAAG,WAAW,KAAA;IAE/E,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,KAEI,WAC8E,EAD9E,MAAc,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE;IAC9E,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,CAAC,EAD9E,gBAC8E,EAD9E,KAC8E,EAAE,CAAC;IAH9E,oBACyC,EADzC,qBACH,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,KAAA,EAD/B,eAA6B,EAApB,QAAQ,mBAAG,SAAS,KAAA,EAAE,iBAAmC,EAAxB,UAAU,mBAAG,WAAW,KAAA;IAI/E,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AAED,KAA4B,WAAM,EAAN,iBAAM,EAAN,qBAAM,EAAN,KAAM,EAAE,CAAC;IAA9B,uBAAe,EAAf,IAAI,mBAAG,QAAQ,KAAA;IAClB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,KAA4B,WAAW,EAAX,MAAA,SAAS,EAAE,EAAX,gBAAW,EAAX,KAAW,EAAE,CAAC;IAAnC,kBAAe,EAAf,IAAI,mBAAG,QAAQ,KAAA;IAClB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,KAA4B,WAA4E,EAA5E,OAAC,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,EAA5E,gBAA4E,EAA5E,KAA4E,EAAE,CAAC;IAApG,kBAAe,EAAf,IAAI,mBAAG,QAAQ,KAAA;IAClB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,KAKK,WAAW,EAAX,2BAAW,EAAX,0BAAW,EAAX,KAAW,EAAE,CAAC;IAJf,8BAGgD,EAHhD,qBAGI,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,KAAA,EAF5C,eAAmB,EAAnB,OAAO,mBAAG,SAAS,KAAA,EACnB,iBAAuB,EAAvB,SAAS,mBAAG,WAAW,KAAA;IAG3B,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,KAKK,WAAgB,EAAhB,MAAA,cAAc,EAAE,EAAhB,gBAAgB,EAAhB,KAAgB,EAAE,CAAC;IAJpB,oBAGgD,EAHhD,qBAGI,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,KAAA,EAF5C,eAAmB,EAAnB,OAAO,mBAAG,SAAS,KAAA,EACnB,iBAAuB,EAAvB,SAAS,mBAAG,WAAW,KAAA;IAG3B,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,KAKK,WACyE,EADzE,OAAC,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE;IACrE,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,CAAC,EADzE,gBACyE,EADzE,KACyE,EAAE,CAAC;IAL7E,oBAGgD,EAHhD,qBAGI,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,KAAA,EAF5C,eAAmB,EAAnB,OAAO,mBAAG,SAAS,KAAA,EACnB,iBAAuB,EAAvB,SAAS,mBAAG,WAAW,KAAA;IAI3B,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AAGD,KAA6D,WAAM,EAAN,iBAAM,EAAN,qBAAM,EAAN,KAAM,EAAE,CAAC;wBAAhE,YAAsB,EAAhB,KAAK,mBAAG,QAAQ,KAAA,EAAE,aAAyB,EAAlB,MAAM,mBAAG,SAAS,KAAA;IACnD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,KAA8D,WAAW,EAAX,MAAA,SAAS,EAAE,EAAX,gBAAW,EAAX,KAAW,EAAE,CAAC;mBAAtE,aAAsB,EAAhB,KAAK,oBAAG,QAAQ,MAAA,EAAE,cAAyB,EAAlB,MAAM,oBAAG,SAAS,MAAA;IACnD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,KAA8D,WAA4E,EAA5E,OAAC,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,EAA5E,gBAA4E,EAA5E,KAA4E,EAAE,CAAC;oBAAvI,cAAsB,EAAhB,KAAK,oBAAG,QAAQ,MAAA,EAAE,eAAyB,EAAlB,MAAM,oBAAG,SAAS,MAAA;IACnD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,KAMK,WAAW,EAAX,2BAAW,EAAX,0BAAW,EAAX,KAAW,EAAE,CAAC;8BALf,cAAsB,EAAhB,KAAK,oBAAG,QAAQ,MAAA,EACtB,gBAGgD,EAHhD,uBAGI,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,MAAA,EAF5C,iBAA6B,EAApB,QAAQ,oBAAG,SAAS,MAAA,EAC7B,mBAAmC,EAAxB,UAAU,oBAAG,WAAW,MAAA;IAGvC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,KAMK,WAAgB,EAAhB,MAAA,cAAc,EAAE,EAAhB,gBAAgB,EAAhB,KAAgB,EAAE,CAAC;oBALpB,cAAsB,EAAhB,KAAK,oBAAG,QAAQ,MAAA,EACtB,gBAGgD,EAHhD,uBAGI,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,MAAA,EAF5C,iBAA6B,EAApB,QAAQ,oBAAG,SAAS,MAAA,EAC7B,mBAAmC,EAAxB,UAAU,oBAAG,WAAW,MAAA;IAGvC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,KAMK,WACyE,EADzE,MAAc,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE;IACnF,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,CAAC,EADzE,gBACyE,EADzE,KACyE,EAAE,CAAC;oBAN7E,cAAsB,EAAhB,KAAK,oBAAG,QAAQ,MAAA,EACtB,gBAGgD,EAHhD,uBAGI,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,MAAA,EAF5C,iBAA6B,EAApB,QAAQ,oBAAG,SAAS,MAAA,EAC7B,mBAAmC,EAAxB,UAAU,oBAAG,WAAW,MAAA;IAIvC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AAED,KAAgD,WAAM,EAAN,iBAAM,EAAN,qBAAM,EAAN,KAAM,EAAE,CAAC;yBAAlD,cAAe,EAAf,IAAI,oBAAG,QAAQ,MAAA,EAAE,eAAkB,EAAlB,KAAK,oBAAI,SAAS,MAAA;IACtC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,KAAgD,WAAW,EAAX,MAAA,SAAS,EAAE,EAAX,gBAAW,EAAX,KAAW,EAAE,CAAC;oBAAvD,cAAe,EAAf,IAAI,oBAAG,QAAQ,MAAA,EAAE,eAAiB,EAAjB,KAAK,oBAAG,SAAS,MAAA;IACrC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,KAAgD,WAA4E,EAA5E,OAAC,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,EAA5E,gBAA4E,EAA5E,KAA4E,EAAE,CAAC;oBAAxH,cAAe,EAAf,IAAI,oBAAG,QAAQ,MAAA,EAAE,eAAkB,EAAlB,KAAK,oBAAI,SAAS,MAAA;IACtC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,KAMK,WAAW,EAAX,2BAAW,EAAX,0BAAW,EAAX,KAAW,EAAE,CAAC;8BALf,cAAe,EAAf,IAAI,oBAAG,QAAQ,MAAA,EACf,gBAGgD,EAHhD,uBAGI,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,MAAA,EAF5C,iBAAmB,EAAnB,OAAO,oBAAG,SAAS,MAAA,EACnB,mBAAuB,EAAvB,SAAS,oBAAG,WAAW,MAAA;IAG3B,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,KAMK,WAAgB,EAAhB,MAAA,cAAc,EAAE,EAAhB,gBAAgB,EAAhB,KAAgB,EAAE,CAAC;oBALpB,cAAe,EAAf,IAAI,oBAAG,QAAQ,MAAA,EACf,gBAGgD,EAHhD,uBAGI,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,MAAA,EAF5C,iBAAmB,EAAnB,OAAO,oBAAG,SAAS,MAAA,EACnB,mBAAuB,EAAvB,SAAS,oBAAG,WAAW,MAAA;IAG3B,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,KAMK,WACyE,EADzE,OAAC,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE;IACrE,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,CAAC,EADzE,gBACyE,EADzE,KACyE,EAAE,CAAC;oBAN7E,cAAe,EAAf,IAAI,oBAAG,QAAQ,MAAA,EACf,gBAGgD,EAHhD,uBAGI,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,MAAA,EAF5C,iBAAmB,EAAnB,OAAO,oBAAG,SAAS,MAAA,EACnB,mBAAuB,EAAvB,SAAS,oBAAG,WAAW,MAAA;IAI3B,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC"},ZGVjbGFyZSB2YXIgY29uc29sZTogewogICAgbG9nKG1zZzogYW55KTogdm9pZDsKfQppbnRlcmZhY2UgUm9ib3QgewogICAgbmFtZTogc3RyaW5nOwogICAgc2tpbGw6IHN0cmluZzsKfQoKaW50ZXJmYWNlIE11bHRpUm9ib3QgewogICAgbmFtZTogc3RyaW5nOwogICAgc2tpbGxzOiB7CiAgICAgICAgcHJpbWFyeTogc3RyaW5nOwogICAgICAgIHNlY29uZGFyeTogc3RyaW5nOwogICAgfTsKfQoKbGV0IHJvYm90czogUm9ib3RbXSA9IFt7IG5hbWU6ICJtb3dlciIsIHNraWxsOiAibW93aW5nIiB9LCB7IG5hbWU6ICJ0cmltbWVyIiwgc2tpbGw6ICJ0cmltbWluZyIgfV07CmxldCBtdWx0aVJvYm90czogTXVsdGlSb2JvdFtdID0gW3sgbmFtZTogIm1vd2VyIiwgc2tpbGxzOiB7IHByaW1hcnk6ICJtb3dpbmciLCBzZWNvbmRhcnk6ICJub25lIiB9IH0sCiAgICB7IG5hbWU6ICJ0cmltbWVyIiwgc2tpbGxzOiB7IHByaW1hcnk6ICJ0cmltbWluZyIsIHNlY29uZGFyeTogImVkZ2luZyIgfSB9XTsKCmZ1bmN0aW9uIGdldFJvYm90cygpIHsKICAgIHJldHVybiByb2JvdHM7Cn0KCmZ1bmN0aW9uIGdldE11bHRpUm9ib3RzKCkgewogICAgcmV0dXJuIG11bHRpUm9ib3RzOwp9CgpsZXQgbmFtZUE6IHN0cmluZywgcHJpbWFyeUE6IHN0cmluZywgc2Vjb25kYXJ5QTogc3RyaW5nLCBpOiBudW1iZXIsIHNraWxsQTogc3RyaW5nOwpsZXQgbmFtZTogc3RyaW5nLCBwcmltYXJ5OiBzdHJpbmcsIHNlY29uZGFyeTogc3RyaW5nLCBza2lsbDogc3RyaW5nOwoKZm9yICh7bmFtZTogbmFtZUEgPSAibm9OYW1lIiB9IG9mIHJvYm90cykgewogICAgY29uc29sZS5sb2cobmFtZUEpOwp9CmZvciAoe25hbWU6IG5hbWVBID0gIm5vTmFtZSIgfSBvZiBnZXRSb2JvdHMoKSkgewogICAgY29uc29sZS5sb2cobmFtZUEpOwp9CmZvciAoe25hbWU6IG5hbWVBID0gIm5vTmFtZSIgfSBvZiBbeyBuYW1lOiAibW93ZXIiLCBza2lsbDogIm1vd2luZyIgfSwgeyBuYW1lOiAidHJpbW1lciIsIHNraWxsOiAidHJpbW1pbmciIH1dKSB7CiAgICBjb25zb2xlLmxvZyhuYW1lQSk7Cn0KZm9yICh7IHNraWxsczogeyBwcmltYXJ5OiBwcmltYXJ5QSA9ICJwcmltYXJ5Iiwgc2Vjb25kYXJ5OiBzZWNvbmRhcnlBID0gInNlY29uZGFyeSIgfSA9CiAgICB7IHByaW1hcnk6ICJub3NLaWxsIiwgc2Vjb25kYXJ5OiAibm9Ta2lsbCIgfSB9IG9mIG11bHRpUm9ib3RzKSB7CiAgICBjb25zb2xlLmxvZyhwcmltYXJ5QSk7Cn0KZm9yICh7IHNraWxsczogeyBwcmltYXJ5OiBwcmltYXJ5QSA9ICJwcmltYXJ5Iiwgc2Vjb25kYXJ5OiBzZWNvbmRhcnlBID0gInNlY29uZGFyeSIgfSA9CiAgICB7IHByaW1hcnk6ICJub3NLaWxsIiwgc2Vjb25kYXJ5OiAibm9Ta2lsbCIgfSB9IG9mIGdldE11bHRpUm9ib3RzKCkpIHsKICAgIGNvbnNvbGUubG9nKHByaW1hcnlBKTsKfQpmb3IgKHsgc2tpbGxzOiB7IHByaW1hcnk6IHByaW1hcnlBID0gInByaW1hcnkiLCBzZWNvbmRhcnk6IHNlY29uZGFyeUEgPSAic2Vjb25kYXJ5IiB9ID0KICAgIHsgcHJpbWFyeTogIm5vc0tpbGwiLCBzZWNvbmRhcnk6ICJub1NraWxsIiB9IH0gb2YKICAgIDxNdWx0aVJvYm90W10+W3sgbmFtZTogIm1vd2VyIiwgc2tpbGxzOiB7IHByaW1hcnk6ICJtb3dpbmciLCBzZWNvbmRhcnk6ICJub25lIiB9IH0sCiAgICAgICAgeyBuYW1lOiAidHJpbW1lciIsIHNraWxsczogeyBwcmltYXJ5OiAidHJpbW1pbmciLCBzZWNvbmRhcnk6ICJlZGdpbmciIH0gfV0pIHsKICAgIGNvbnNvbGUubG9nKHByaW1hcnlBKTsKfQoKZm9yICh7IG5hbWUgPSAibm9OYW1lIiB9IG9mIHJvYm90cykgewogICAgY29uc29sZS5sb2cobmFtZUEpOwp9CmZvciAoeyBuYW1lID0gIm5vTmFtZSIgfSBvZiBnZXRSb2JvdHMoKSkgewogICAgY29uc29sZS5sb2cobmFtZUEpOwp9CmZvciAoeyBuYW1lID0gIm5vTmFtZSIgfSBvZiBbeyBuYW1lOiAibW93ZXIiLCBza2lsbDogIm1vd2luZyIgfSwgeyBuYW1lOiAidHJpbW1lciIsIHNraWxsOiAidHJpbW1pbmciIH1dKSB7CiAgICBjb25zb2xlLmxvZyhuYW1lQSk7Cn0KZm9yICh7CiAgICBza2lsbHM6IHsKICAgICAgICBwcmltYXJ5ID0gInByaW1hcnkiLAogICAgICAgIHNlY29uZGFyeSA9ICJzZWNvbmRhcnkiCiAgICB9ID0geyBwcmltYXJ5OiAibm9Ta2lsbCIsIHNlY29uZGFyeTogIm5vU2tpbGwiIH0KfSBvZiBtdWx0aVJvYm90cykgewogICAgY29uc29sZS5sb2cocHJpbWFyeUEpOwp9CmZvciAoewogICAgc2tpbGxzOiB7CiAgICAgICAgcHJpbWFyeSA9ICJwcmltYXJ5IiwKICAgICAgICBzZWNvbmRhcnkgPSAic2Vjb25kYXJ5IgogICAgfSA9IHsgcHJpbWFyeTogIm5vU2tpbGwiLCBzZWNvbmRhcnk6ICJub1NraWxsIiB9Cn0gb2YgZ2V0TXVsdGlSb2JvdHMoKSkgewogICAgY29uc29sZS5sb2cocHJpbWFyeUEpOwp9CmZvciAoewogICAgc2tpbGxzOiB7CiAgICAgICAgcHJpbWFyeSA9ICJwcmltYXJ5IiwKICAgICAgICBzZWNvbmRhcnkgPSAic2Vjb25kYXJ5IgogICAgfSA9IHsgcHJpbWFyeTogIm5vU2tpbGwiLCBzZWNvbmRhcnk6ICJub1NraWxsIiB9Cn0gb2YgW3sgbmFtZTogIm1vd2VyIiwgc2tpbGxzOiB7IHByaW1hcnk6ICJtb3dpbmciLCBzZWNvbmRhcnk6ICJub25lIiB9IH0sCiAgICB7IG5hbWU6ICJ0cmltbWVyIiwgc2tpbGxzOiB7IHByaW1hcnk6ICJ0cmltbWluZyIsIHNlY29uZGFyeTogImVkZ2luZyIgfSB9XSkgewogICAgY29uc29sZS5sb2cocHJpbWFyeUEpOwp9CgoKZm9yICh7bmFtZTogbmFtZUEgPSAibm9OYW1lIiwgc2tpbGw6IHNraWxsQSA9ICJub1NraWxsIiB9IG9mIHJvYm90cykgewogICAgY29uc29sZS5sb2cobmFtZUEpOwp9CmZvciAoe25hbWU6IG5hbWVBID0gIm5vTmFtZSIsIHNraWxsOiBza2lsbEEgPSAibm9Ta2lsbCIgIH0gb2YgZ2V0Um9ib3RzKCkpIHsKICAgIGNvbnNvbGUubG9nKG5hbWVBKTsKfQpmb3IgKHtuYW1lOiBuYW1lQSA9ICJub05hbWUiLCBza2lsbDogc2tpbGxBID0gIm5vU2tpbGwiICB9IG9mIFt7IG5hbWU6ICJtb3dlciIsIHNraWxsOiAibW93aW5nIiB9LCB7IG5hbWU6ICJ0cmltbWVyIiwgc2tpbGw6ICJ0cmltbWluZyIgfV0pIHsKICAgIGNvbnNvbGUubG9nKG5hbWVBKTsKfQpmb3IgKHsKICAgIG5hbWU6IG5hbWVBID0gIm5vTmFtZSIsCiAgICBza2lsbHM6IHsKICAgICAgICBwcmltYXJ5OiBwcmltYXJ5QSA9ICJwcmltYXJ5IiwKICAgICAgICBzZWNvbmRhcnk6IHNlY29uZGFyeUEgPSAic2Vjb25kYXJ5IgogICAgfSA9IHsgcHJpbWFyeTogIm5vU2tpbGwiLCBzZWNvbmRhcnk6ICJub1NraWxsIiB9Cn0gb2YgbXVsdGlSb2JvdHMpIHsKICAgIGNvbnNvbGUubG9nKG5hbWVBKTsKfQpmb3IgKHsKICAgIG5hbWU6IG5hbWVBID0gIm5vTmFtZSIsCiAgICBza2lsbHM6IHsKICAgICAgICBwcmltYXJ5OiBwcmltYXJ5QSA9ICJwcmltYXJ5IiwKICAgICAgICBzZWNvbmRhcnk6IHNlY29uZGFyeUEgPSAic2Vjb25kYXJ5IgogICAgfSA9IHsgcHJpbWFyeTogIm5vU2tpbGwiLCBzZWNvbmRhcnk6ICJub1NraWxsIiB9Cn0gb2YgZ2V0TXVsdGlSb2JvdHMoKSkgewogICAgY29uc29sZS5sb2cobmFtZUEpOwp9CmZvciAoewogICAgbmFtZTogbmFtZUEgPSAibm9OYW1lIiwKICAgIHNraWxsczogewogICAgICAgIHByaW1hcnk6IHByaW1hcnlBID0gInByaW1hcnkiLAogICAgICAgIHNlY29uZGFyeTogc2Vjb25kYXJ5QSA9ICJzZWNvbmRhcnkiCiAgICB9ID0geyBwcmltYXJ5OiAibm9Ta2lsbCIsIHNlY29uZGFyeTogIm5vU2tpbGwiIH0KfSBvZiA8TXVsdGlSb2JvdFtdPlt7IG5hbWU6ICJtb3dlciIsIHNraWxsczogeyBwcmltYXJ5OiAibW93aW5nIiwgc2Vjb25kYXJ5OiAibm9uZSIgfSB9LAogICAgeyBuYW1lOiAidHJpbW1lciIsIHNraWxsczogeyBwcmltYXJ5OiAidHJpbW1pbmciLCBzZWNvbmRhcnk6ICJlZGdpbmciIH0gfV0pIHsKICAgIGNvbnNvbGUubG9nKG5hbWVBKTsKfQoKZm9yICh7IG5hbWUgPSAibm9OYW1lIiwgc2tpbGwgID0gIm5vU2tpbGwiIH0gb2Ygcm9ib3RzKSB7CiAgICBjb25zb2xlLmxvZyhuYW1lQSk7Cn0KZm9yICh7IG5hbWUgPSAibm9OYW1lIiwgc2tpbGwgPSAibm9Ta2lsbCIgIH0gb2YgZ2V0Um9ib3RzKCkpIHsKICAgIGNvbnNvbGUubG9nKG5hbWVBKTsKfQpmb3IgKHsgbmFtZSA9ICJub05hbWUiLCBza2lsbCAgPSAibm9Ta2lsbCIgfSBvZiBbeyBuYW1lOiAibW93ZXIiLCBza2lsbDogIm1vd2luZyIgfSwgeyBuYW1lOiAidHJpbW1lciIsIHNraWxsOiAidHJpbW1pbmciIH1dKSB7CiAgICBjb25zb2xlLmxvZyhuYW1lQSk7Cn0KZm9yICh7CiAgICBuYW1lID0gIm5vTmFtZSIsCiAgICBza2lsbHM6IHsKICAgICAgICBwcmltYXJ5ID0gInByaW1hcnkiLAogICAgICAgIHNlY29uZGFyeSA9ICJzZWNvbmRhcnkiCiAgICB9ID0geyBwcmltYXJ5OiAibm9Ta2lsbCIsIHNlY29uZGFyeTogIm5vU2tpbGwiIH0KfSBvZiBtdWx0aVJvYm90cykgewogICAgY29uc29sZS5sb2cobmFtZUEpOwp9CmZvciAoewogICAgbmFtZSA9ICJub05hbWUiLAogICAgc2tpbGxzOiB7CiAgICAgICAgcHJpbWFyeSA9ICJwcmltYXJ5IiwKICAgICAgICBzZWNvbmRhcnkgPSAic2Vjb25kYXJ5IgogICAgfSA9IHsgcHJpbWFyeTogIm5vU2tpbGwiLCBzZWNvbmRhcnk6ICJub1NraWxsIiB9Cn0gb2YgZ2V0TXVsdGlSb2JvdHMoKSkgewogICAgY29uc29sZS5sb2cobmFtZUEpOwp9CmZvciAoewogICAgbmFtZSA9ICJub05hbWUiLAogICAgc2tpbGxzOiB7CiAgICAgICAgcHJpbWFyeSA9ICJwcmltYXJ5IiwKICAgICAgICBzZWNvbmRhcnkgPSAic2Vjb25kYXJ5IgogICAgfSA9IHsgcHJpbWFyeTogIm5vU2tpbGwiLCBzZWNvbmRhcnk6ICJub1NraWxsIiB9Cn0gb2YgW3sgbmFtZTogIm1vd2VyIiwgc2tpbGxzOiB7IHByaW1hcnk6ICJtb3dpbmciLCBzZWNvbmRhcnk6ICJub25lIiB9IH0sCiAgICB7IG5hbWU6ICJ0cmltbWVyIiwgc2tpbGxzOiB7IHByaW1hcnk6ICJ0cmltbWluZyIsIHNlY29uZGFyeTogImVkZ2luZyIgfSB9XSkgewogICAgY29uc29sZS5sb2cobmFtZUEpOwp9 diff --git a/tests/baselines/reference/sourceMapValidationEnums.js.map b/tests/baselines/reference/sourceMapValidationEnums.js.map index 5126edbb66de1..f4047f8915546 100644 --- a/tests/baselines/reference/sourceMapValidationEnums.js.map +++ b/tests/baselines/reference/sourceMapValidationEnums.js.map @@ -1,3 +1,3 @@ //// [sourceMapValidationEnums.js.map] -{"version":3,"file":"sourceMapValidationEnums.js","sourceRoot":"","sources":["sourceMapValidationEnums.ts"],"names":[],"mappings":";AAAA,IAAK,CAIJ;AAJD,WAAK,CAAC;IACF,mBAAC,CAAA;IACD,mBAAC,CAAA;IACD,mBAAC,CAAA;AACL,CAAC,EAJI,CAAC,KAAD,CAAC,QAIL;AACD,IAAK,EAKJ;AALD,WAAK,EAAE;IACH,sBAAM,CAAA;IACN,sBAAM,CAAA;IACN,sBAAC,CAAA;IACD,wBAAE,CAAA;AACN,CAAC,EALI,EAAE,KAAF,EAAE,QAKN;AACD,IAAK,EACJ;AADD,WAAK,EAAE;AACP,CAAC,EADI,EAAE,KAAF,EAAE,QACN"} +{"version":3,"file":"sourceMapValidationEnums.js","sourceRoot":"","sources":["sourceMapValidationEnums.ts"],"names":[],"mappings":";AAAA,IAAK,CAIJ;AAJD,WAAK,CAAC;IACF,mBAAC,CAAA;IACD,mBAAC,CAAA;IACD,mBAAC,CAAA;AACL,CAAC,EAJI,CAAC,KAAD,CAAC,QAIL;AACD,IAAK,EAKJ;AALD,WAAK,EAAE;IACH,sBAAM,CAAA;IACN,sBAAM,CAAA;IACN,sBAAC,CAAA;IACD,wBAAE,CAAA;AACN,CAAC,EALI,EAAE,KAAF,EAAE,QAKN;AACD,IAAK,EACJ;ADD,WAAK,EAAE;AACP,CAAC,EADI,EAAE,KAAF,EAAE,QACN"} //// https://sokra.github.io/source-map-visualization#base64,InVzZSBzdHJpY3QiOw0KdmFyIGU7DQooZnVuY3Rpb24gKGUpIHsNCiAgICBlW2VbIngiXSA9IDBdID0gIngiOw0KICAgIGVbZVsieSJdID0gMV0gPSAieSI7DQogICAgZVtlWyJ4Il0gPSAyXSA9ICJ4IjsNCn0pKGUgfHwgKGUgPSB7fSkpOw0KdmFyIGUyOw0KKGZ1bmN0aW9uIChlMikgew0KICAgIGUyW2UyWyJ4Il0gPSAxMF0gPSAieCI7DQogICAgZTJbZTJbInkiXSA9IDEwXSA9ICJ5IjsNCiAgICBlMltlMlsieiJdID0gMTFdID0gInoiOw0KICAgIGUyW2UyWyJ4MiJdID0gMTJdID0gIngyIjsNCn0pKGUyIHx8IChlMiA9IHt9KSk7DQp2YXIgZTM7DQooZnVuY3Rpb24gKGUzKSB7DQp9KShlMyB8fCAoZTMgPSB7fSkpOw0KLy8jIHNvdXJjZU1hcHBpbmdVUkw9c291cmNlTWFwVmFsaWRhdGlvbkVudW1zLmpzLm1hcA==,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic291cmNlTWFwVmFsaWRhdGlvbkVudW1zLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsic291cmNlTWFwVmFsaWRhdGlvbkVudW1zLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSxJQUFLLENBSUo7QUFKRCxXQUFLLENBQUM7SUFDRixtQkFBQyxDQUFBO0lBQ0QsbUJBQUMsQ0FBQTtJQUNELG1CQUFDLENBQUE7QUFDTCxDQUFDLEVBSkksQ0FBQyxLQUFELENBQUMsUUFJTDtBQUNELElBQUssRUFLSjtBQUxELFdBQUssRUFBRTtJQUNILHNCQUFNLENBQUE7SUFDTixzQkFBTSxDQUFBO0lBQ04sc0JBQUMsQ0FBQTtJQUNELHdCQUFFLENBQUE7QUFDTixDQUFDLEVBTEksRUFBRSxLQUFGLEVBQUUsUUFLTjtBQUNELElBQUssRUFDSjtBQURELFdBQUssRUFBRTtBQUNQLENBQUMsRUFESSxFQUFFLEtBQUYsRUFBRSxRQUNOIn0=,ZW51bSBlIHsKICAgIHgsCiAgICB5LAogICAgeAp9CmVudW0gZTIgewogICAgeCA9IDEwLAogICAgeSA9IDEwLAogICAgeiwKICAgIHgyCn0KZW51bSBlMyB7Cn0= diff --git a/tests/baselines/reference/spellingUncheckedJS.symbols b/tests/baselines/reference/spellingUncheckedJS.symbols index ca3591e64cf74..bbec41804c320 100644 --- a/tests/baselines/reference/spellingUncheckedJS.symbols +++ b/tests/baselines/reference/spellingUncheckedJS.symbols @@ -24,8 +24,8 @@ class Classe { non = 'oui' >non : Symbol(Classe.non, Decl(spellingUncheckedJS.js, 11, 14)) - methode() { ->methode : Symbol(Classe.methode, Decl(spellingUncheckedJS.js, 12, 15)) + method() { +>method : Symbol(Classe.method, Decl(spellingUncheckedJS.js, 12, 15)) // no error on 'this' references return this.none @@ -36,8 +36,8 @@ class Derivee extends Classe { >Derivee : Symbol(Derivee, Decl(spellingUncheckedJS.js, 17, 1)) >Classe : Symbol(Classe, Decl(spellingUncheckedJS.js, 10, 1)) - methode() { ->methode : Symbol(Derivee.methode, Decl(spellingUncheckedJS.js, 18, 30)) + method() { +>method : Symbol(Derivee.method, Decl(spellingUncheckedJS.js, 18, 30)) // no error on 'super' references return super.none diff --git a/tests/baselines/reference/spellingUncheckedJS.types b/tests/baselines/reference/spellingUncheckedJS.types index 2b99c2b536165..4771446956f18 100644 --- a/tests/baselines/reference/spellingUncheckedJS.types +++ b/tests/baselines/reference/spellingUncheckedJS.types @@ -59,8 +59,8 @@ class Classe { >'oui' : "oui" > : ^^^^^ - methode() { ->methode : () => any + method() { +>method : () => any > : ^^^^^^^^^ // no error on 'this' references @@ -78,8 +78,8 @@ class Derivee extends Classe { >Classe : Classe > : ^^^^^^ - methode() { ->methode : () => any + method() { +>method : () => any > : ^^^^^^^^^ // no error on 'super' references diff --git a/tests/baselines/reference/spreadInvalidArgumentType.errors.txt b/tests/baselines/reference/spreadInvalidArgumentType.errors.txt index a134c8d1a012d..54a0b59775aa5 100644 --- a/tests/baselines/reference/spreadInvalidArgumentType.errors.txt +++ b/tests/baselines/reference/spreadInvalidArgumentType.errors.txt @@ -42,7 +42,7 @@ spreadInvalidArgumentType.ts(54,17): error TS2698: Spread types may only be crea var o1 = { ...p1 }; // OK, generic type paramterre var o2 = { ...p2 }; // OK - var o3 = { ...t }; // OK, generic type paramter + var o3 = { ...t }; // OK, generic type parameter var o4 = { ...i }; // Error, index access ~~~~ !!! error TS2698: Spread types may only be created from object types. diff --git a/tests/baselines/reference/spreadInvalidArgumentType.js b/tests/baselines/reference/spreadInvalidArgumentType.js index 31bb387941df4..c92f5e185583e 100644 --- a/tests/baselines/reference/spreadInvalidArgumentType.js +++ b/tests/baselines/reference/spreadInvalidArgumentType.js @@ -31,7 +31,7 @@ function f(p1: T, p2: T[]) { var o1 = { ...p1 }; // OK, generic type paramterre var o2 = { ...p2 }; // OK - var o3 = { ...t }; // OK, generic type paramter + var o3 = { ...t }; // OK, generic type parameter var o4 = { ...i }; // Error, index access var o5 = { ...k }; // Error, index var o6 = { ...mapped_generic }; // OK, generic mapped object type @@ -86,7 +86,7 @@ function f(p1, p2) { var e; var o1 = Object.assign({}, p1); // OK, generic type paramterre var o2 = Object.assign({}, p2); // OK - var o3 = Object.assign({}, t); // OK, generic type paramter + var o3 = Object.assign({}, t); // OK, generic type parameter var o4 = Object.assign({}, i); // Error, index access var o5 = Object.assign({}, k); // Error, index var o6 = Object.assign({}, mapped_generic); // OK, generic mapped object type diff --git a/tests/baselines/reference/spreadInvalidArgumentType.symbols b/tests/baselines/reference/spreadInvalidArgumentType.symbols index dda678d72db2b..ee22c9990cf0f 100644 --- a/tests/baselines/reference/spreadInvalidArgumentType.symbols +++ b/tests/baselines/reference/spreadInvalidArgumentType.symbols @@ -93,7 +93,7 @@ function f(p1: T, p2: T[]) { >o2 : Symbol(o2, Decl(spreadInvalidArgumentType.ts, 29, 7)) >p2 : Symbol(p2, Decl(spreadInvalidArgumentType.ts, 2, 42)) - var o3 = { ...t }; // OK, generic type paramter + var o3 = { ...t }; // OK, generic type parameter >o3 : Symbol(o3, Decl(spreadInvalidArgumentType.ts, 30, 7)) >t : Symbol(t, Decl(spreadInvalidArgumentType.ts, 3, 7)) diff --git a/tests/baselines/reference/spreadInvalidArgumentType.types b/tests/baselines/reference/spreadInvalidArgumentType.types index ac3e11a036a09..ed0284e8a5a97 100644 --- a/tests/baselines/reference/spreadInvalidArgumentType.types +++ b/tests/baselines/reference/spreadInvalidArgumentType.types @@ -120,7 +120,7 @@ function f(p1: T, p2: T[]) { >p2 : T[] > : ^^^ - var o3 = { ...t }; // OK, generic type paramter + var o3 = { ...t }; // OK, generic type parameter >o3 : T > : ^ >{ ...t } : T diff --git a/tests/baselines/reference/statics.errors.txt b/tests/baselines/reference/statics.errors.txt index e76242c34fadd..d5f8d304be02d 100644 --- a/tests/baselines/reference/statics.errors.txt +++ b/tests/baselines/reference/statics.errors.txt @@ -1,8 +1,8 @@ -statics.ts(6,18): error TS2339: Property 'g' does not exist on type 'C'. -statics.ts(23,33): error TS2339: Property 'g' does not exist on type 'C'. +statistics.ts(6,18): error TS2339: Property 'g' does not exist on type 'C'. +statistics.ts(23,33): error TS2339: Property 'g' does not exist on type 'C'. -==== statics.ts (2 errors) ==== +==== statistics.ts (2 errors) ==== namespace M { export class C { x: number; diff --git a/tests/baselines/reference/statics.js b/tests/baselines/reference/statics.js index c484fcec0347d..0b3c58b5a4bd2 100644 --- a/tests/baselines/reference/statics.js +++ b/tests/baselines/reference/statics.js @@ -1,6 +1,6 @@ -//// [tests/cases/compiler/statics.ts] //// +//// [tests/cases/compiler/statistics.ts] //// -//// [statics.ts] +//// [statistics.ts] namespace M { export class C { x: number; @@ -33,7 +33,7 @@ M.f(); -//// [statics.js] +//// [statistics.js] "use strict"; var M; (function (M) { diff --git a/tests/baselines/reference/statics.symbols b/tests/baselines/reference/statics.symbols index a9acf79786101..37e44778ed4f9 100644 --- a/tests/baselines/reference/statics.symbols +++ b/tests/baselines/reference/statics.symbols @@ -1,133 +1,133 @@ -//// [tests/cases/compiler/statics.ts] //// +//// [tests/cases/compiler/statistics.ts] //// -=== statics.ts === +=== statistics.ts === namespace M { ->M : Symbol(M, Decl(statics.ts, 0, 0)) +>M : Symbol(M, Decl(statistics.ts, 0, 0)) export class C { ->C : Symbol(C, Decl(statics.ts, 0, 13)) +>C : Symbol(C, Decl(statistics.ts, 0, 13)) x: number; ->x : Symbol(C.x, Decl(statics.ts, 1, 20)) +>x : Symbol(C.x, Decl(statistics.ts, 1, 20)) constructor(public c1: number, public c2: number, c3: number) { ->c1 : Symbol(C.c1, Decl(statics.ts, 3, 20)) ->c2 : Symbol(C.c2, Decl(statics.ts, 3, 38)) ->c3 : Symbol(c3, Decl(statics.ts, 3, 57)) +>c1 : Symbol(C.c1, Decl(statistics.ts, 3, 20)) +>c2 : Symbol(C.c2, Decl(statistics.ts, 3, 38)) +>c3 : Symbol(c3, Decl(statistics.ts, 3, 57)) this.x = C.y+this.c1+this.c2+c3; ->this.x : Symbol(C.x, Decl(statics.ts, 1, 20)) ->this : Symbol(C, Decl(statics.ts, 0, 13)) ->x : Symbol(C.x, Decl(statics.ts, 1, 20)) ->C.y : Symbol(C.y, Decl(statics.ts, 9, 21)) ->C : Symbol(C, Decl(statics.ts, 0, 13)) ->y : Symbol(C.y, Decl(statics.ts, 9, 21)) ->this.c1 : Symbol(C.c1, Decl(statics.ts, 3, 20)) ->this : Symbol(C, Decl(statics.ts, 0, 13)) ->c1 : Symbol(C.c1, Decl(statics.ts, 3, 20)) ->this.c2 : Symbol(C.c2, Decl(statics.ts, 3, 38)) ->this : Symbol(C, Decl(statics.ts, 0, 13)) ->c2 : Symbol(C.c2, Decl(statics.ts, 3, 38)) ->c3 : Symbol(c3, Decl(statics.ts, 3, 57)) +>this.x : Symbol(C.x, Decl(statistics.ts, 1, 20)) +>this : Symbol(C, Decl(statistics.ts, 0, 13)) +>x : Symbol(C.x, Decl(statistics.ts, 1, 20)) +>C.y : Symbol(C.y, Decl(statistics.ts, 9, 21)) +>C : Symbol(C, Decl(statistics.ts, 0, 13)) +>y : Symbol(C.y, Decl(statistics.ts, 9, 21)) +>this.c1 : Symbol(C.c1, Decl(statistics.ts, 3, 20)) +>this : Symbol(C, Decl(statistics.ts, 0, 13)) +>c1 : Symbol(C.c1, Decl(statistics.ts, 3, 20)) +>this.c2 : Symbol(C.c2, Decl(statistics.ts, 3, 38)) +>this : Symbol(C, Decl(statistics.ts, 0, 13)) +>c2 : Symbol(C.c2, Decl(statistics.ts, 3, 38)) +>c3 : Symbol(c3, Decl(statistics.ts, 3, 57)) this.g = (v:number) => C.f(this.x+C.y+v+this.c1+this.c2+C.pub); ->this : Symbol(C, Decl(statics.ts, 0, 13)) ->v : Symbol(v, Decl(statics.ts, 5, 22)) ->C.f : Symbol(C.f, Decl(statics.ts, 10, 24)) ->C : Symbol(C, Decl(statics.ts, 0, 13)) ->f : Symbol(C.f, Decl(statics.ts, 10, 24)) ->this.x : Symbol(C.x, Decl(statics.ts, 1, 20)) ->this : Symbol(C, Decl(statics.ts, 0, 13)) ->x : Symbol(C.x, Decl(statics.ts, 1, 20)) ->C.y : Symbol(C.y, Decl(statics.ts, 9, 21)) ->C : Symbol(C, Decl(statics.ts, 0, 13)) ->y : Symbol(C.y, Decl(statics.ts, 9, 21)) ->v : Symbol(v, Decl(statics.ts, 5, 22)) ->this.c1 : Symbol(C.c1, Decl(statics.ts, 3, 20)) ->this : Symbol(C, Decl(statics.ts, 0, 13)) ->c1 : Symbol(C.c1, Decl(statics.ts, 3, 20)) ->this.c2 : Symbol(C.c2, Decl(statics.ts, 3, 38)) ->this : Symbol(C, Decl(statics.ts, 0, 13)) ->c2 : Symbol(C.c2, Decl(statics.ts, 3, 38)) ->C.pub : Symbol(C.pub, Decl(statics.ts, 8, 22)) ->C : Symbol(C, Decl(statics.ts, 0, 13)) ->pub : Symbol(C.pub, Decl(statics.ts, 8, 22)) +>this : Symbol(C, Decl(statistics.ts, 0, 13)) +>v : Symbol(v, Decl(statistics.ts, 5, 22)) +>C.f : Symbol(C.f, Decl(statistics.ts, 10, 24)) +>C : Symbol(C, Decl(statistics.ts, 0, 13)) +>f : Symbol(C.f, Decl(statistics.ts, 10, 24)) +>this.x : Symbol(C.x, Decl(statistics.ts, 1, 20)) +>this : Symbol(C, Decl(statistics.ts, 0, 13)) +>x : Symbol(C.x, Decl(statistics.ts, 1, 20)) +>C.y : Symbol(C.y, Decl(statistics.ts, 9, 21)) +>C : Symbol(C, Decl(statistics.ts, 0, 13)) +>y : Symbol(C.y, Decl(statistics.ts, 9, 21)) +>v : Symbol(v, Decl(statistics.ts, 5, 22)) +>this.c1 : Symbol(C.c1, Decl(statistics.ts, 3, 20)) +>this : Symbol(C, Decl(statistics.ts, 0, 13)) +>c1 : Symbol(C.c1, Decl(statistics.ts, 3, 20)) +>this.c2 : Symbol(C.c2, Decl(statistics.ts, 3, 38)) +>this : Symbol(C, Decl(statistics.ts, 0, 13)) +>c2 : Symbol(C.c2, Decl(statistics.ts, 3, 38)) +>C.pub : Symbol(C.pub, Decl(statistics.ts, 8, 22)) +>C : Symbol(C, Decl(statistics.ts, 0, 13)) +>pub : Symbol(C.pub, Decl(statistics.ts, 8, 22)) } static priv=2; ->priv : Symbol(C.priv, Decl(statics.ts, 6, 9)) +>priv : Symbol(C.priv, Decl(statistics.ts, 6, 9)) static pub=3; ->pub : Symbol(C.pub, Decl(statics.ts, 8, 22)) +>pub : Symbol(C.pub, Decl(statistics.ts, 8, 22)) static y=C.priv; ->y : Symbol(C.y, Decl(statics.ts, 9, 21)) ->C.priv : Symbol(C.priv, Decl(statics.ts, 6, 9)) ->C : Symbol(C, Decl(statics.ts, 0, 13)) ->priv : Symbol(C.priv, Decl(statics.ts, 6, 9)) +>y : Symbol(C.y, Decl(statistics.ts, 9, 21)) +>C.priv : Symbol(C.priv, Decl(statistics.ts, 6, 9)) +>C : Symbol(C, Decl(statistics.ts, 0, 13)) +>priv : Symbol(C.priv, Decl(statistics.ts, 6, 9)) static f(n:number) { ->f : Symbol(C.f, Decl(statics.ts, 10, 24)) ->n : Symbol(n, Decl(statics.ts, 11, 17)) +>f : Symbol(C.f, Decl(statistics.ts, 10, 24)) +>n : Symbol(n, Decl(statistics.ts, 11, 17)) return "wow: "+(n+C.y+C.pub+C.priv); ->n : Symbol(n, Decl(statics.ts, 11, 17)) ->C.y : Symbol(C.y, Decl(statics.ts, 9, 21)) ->C : Symbol(C, Decl(statics.ts, 0, 13)) ->y : Symbol(C.y, Decl(statics.ts, 9, 21)) ->C.pub : Symbol(C.pub, Decl(statics.ts, 8, 22)) ->C : Symbol(C, Decl(statics.ts, 0, 13)) ->pub : Symbol(C.pub, Decl(statics.ts, 8, 22)) ->C.priv : Symbol(C.priv, Decl(statics.ts, 6, 9)) ->C : Symbol(C, Decl(statics.ts, 0, 13)) ->priv : Symbol(C.priv, Decl(statics.ts, 6, 9)) +>n : Symbol(n, Decl(statistics.ts, 11, 17)) +>C.y : Symbol(C.y, Decl(statistics.ts, 9, 21)) +>C : Symbol(C, Decl(statistics.ts, 0, 13)) +>y : Symbol(C.y, Decl(statistics.ts, 9, 21)) +>C.pub : Symbol(C.pub, Decl(statistics.ts, 8, 22)) +>C : Symbol(C, Decl(statistics.ts, 0, 13)) +>pub : Symbol(C.pub, Decl(statistics.ts, 8, 22)) +>C.priv : Symbol(C.priv, Decl(statistics.ts, 6, 9)) +>C : Symbol(C, Decl(statistics.ts, 0, 13)) +>priv : Symbol(C.priv, Decl(statistics.ts, 6, 9)) } } var c=C.y; ->c : Symbol(c, Decl(statics.ts, 16, 7)) ->C.y : Symbol(C.y, Decl(statics.ts, 9, 21)) ->C : Symbol(C, Decl(statics.ts, 0, 13)) ->y : Symbol(C.y, Decl(statics.ts, 9, 21)) +>c : Symbol(c, Decl(statistics.ts, 16, 7)) +>C.y : Symbol(C.y, Decl(statistics.ts, 9, 21)) +>C : Symbol(C, Decl(statistics.ts, 0, 13)) +>y : Symbol(C.y, Decl(statistics.ts, 9, 21)) export function f() { ->f : Symbol(f, Decl(statics.ts, 16, 14)) +>f : Symbol(f, Decl(statistics.ts, 16, 14)) var result=""; ->result : Symbol(result, Decl(statics.ts, 18, 11)) +>result : Symbol(result, Decl(statistics.ts, 18, 11)) result+=(c); ->result : Symbol(result, Decl(statics.ts, 18, 11)) ->c : Symbol(c, Decl(statics.ts, 16, 7)) +>result : Symbol(result, Decl(statistics.ts, 18, 11)) +>c : Symbol(c, Decl(statistics.ts, 16, 7)) result+=(new C(0,1,2).x); ->result : Symbol(result, Decl(statics.ts, 18, 11)) ->new C(0,1,2).x : Symbol(C.x, Decl(statics.ts, 1, 20)) ->C : Symbol(C, Decl(statics.ts, 0, 13)) ->x : Symbol(C.x, Decl(statics.ts, 1, 20)) +>result : Symbol(result, Decl(statistics.ts, 18, 11)) +>new C(0,1,2).x : Symbol(C.x, Decl(statistics.ts, 1, 20)) +>C : Symbol(C, Decl(statistics.ts, 0, 13)) +>x : Symbol(C.x, Decl(statistics.ts, 1, 20)) result+=(C.f(10)); ->result : Symbol(result, Decl(statics.ts, 18, 11)) ->C.f : Symbol(C.f, Decl(statics.ts, 10, 24)) ->C : Symbol(C, Decl(statics.ts, 0, 13)) ->f : Symbol(C.f, Decl(statics.ts, 10, 24)) +>result : Symbol(result, Decl(statistics.ts, 18, 11)) +>C.f : Symbol(C.f, Decl(statistics.ts, 10, 24)) +>C : Symbol(C, Decl(statistics.ts, 0, 13)) +>f : Symbol(C.f, Decl(statistics.ts, 10, 24)) result+=(new C(5,10,20).g(C.y)); ->result : Symbol(result, Decl(statics.ts, 18, 11)) ->C : Symbol(C, Decl(statics.ts, 0, 13)) ->C.y : Symbol(C.y, Decl(statics.ts, 9, 21)) ->C : Symbol(C, Decl(statics.ts, 0, 13)) ->y : Symbol(C.y, Decl(statics.ts, 9, 21)) +>result : Symbol(result, Decl(statistics.ts, 18, 11)) +>C : Symbol(C, Decl(statistics.ts, 0, 13)) +>C.y : Symbol(C.y, Decl(statistics.ts, 9, 21)) +>C : Symbol(C, Decl(statistics.ts, 0, 13)) +>y : Symbol(C.y, Decl(statistics.ts, 9, 21)) return result; ->result : Symbol(result, Decl(statics.ts, 18, 11)) +>result : Symbol(result, Decl(statistics.ts, 18, 11)) } } M.f(); ->M.f : Symbol(M.f, Decl(statics.ts, 16, 14)) ->M : Symbol(M, Decl(statics.ts, 0, 0)) ->f : Symbol(M.f, Decl(statics.ts, 16, 14)) +>M.f : Symbol(M.f, Decl(statistics.ts, 16, 14)) +>M : Symbol(M, Decl(statistics.ts, 0, 0)) +>f : Symbol(M.f, Decl(statistics.ts, 16, 14)) diff --git a/tests/baselines/reference/statics.types b/tests/baselines/reference/statics.types index e6cda45e00a62..49ce9def70f1b 100644 --- a/tests/baselines/reference/statics.types +++ b/tests/baselines/reference/statics.types @@ -1,6 +1,6 @@ -//// [tests/cases/compiler/statics.ts] //// +//// [tests/cases/compiler/statistics.ts] //// -=== statics.ts === +=== statistics.ts === namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/strictModeReservedWord.errors.txt b/tests/baselines/reference/strictModeReservedWord.errors.txt index 422e7f6d72ddf..75855678e8118 100644 --- a/tests/baselines/reference/strictModeReservedWord.errors.txt +++ b/tests/baselines/reference/strictModeReservedWord.errors.txt @@ -153,7 +153,7 @@ strictModeReservedWord.ts(24,5): error TS2349: This expression is not callable. !!! error TS1212: Identifier expected. 'interface' is a reserved word in strict mode. ~~~~~~~~~ !!! error TS2503: Cannot find namespace 'interface'. - ublic(); + public(); ~~~~~ !!! error TS2552: Cannot find name 'ublic'. Did you mean 'public'? !!! related TS2728 strictModeReservedWord.ts:5:9: 'public' is declared here. diff --git a/tests/baselines/reference/strictModeReservedWord.js b/tests/baselines/reference/strictModeReservedWord.js index a284e3885de7b..91a4a187d50e5 100644 --- a/tests/baselines/reference/strictModeReservedWord.js +++ b/tests/baselines/reference/strictModeReservedWord.js @@ -23,7 +23,7 @@ function foo() { function foo1(x: private.package.x) { } function foo2(x: private.package.protected) { } let b: interface.package.implements.B; - ublic(); + public(); static(); } @@ -50,6 +50,6 @@ function foo() { function foo1(x) { } function foo2(x) { } let b; - ublic(); + public(); static(); } diff --git a/tests/baselines/reference/strictModeReservedWord.symbols b/tests/baselines/reference/strictModeReservedWord.symbols index be9ce5b1a852b..82de66ecccc37 100644 --- a/tests/baselines/reference/strictModeReservedWord.symbols +++ b/tests/baselines/reference/strictModeReservedWord.symbols @@ -84,7 +84,7 @@ function foo() { >implements : Symbol(interface.package.implements) >B : Symbol(interface.package.implements.B) - ublic(); + public(); static(); >static : Symbol(static, Decl(strictModeReservedWord.ts, 5, 7)) } diff --git a/tests/baselines/reference/strictModeReservedWord.types b/tests/baselines/reference/strictModeReservedWord.types index abffd78a7f044..9235dee9d6ff3 100644 --- a/tests/baselines/reference/strictModeReservedWord.types +++ b/tests/baselines/reference/strictModeReservedWord.types @@ -137,10 +137,10 @@ function foo() { >implements : any > : ^^^ - ublic(); ->ublic() : any + public(); +>public() : any > : ^^^ ->ublic : any +>public : any > : ^^^ static(); diff --git a/tests/baselines/reference/strictModeReservedWord2.errors.txt b/tests/baselines/reference/strictModeReservedWord2.errors.txt index 410486c7ccd69..a929f9af6b448 100644 --- a/tests/baselines/reference/strictModeReservedWord2.errors.txt +++ b/tests/baselines/reference/strictModeReservedWord2.errors.txt @@ -35,7 +35,7 @@ strictModeReservedWord2.ts(13,12): error TS1212: Identifier expected. 'private' enum foo { public, private, - pacakge + package } const enum private { @@ -43,12 +43,12 @@ strictModeReservedWord2.ts(13,12): error TS1212: Identifier expected. 'private' !!! error TS1212: Identifier expected. 'private' is a reserved word in strict mode. public, private, - pacakge + package } const enum bar { public, private, - pacakge + package } \ No newline at end of file diff --git a/tests/baselines/reference/strictModeReservedWord2.js b/tests/baselines/reference/strictModeReservedWord2.js index 0a93444e5347e..5dfbf9c362858 100644 --- a/tests/baselines/reference/strictModeReservedWord2.js +++ b/tests/baselines/reference/strictModeReservedWord2.js @@ -10,19 +10,19 @@ enum package { } enum foo { public, private, - pacakge + package } const enum private { public, private, - pacakge + package } const enum bar { public, private, - pacakge + package } @@ -35,5 +35,5 @@ var foo; (function (foo) { foo[foo["public"] = 0] = "public"; foo[foo["private"] = 1] = "private"; - foo[foo["pacakge"] = 2] = "pacakge"; + foo[foo["package"] = 2] = "package"; })(foo || (foo = {})); diff --git a/tests/baselines/reference/strictModeReservedWord2.symbols b/tests/baselines/reference/strictModeReservedWord2.symbols index dd347a36cfd54..55a081b9c4116 100644 --- a/tests/baselines/reference/strictModeReservedWord2.symbols +++ b/tests/baselines/reference/strictModeReservedWord2.symbols @@ -25,8 +25,8 @@ enum foo { private, >private : Symbol(foo.private, Decl(strictModeReservedWord2.ts, 7, 11)) - pacakge ->pacakge : Symbol(foo.pacakge, Decl(strictModeReservedWord2.ts, 8, 12)) + package +>package : Symbol(foo.package, Decl(strictModeReservedWord2.ts, 8, 12)) } const enum private { @@ -38,8 +38,8 @@ const enum private { private, >private : Symbol(private.private, Decl(strictModeReservedWord2.ts, 13, 11)) - pacakge ->pacakge : Symbol(private.pacakge, Decl(strictModeReservedWord2.ts, 14, 12)) + package +>package : Symbol(private.package, Decl(strictModeReservedWord2.ts, 14, 12)) } const enum bar { @@ -51,7 +51,7 @@ const enum bar { private, >private : Symbol(bar.private, Decl(strictModeReservedWord2.ts, 19, 11)) - pacakge ->pacakge : Symbol(bar.pacakge, Decl(strictModeReservedWord2.ts, 20, 12)) + package +>package : Symbol(bar.package, Decl(strictModeReservedWord2.ts, 20, 12)) } diff --git a/tests/baselines/reference/strictModeReservedWord2.types b/tests/baselines/reference/strictModeReservedWord2.types index 118d677079409..417e852311026 100644 --- a/tests/baselines/reference/strictModeReservedWord2.types +++ b/tests/baselines/reference/strictModeReservedWord2.types @@ -31,8 +31,8 @@ enum foo { >private : foo.private > : ^^^^^^^^^^^ - pacakge ->pacakge : foo.pacakge + package +>package : foo.package > : ^^^^^^^^^^^ } @@ -48,8 +48,8 @@ const enum private { >private : private.private > : ^^^^^^^^^^^^^^^ - pacakge ->pacakge : private.pacakge + package +>package : private.package > : ^^^^^^^^^^^^^^^ } @@ -65,8 +65,8 @@ const enum bar { >private : bar.private > : ^^^^^^^^^^^ - pacakge ->pacakge : bar.pacakge + package +>package : bar.package > : ^^^^^^^^^^^ } diff --git a/tests/baselines/reference/strictSubtypeAndNarrowing.errors.txt b/tests/baselines/reference/strictSubtypeAndNarrowing.errors.txt index 0107ab0f6e253..3324dd41c9f1b 100644 --- a/tests/baselines/reference/strictSubtypeAndNarrowing.errors.txt +++ b/tests/baselines/reference/strictSubtypeAndNarrowing.errors.txt @@ -113,7 +113,7 @@ strictSubtypeAndNarrowing.ts(129,26): error TS2353: Object literal may only spec f; // FnTypes } - function checkD(f: FnTypes) { + function checked(f: FnTypes) { if (isFunction(f)) { f; // FnTypes } diff --git a/tests/baselines/reference/strictSubtypeAndNarrowing.js b/tests/baselines/reference/strictSubtypeAndNarrowing.js index cc4abc09c7b26..27c1c7860beb9 100644 --- a/tests/baselines/reference/strictSubtypeAndNarrowing.js +++ b/tests/baselines/reference/strictSubtypeAndNarrowing.js @@ -110,7 +110,7 @@ function checkC(f: FnTypes) { f; // FnTypes } -function checkD(f: FnTypes) { +function checked(f: FnTypes) { if (isFunction(f)) { f; // FnTypes } @@ -310,7 +310,7 @@ function checkC(f) { } f; // FnTypes } -function checkD(f) { +function checked(f) { if (isFunction(f)) { f; // FnTypes } diff --git a/tests/baselines/reference/strictSubtypeAndNarrowing.symbols b/tests/baselines/reference/strictSubtypeAndNarrowing.symbols index 4aaf7905e21f6..51c7bee160772 100644 --- a/tests/baselines/reference/strictSubtypeAndNarrowing.symbols +++ b/tests/baselines/reference/strictSubtypeAndNarrowing.symbols @@ -254,8 +254,8 @@ function checkC(f: FnTypes) { >f : Symbol(f, Decl(strictSubtypeAndNarrowing.ts, 99, 16)) } -function checkD(f: FnTypes) { ->checkD : Symbol(checkD, Decl(strictSubtypeAndNarrowing.ts, 107, 1)) +function checked(f: FnTypes) { +>checked : Symbol(checked, Decl(strictSubtypeAndNarrowing.ts, 107, 1)) >f : Symbol(f, Decl(strictSubtypeAndNarrowing.ts, 109, 16)) >FnTypes : Symbol(FnTypes, Decl(strictSubtypeAndNarrowing.ts, 35, 39)) diff --git a/tests/baselines/reference/strictSubtypeAndNarrowing.types b/tests/baselines/reference/strictSubtypeAndNarrowing.types index c6182b8e834c1..eb1cc5564ae01 100644 --- a/tests/baselines/reference/strictSubtypeAndNarrowing.types +++ b/tests/baselines/reference/strictSubtypeAndNarrowing.types @@ -377,8 +377,8 @@ function checkC(f: FnTypes) { > : ^^^^^^^ } -function checkD(f: FnTypes) { ->checkD : (f: FnTypes) => void +function checked(f: FnTypes) { +>checked : (f: FnTypes) => void > : ^ ^^ ^^^^^^^^^ >f : FnTypes > : ^^^^^^^ diff --git a/tests/baselines/reference/stringLiteralsErrors.errors.txt b/tests/baselines/reference/stringLiteralsErrors.errors.txt index 3c668659c73f9..d3bd03ba2024d 100644 --- a/tests/baselines/reference/stringLiteralsErrors.errors.txt +++ b/tests/baselines/reference/stringLiteralsErrors.errors.txt @@ -18,7 +18,7 @@ stringLiteralsErrors.ts(28,14): error TS1002: Unterminated string literal. ==== stringLiteralsErrors.ts (17 errors) ==== - // Srtings missing line terminator + // Strings missing line terminator var es1 = "line 1 !!! error TS1002: Unterminated string literal. diff --git a/tests/baselines/reference/stringLiteralsErrors.js b/tests/baselines/reference/stringLiteralsErrors.js index d9ac106018065..ddca4ca05d81b 100644 --- a/tests/baselines/reference/stringLiteralsErrors.js +++ b/tests/baselines/reference/stringLiteralsErrors.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/stringLiteralsErrors.ts] //// //// [stringLiteralsErrors.ts] -// Srtings missing line terminator +// Strings missing line terminator var es1 = "line 1 "; var es2 = 'line 1 @@ -32,7 +32,7 @@ var es13 = " //// [stringLiteralsErrors.js] "use strict"; -// Srtings missing line terminator +// Strings missing line terminator var es1 = "line 1; ";; var es2 = 'line 1; diff --git a/tests/baselines/reference/stringLiteralsErrors.symbols b/tests/baselines/reference/stringLiteralsErrors.symbols index 0c825aea6d24f..6b12b82a65347 100644 --- a/tests/baselines/reference/stringLiteralsErrors.symbols +++ b/tests/baselines/reference/stringLiteralsErrors.symbols @@ -1,7 +1,7 @@ //// [tests/cases/compiler/stringLiteralsErrors.ts] //// === stringLiteralsErrors.ts === -// Srtings missing line terminator +// Strings missing line terminator var es1 = "line 1 >es1 : Symbol(es1, Decl(stringLiteralsErrors.ts, 1, 3)) diff --git a/tests/baselines/reference/stringLiteralsErrors.types b/tests/baselines/reference/stringLiteralsErrors.types index 80d42cb3ac19d..ab60a7412f3d6 100644 --- a/tests/baselines/reference/stringLiteralsErrors.types +++ b/tests/baselines/reference/stringLiteralsErrors.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/stringLiteralsErrors.ts] //// === stringLiteralsErrors.ts === -// Srtings missing line terminator +// Strings missing line terminator var es1 = "line 1 >es1 : string > : ^^^^^^ diff --git a/tests/baselines/reference/stringMappingOverPatternLiterals.errors.txt b/tests/baselines/reference/stringMappingOverPatternLiterals.errors.txt index aa201dde6e185..ecb4c2ba219db 100644 --- a/tests/baselines/reference/stringMappingOverPatternLiterals.errors.txt +++ b/tests/baselines/reference/stringMappingOverPatternLiterals.errors.txt @@ -158,7 +158,7 @@ stringMappingOverPatternLiterals.ts(149,5): error TS2322: Type 'Uncapitalize' is not assignable to type 'Uppercase>'. !!! error TS2322: Type 'string' is not assignable to type 'Lowercase'. - // and this should also not be equivlent to any others + // and this should also not be equivalent to any others var x4: Lowercase> = null as any; x1 = x4; ~~ diff --git a/tests/baselines/reference/stringMappingOverPatternLiterals.js b/tests/baselines/reference/stringMappingOverPatternLiterals.js index 401b90b1e001a..24a1de31d7b0f 100644 --- a/tests/baselines/reference/stringMappingOverPatternLiterals.js +++ b/tests/baselines/reference/stringMappingOverPatternLiterals.js @@ -81,7 +81,7 @@ function f3( x3 = x1; x3 = x2; - // and this should also not be equivlent to any others + // and this should also not be equivalent to any others var x4: Lowercase> = null as any; x1 = x4; x2 = x4; @@ -199,7 +199,7 @@ function f3(x1, x2, x3) { // which then uppercases to SS), so arbitrary nestings of mappings make differing sets! x3 = x1; x3 = x2; - // and this should also not be equivlent to any others + // and this should also not be equivalent to any others var x4 = null; x1 = x4; x2 = x4; diff --git a/tests/baselines/reference/stringMappingOverPatternLiterals.symbols b/tests/baselines/reference/stringMappingOverPatternLiterals.symbols index 994d25b8fb08a..2e2958942bc56 100644 --- a/tests/baselines/reference/stringMappingOverPatternLiterals.symbols +++ b/tests/baselines/reference/stringMappingOverPatternLiterals.symbols @@ -206,7 +206,7 @@ function f3( >x3 : Symbol(x3, Decl(stringMappingOverPatternLiterals.ts, 63, 37)) >x2 : Symbol(x2, Decl(stringMappingOverPatternLiterals.ts, 62, 26)) - // and this should also not be equivlent to any others + // and this should also not be equivalent to any others var x4: Lowercase> = null as any; >x4 : Symbol(x4, Decl(stringMappingOverPatternLiterals.ts, 81, 7)) >Lowercase : Symbol(Lowercase, Decl(lib.es5.d.ts, --, --)) diff --git a/tests/baselines/reference/stringMappingOverPatternLiterals.types b/tests/baselines/reference/stringMappingOverPatternLiterals.types index 9b3c5baec27d9..03798bbe6250f 100644 --- a/tests/baselines/reference/stringMappingOverPatternLiterals.types +++ b/tests/baselines/reference/stringMappingOverPatternLiterals.types @@ -322,7 +322,7 @@ function f3( >x2 : Uppercase > : ^^^^^^^^^^^^^^^^^ - // and this should also not be equivlent to any others + // and this should also not be equivalent to any others var x4: Lowercase> = null as any; >x4 : Lowercase> > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/subtypingWithGenericCallSignaturesWithOptionalParameters.errors.txt b/tests/baselines/reference/subtypingWithGenericCallSignaturesWithOptionalParameters.errors.txt index 6b7e2db85e931..02da81985877f 100644 --- a/tests/baselines/reference/subtypingWithGenericCallSignaturesWithOptionalParameters.errors.txt +++ b/tests/baselines/reference/subtypingWithGenericCallSignaturesWithOptionalParameters.errors.txt @@ -498,7 +498,7 @@ subtypingWithGenericCallSignaturesWithOptionalParameters.ts(260,15): error TS243 } interface I2 extends Base2 { - a: (x?: T) => T; // error, not identical and contextual signature instatiation can't make inference from T to T + a: (x?: T) => T; // error, not identical and contextual signature instantiation can't make inference from T to T } interface I3 extends Base2 { @@ -507,12 +507,12 @@ subtypingWithGenericCallSignaturesWithOptionalParameters.ts(260,15): error TS243 !!! error TS2430: Types of property 'a' are incompatible. !!! error TS2430: Type '(x: T) => T' is not assignable to type '() => T'. !!! error TS2430: Target signature provides too few arguments. Expected 1 or more, but got 0. - a: (x: T) => T; // error, not identical and contextual signature instatiation can't make inference from T to T + a: (x: T) => T; // error, not identical and contextual signature instantiation can't make inference from T to T } interface I4 extends Base2 { - a2: () => T; // error, not identical and contextual signature instatiation can't make inference from T to T + a2: () => T; // error, not identical and contextual signature instantiation can't make inference from T to T } interface I5 extends Base2 { @@ -552,7 +552,7 @@ subtypingWithGenericCallSignaturesWithOptionalParameters.ts(260,15): error TS243 interface I11 extends Base2 { - a4: () => T; // error, not identical and contextual signature instatiation can't make inference from T to T + a4: () => T; // error, not identical and contextual signature instantiation can't make inference from T to T } interface I12 extends Base2 { @@ -574,7 +574,7 @@ subtypingWithGenericCallSignaturesWithOptionalParameters.ts(260,15): error TS243 interface I15 extends Base2 { - a5: () => T; // error, not identical and contextual signature instatiation can't make inference from T to T + a5: () => T; // error, not identical and contextual signature instantiation can't make inference from T to T } interface I16 extends Base2 { diff --git a/tests/baselines/reference/subtypingWithGenericCallSignaturesWithOptionalParameters.js b/tests/baselines/reference/subtypingWithGenericCallSignaturesWithOptionalParameters.js index 1f62dad4ddcb8..17d5818884ff2 100644 --- a/tests/baselines/reference/subtypingWithGenericCallSignaturesWithOptionalParameters.js +++ b/tests/baselines/reference/subtypingWithGenericCallSignaturesWithOptionalParameters.js @@ -193,16 +193,16 @@ namespace GenericSignaturesValid { } interface I2 extends Base2 { - a: (x?: T) => T; // error, not identical and contextual signature instatiation can't make inference from T to T + a: (x?: T) => T; // error, not identical and contextual signature instantiation can't make inference from T to T } interface I3 extends Base2 { - a: (x: T) => T; // error, not identical and contextual signature instatiation can't make inference from T to T + a: (x: T) => T; // error, not identical and contextual signature instantiation can't make inference from T to T } interface I4 extends Base2 { - a2: () => T; // error, not identical and contextual signature instatiation can't make inference from T to T + a2: () => T; // error, not identical and contextual signature instantiation can't make inference from T to T } interface I5 extends Base2 { @@ -232,7 +232,7 @@ namespace GenericSignaturesValid { interface I11 extends Base2 { - a4: () => T; // error, not identical and contextual signature instatiation can't make inference from T to T + a4: () => T; // error, not identical and contextual signature instantiation can't make inference from T to T } interface I12 extends Base2 { @@ -249,7 +249,7 @@ namespace GenericSignaturesValid { interface I15 extends Base2 { - a5: () => T; // error, not identical and contextual signature instatiation can't make inference from T to T + a5: () => T; // error, not identical and contextual signature instantiation can't make inference from T to T } interface I16 extends Base2 { diff --git a/tests/baselines/reference/subtypingWithGenericCallSignaturesWithOptionalParameters.symbols b/tests/baselines/reference/subtypingWithGenericCallSignaturesWithOptionalParameters.symbols index 392574508d50e..da33f6cb4aa9e 100644 --- a/tests/baselines/reference/subtypingWithGenericCallSignaturesWithOptionalParameters.symbols +++ b/tests/baselines/reference/subtypingWithGenericCallSignaturesWithOptionalParameters.symbols @@ -607,7 +607,7 @@ namespace GenericSignaturesValid { >I2 : Symbol(I2, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 189, 5)) >Base2 : Symbol(Base2, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 176, 34)) - a: (x?: T) => T; // error, not identical and contextual signature instatiation can't make inference from T to T + a: (x?: T) => T; // error, not identical and contextual signature instantiation can't make inference from T to T >a : Symbol(I2.a, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 191, 32)) >T : Symbol(T, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 192, 12)) >x : Symbol(x, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 192, 15)) @@ -619,7 +619,7 @@ namespace GenericSignaturesValid { >I3 : Symbol(I3, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 193, 5)) >Base2 : Symbol(Base2, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 176, 34)) - a: (x: T) => T; // error, not identical and contextual signature instatiation can't make inference from T to T + a: (x: T) => T; // error, not identical and contextual signature instantiation can't make inference from T to T >a : Symbol(I3.a, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 195, 32)) >T : Symbol(T, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 196, 12)) >x : Symbol(x, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 196, 15)) @@ -632,7 +632,7 @@ namespace GenericSignaturesValid { >I4 : Symbol(I4, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 197, 5)) >Base2 : Symbol(Base2, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 176, 34)) - a2: () => T; // error, not identical and contextual signature instatiation can't make inference from T to T + a2: () => T; // error, not identical and contextual signature instantiation can't make inference from T to T >a2 : Symbol(I4.a2, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 200, 32)) >T : Symbol(T, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 201, 13)) >T : Symbol(T, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 201, 13)) @@ -716,7 +716,7 @@ namespace GenericSignaturesValid { >I11 : Symbol(I11, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 227, 5)) >Base2 : Symbol(Base2, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 176, 34)) - a4: () => T; // error, not identical and contextual signature instatiation can't make inference from T to T + a4: () => T; // error, not identical and contextual signature instantiation can't make inference from T to T >a4 : Symbol(I11.a4, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 230, 33)) >T : Symbol(T, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 231, 13)) >T : Symbol(T, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 231, 13)) @@ -767,7 +767,7 @@ namespace GenericSignaturesValid { >I15 : Symbol(I15, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 244, 5)) >Base2 : Symbol(Base2, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 176, 34)) - a5: () => T; // error, not identical and contextual signature instatiation can't make inference from T to T + a5: () => T; // error, not identical and contextual signature instantiation can't make inference from T to T >a5 : Symbol(I15.a5, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 247, 33)) >T : Symbol(T, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 248, 13)) >T : Symbol(T, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 248, 13)) diff --git a/tests/baselines/reference/subtypingWithGenericCallSignaturesWithOptionalParameters.types b/tests/baselines/reference/subtypingWithGenericCallSignaturesWithOptionalParameters.types index bc1acd2dde4ec..95de4a2cb7b42 100644 --- a/tests/baselines/reference/subtypingWithGenericCallSignaturesWithOptionalParameters.types +++ b/tests/baselines/reference/subtypingWithGenericCallSignaturesWithOptionalParameters.types @@ -417,7 +417,7 @@ namespace GenericSignaturesValid { } interface I2 extends Base2 { - a: (x?: T) => T; // error, not identical and contextual signature instatiation can't make inference from T to T + a: (x?: T) => T; // error, not identical and contextual signature instantiation can't make inference from T to T >a : (x?: T) => T > : ^ ^^ ^^^ ^^^^^ >x : T | undefined @@ -425,7 +425,7 @@ namespace GenericSignaturesValid { } interface I3 extends Base2 { - a: (x: T) => T; // error, not identical and contextual signature instatiation can't make inference from T to T + a: (x: T) => T; // error, not identical and contextual signature instantiation can't make inference from T to T >a : (x: T) => T > : ^ ^^ ^^ ^^^^^ >x : T @@ -434,7 +434,7 @@ namespace GenericSignaturesValid { interface I4 extends Base2 { - a2: () => T; // error, not identical and contextual signature instatiation can't make inference from T to T + a2: () => T; // error, not identical and contextual signature instantiation can't make inference from T to T >a2 : () => T > : ^ ^^^^^^^ } @@ -490,7 +490,7 @@ namespace GenericSignaturesValid { interface I11 extends Base2 { - a4: () => T; // error, not identical and contextual signature instatiation can't make inference from T to T + a4: () => T; // error, not identical and contextual signature instantiation can't make inference from T to T >a4 : () => T > : ^ ^^^^^^^ } @@ -525,7 +525,7 @@ namespace GenericSignaturesValid { interface I15 extends Base2 { - a5: () => T; // error, not identical and contextual signature instatiation can't make inference from T to T + a5: () => T; // error, not identical and contextual signature instantiation can't make inference from T to T >a5 : () => T > : ^ ^^^^^^^ } diff --git a/tests/baselines/reference/subtypingWithGenericConstructSignaturesWithOptionalParameters.errors.txt b/tests/baselines/reference/subtypingWithGenericConstructSignaturesWithOptionalParameters.errors.txt index 168a67d4deb60..5c4d89f490a1e 100644 --- a/tests/baselines/reference/subtypingWithGenericConstructSignaturesWithOptionalParameters.errors.txt +++ b/tests/baselines/reference/subtypingWithGenericConstructSignaturesWithOptionalParameters.errors.txt @@ -498,7 +498,7 @@ subtypingWithGenericConstructSignaturesWithOptionalParameters.ts(260,15): error } interface I2 extends Base2 { - a: new (x?: T) => T; // error, not identical and contextual signature instatiation can't make inference from T to T + a: new (x?: T) => T; // error, not identical and contextual signature instantiation can't make inference from T to T } interface I3 extends Base2 { @@ -507,12 +507,12 @@ subtypingWithGenericConstructSignaturesWithOptionalParameters.ts(260,15): error !!! error TS2430: Types of property 'a' are incompatible. !!! error TS2430: Type 'new (x: T) => T' is not assignable to type 'new () => T'. !!! error TS2430: Target signature provides too few arguments. Expected 1 or more, but got 0. - a: new (x: T) => T; // error, not identical and contextual signature instatiation can't make inference from T to T + a: new (x: T) => T; // error, not identical and contextual signature instantiation can't make inference from T to T } interface I4 extends Base2 { - a2: new () => T; // error, not identical and contextual signature instatiation can't make inference from T to T + a2: new () => T; // error, not identical and contextual signature instantiation can't make inference from T to T } interface I5 extends Base2 { @@ -552,7 +552,7 @@ subtypingWithGenericConstructSignaturesWithOptionalParameters.ts(260,15): error interface I11 extends Base2 { - a4: new () => T; // error, not identical and contextual signature instatiation can't make inference from T to T + a4: new () => T; // error, not identical and contextual signature instantiation can't make inference from T to T } interface I12 extends Base2 { @@ -574,7 +574,7 @@ subtypingWithGenericConstructSignaturesWithOptionalParameters.ts(260,15): error interface I15 extends Base2 { - a5: new () => T; // error, not identical and contextual signature instatiation can't make inference from T to T + a5: new () => T; // error, not identical and contextual signature instantiation can't make inference from T to T } interface I16 extends Base2 { diff --git a/tests/baselines/reference/subtypingWithGenericConstructSignaturesWithOptionalParameters.js b/tests/baselines/reference/subtypingWithGenericConstructSignaturesWithOptionalParameters.js index 626848b68d56e..378f7ff89de6d 100644 --- a/tests/baselines/reference/subtypingWithGenericConstructSignaturesWithOptionalParameters.js +++ b/tests/baselines/reference/subtypingWithGenericConstructSignaturesWithOptionalParameters.js @@ -193,16 +193,16 @@ namespace GenericSignaturesValid { } interface I2 extends Base2 { - a: new (x?: T) => T; // error, not identical and contextual signature instatiation can't make inference from T to T + a: new (x?: T) => T; // error, not identical and contextual signature instantiation can't make inference from T to T } interface I3 extends Base2 { - a: new (x: T) => T; // error, not identical and contextual signature instatiation can't make inference from T to T + a: new (x: T) => T; // error, not identical and contextual signature instantiation can't make inference from T to T } interface I4 extends Base2 { - a2: new () => T; // error, not identical and contextual signature instatiation can't make inference from T to T + a2: new () => T; // error, not identical and contextual signature instantiation can't make inference from T to T } interface I5 extends Base2 { @@ -232,7 +232,7 @@ namespace GenericSignaturesValid { interface I11 extends Base2 { - a4: new () => T; // error, not identical and contextual signature instatiation can't make inference from T to T + a4: new () => T; // error, not identical and contextual signature instantiation can't make inference from T to T } interface I12 extends Base2 { @@ -249,7 +249,7 @@ namespace GenericSignaturesValid { interface I15 extends Base2 { - a5: new () => T; // error, not identical and contextual signature instatiation can't make inference from T to T + a5: new () => T; // error, not identical and contextual signature instantiation can't make inference from T to T } interface I16 extends Base2 { diff --git a/tests/baselines/reference/subtypingWithGenericConstructSignaturesWithOptionalParameters.symbols b/tests/baselines/reference/subtypingWithGenericConstructSignaturesWithOptionalParameters.symbols index 42b3f5d9d4fb9..041c717665572 100644 --- a/tests/baselines/reference/subtypingWithGenericConstructSignaturesWithOptionalParameters.symbols +++ b/tests/baselines/reference/subtypingWithGenericConstructSignaturesWithOptionalParameters.symbols @@ -607,7 +607,7 @@ namespace GenericSignaturesValid { >I2 : Symbol(I2, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 189, 5)) >Base2 : Symbol(Base2, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 176, 34)) - a: new (x?: T) => T; // error, not identical and contextual signature instatiation can't make inference from T to T + a: new (x?: T) => T; // error, not identical and contextual signature instantiation can't make inference from T to T >a : Symbol(I2.a, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 191, 32)) >T : Symbol(T, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 192, 16)) >x : Symbol(x, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 192, 19)) @@ -619,7 +619,7 @@ namespace GenericSignaturesValid { >I3 : Symbol(I3, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 193, 5)) >Base2 : Symbol(Base2, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 176, 34)) - a: new (x: T) => T; // error, not identical and contextual signature instatiation can't make inference from T to T + a: new (x: T) => T; // error, not identical and contextual signature instantiation can't make inference from T to T >a : Symbol(I3.a, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 195, 32)) >T : Symbol(T, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 196, 16)) >x : Symbol(x, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 196, 19)) @@ -632,7 +632,7 @@ namespace GenericSignaturesValid { >I4 : Symbol(I4, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 197, 5)) >Base2 : Symbol(Base2, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 176, 34)) - a2: new () => T; // error, not identical and contextual signature instatiation can't make inference from T to T + a2: new () => T; // error, not identical and contextual signature instantiation can't make inference from T to T >a2 : Symbol(I4.a2, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 200, 32)) >T : Symbol(T, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 201, 17)) >T : Symbol(T, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 201, 17)) @@ -716,7 +716,7 @@ namespace GenericSignaturesValid { >I11 : Symbol(I11, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 227, 5)) >Base2 : Symbol(Base2, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 176, 34)) - a4: new () => T; // error, not identical and contextual signature instatiation can't make inference from T to T + a4: new () => T; // error, not identical and contextual signature instantiation can't make inference from T to T >a4 : Symbol(I11.a4, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 230, 33)) >T : Symbol(T, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 231, 17)) >T : Symbol(T, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 231, 17)) @@ -767,7 +767,7 @@ namespace GenericSignaturesValid { >I15 : Symbol(I15, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 244, 5)) >Base2 : Symbol(Base2, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 176, 34)) - a5: new () => T; // error, not identical and contextual signature instatiation can't make inference from T to T + a5: new () => T; // error, not identical and contextual signature instantiation can't make inference from T to T >a5 : Symbol(I15.a5, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 247, 33)) >T : Symbol(T, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 248, 17)) >T : Symbol(T, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 248, 17)) diff --git a/tests/baselines/reference/subtypingWithGenericConstructSignaturesWithOptionalParameters.types b/tests/baselines/reference/subtypingWithGenericConstructSignaturesWithOptionalParameters.types index 656f39ffb4992..b58802f957120 100644 --- a/tests/baselines/reference/subtypingWithGenericConstructSignaturesWithOptionalParameters.types +++ b/tests/baselines/reference/subtypingWithGenericConstructSignaturesWithOptionalParameters.types @@ -417,7 +417,7 @@ namespace GenericSignaturesValid { } interface I2 extends Base2 { - a: new (x?: T) => T; // error, not identical and contextual signature instatiation can't make inference from T to T + a: new (x?: T) => T; // error, not identical and contextual signature instantiation can't make inference from T to T >a : new (x?: T) => T > : ^^^^^ ^^ ^^^ ^^^^^ >x : T | undefined @@ -425,7 +425,7 @@ namespace GenericSignaturesValid { } interface I3 extends Base2 { - a: new (x: T) => T; // error, not identical and contextual signature instatiation can't make inference from T to T + a: new (x: T) => T; // error, not identical and contextual signature instantiation can't make inference from T to T >a : new (x: T) => T > : ^^^^^ ^^ ^^ ^^^^^ >x : T @@ -434,7 +434,7 @@ namespace GenericSignaturesValid { interface I4 extends Base2 { - a2: new () => T; // error, not identical and contextual signature instatiation can't make inference from T to T + a2: new () => T; // error, not identical and contextual signature instantiation can't make inference from T to T >a2 : new () => T > : ^^^^^ ^^^^^^^ } @@ -490,7 +490,7 @@ namespace GenericSignaturesValid { interface I11 extends Base2 { - a4: new () => T; // error, not identical and contextual signature instatiation can't make inference from T to T + a4: new () => T; // error, not identical and contextual signature instantiation can't make inference from T to T >a4 : new () => T > : ^^^^^ ^^^^^^^ } @@ -525,7 +525,7 @@ namespace GenericSignaturesValid { interface I15 extends Base2 { - a5: new () => T; // error, not identical and contextual signature instatiation can't make inference from T to T + a5: new () => T; // error, not identical and contextual signature instantiation can't make inference from T to T >a5 : new () => T > : ^^^^^ ^^^^^^^ } diff --git a/tests/baselines/reference/templateLiteralIntersection4.js b/tests/baselines/reference/templateLiteralIntersection4.js index aebf8dcfe682a..a73ed369da98d 100644 --- a/tests/baselines/reference/templateLiteralIntersection4.js +++ b/tests/baselines/reference/templateLiteralIntersection4.js @@ -12,7 +12,7 @@ type StoreUtils = Omit<{ declare function createStore(store: Store): StoreUtils; -const { Provider, useUsername, useAge, useStore } = createStore({ +const { Provider, useUsername, usage, useStore } = createStore({ username: "Aral", age: 31 }); @@ -20,7 +20,7 @@ const { Provider, useUsername, useAge, useStore } = createStore({ //// [templateLiteralIntersection4.js] "use strict"; -const { Provider, useUsername, useAge, useStore } = createStore({ +const { Provider, useUsername, usage, useStore } = createStore({ username: "Aral", age: 31 }); diff --git a/tests/baselines/reference/templateLiteralIntersection4.symbols b/tests/baselines/reference/templateLiteralIntersection4.symbols index 6c2159bfdb8ce..1ae475d2e5a21 100644 --- a/tests/baselines/reference/templateLiteralIntersection4.symbols +++ b/tests/baselines/reference/templateLiteralIntersection4.symbols @@ -41,10 +41,10 @@ declare function createStore(store: Store): >StoreUtils : Symbol(StoreUtils, Decl(templateLiteralIntersection4.ts, 0, 39)) >Store : Symbol(Store, Decl(templateLiteralIntersection4.ts, 9, 29)) -const { Provider, useUsername, useAge, useStore } = createStore({ +const { Provider, useUsername, usage, useStore } = createStore({ >Provider : Symbol(Provider, Decl(templateLiteralIntersection4.ts, 11, 7)) >useUsername : Symbol(useUsername, Decl(templateLiteralIntersection4.ts, 11, 17)) ->useAge : Symbol(useAge, Decl(templateLiteralIntersection4.ts, 11, 30)) +>usage : Symbol(usage, Decl(templateLiteralIntersection4.ts, 11, 30)) >useStore : Symbol(useStore, Decl(templateLiteralIntersection4.ts, 11, 38)) >createStore : Symbol(createStore, Decl(templateLiteralIntersection4.ts, 7, 2)) diff --git a/tests/baselines/reference/templateLiteralIntersection4.types b/tests/baselines/reference/templateLiteralIntersection4.types index 52c110bae8984..b110f91402401 100644 --- a/tests/baselines/reference/templateLiteralIntersection4.types +++ b/tests/baselines/reference/templateLiteralIntersection4.types @@ -31,12 +31,12 @@ declare function createStore(store: Store): >store : Store > : ^^^^^ -const { Provider, useUsername, useAge, useStore } = createStore({ +const { Provider, useUsername, usage, useStore } = createStore({ >Provider : unknown > : ^^^^^^^ >useUsername : StateHook > : ^^^^^^^^^^^^^^^^^ ->useAge : StateHook +>usage : StateHook > : ^^^^^^^^^^^^^^^^^ >useStore : StateHook<{ username: string; age: number; }> > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/temporal.errors.txt b/tests/baselines/reference/temporal.errors.txt index 59d4e125441bd..662663a35f9df 100644 --- a/tests/baselines/reference/temporal.errors.txt +++ b/tests/baselines/reference/temporal.errors.txt @@ -599,7 +599,7 @@ temporal.ts(1520,8): error TS2339: Property 'month' does not exist on type 'Plai zdt.toLocaleString(); // example output: 12/1/2019, 12:00:00 PM zdt.toLocaleString("de-DE"); // => '1.12.2019, 12:00:00 MEZ' const options = { weekday: "long", year: "numeric", month: "long", day: "numeric" } as const; - zdt.toLocaleString("de-DE", options); // => 'Sonntag, 1. Dezember 2019' + zdt.toLocaleString("de-DE", options); // => 'Sonntag, 1. December 2019' /* WRONG */ zdt.toLocaleString("de-DE", { timeZone: "Pacific/Auckland" }); // => RangeError: Time zone option Pacific/Auckland does not match actual time zone Europe/Berlin zdt.withTimeZone("Pacific/Auckland").toLocaleString("de-DE"); // => '2.12.2019, 0:00:00 GMT+13' diff --git a/tests/baselines/reference/temporal.js b/tests/baselines/reference/temporal.js index 951ddf52662ec..1c8cc0fc536fc 100644 --- a/tests/baselines/reference/temporal.js +++ b/tests/baselines/reference/temporal.js @@ -593,7 +593,7 @@ zdt.toLocaleString(); // example output: 12/1/2019, 12:00:00 PM zdt.toLocaleString("de-DE"); // => '1.12.2019, 12:00:00 MEZ' const options = { weekday: "long", year: "numeric", month: "long", day: "numeric" } as const; - zdt.toLocaleString("de-DE", options); // => 'Sonntag, 1. Dezember 2019' + zdt.toLocaleString("de-DE", options); // => 'Sonntag, 1. December 2019' /* WRONG */ zdt.toLocaleString("de-DE", { timeZone: "Pacific/Auckland" }); // => RangeError: Time zone option Pacific/Auckland does not match actual time zone Europe/Berlin zdt.withTimeZone("Pacific/Auckland").toLocaleString("de-DE"); // => '2.12.2019, 0:00:00 GMT+13' @@ -2334,7 +2334,7 @@ zdt.toLocaleString(); // example output: 12/1/2019, 12:00:00 PM zdt.toLocaleString("de-DE"); // => '1.12.2019, 12:00:00 MEZ' const options = { weekday: "long", year: "numeric", month: "long", day: "numeric" }; - zdt.toLocaleString("de-DE", options); // => 'Sonntag, 1. Dezember 2019' + zdt.toLocaleString("de-DE", options); // => 'Sonntag, 1. December 2019' /* WRONG */ zdt.toLocaleString("de-DE", { timeZone: "Pacific/Auckland" }); // => RangeError: Time zone option Pacific/Auckland does not match actual time zone Europe/Berlin zdt.withTimeZone("Pacific/Auckland").toLocaleString("de-DE"); // => '2.12.2019, 0:00:00 GMT+13' diff --git a/tests/baselines/reference/temporal.symbols b/tests/baselines/reference/temporal.symbols index f232e7509e447..7b4d7f2adc674 100644 --- a/tests/baselines/reference/temporal.symbols +++ b/tests/baselines/reference/temporal.symbols @@ -2061,7 +2061,7 @@ >day : Symbol(day, Decl(temporal.ts, 591, 70)) >const : Symbol(const) - zdt.toLocaleString("de-DE", options); // => 'Sonntag, 1. Dezember 2019' + zdt.toLocaleString("de-DE", options); // => 'Sonntag, 1. December 2019' >zdt.toLocaleString : Symbol(Temporal.ZonedDateTime.toLocaleString, Decl(lib.esnext.temporal.d.ts, --, --)) >zdt : Symbol(zdt, Decl(temporal.ts, 588, 9)) >toLocaleString : Symbol(Temporal.ZonedDateTime.toLocaleString, Decl(lib.esnext.temporal.d.ts, --, --)) diff --git a/tests/baselines/reference/temporal.types b/tests/baselines/reference/temporal.types index fbe480409c3ea..cfabea19b961f 100644 --- a/tests/baselines/reference/temporal.types +++ b/tests/baselines/reference/temporal.types @@ -4449,7 +4449,7 @@ Type Count: 2,500 >"numeric" : "numeric" > : ^^^^^^^^^ - zdt.toLocaleString("de-DE", options); // => 'Sonntag, 1. Dezember 2019' + zdt.toLocaleString("de-DE", options); // => 'Sonntag, 1. December 2019' >zdt.toLocaleString("de-DE", options) : string > : ^^^^^^ >zdt.toLocaleString : (locales?: Intl.LocalesArgument, options?: Intl.DateTimeFormatOptions) => string diff --git a/tests/baselines/reference/throwStatements.js b/tests/baselines/reference/throwStatements.js index d5be56e5b933c..95e18888c85f1 100644 --- a/tests/baselines/reference/throwStatements.js +++ b/tests/baselines/reference/throwStatements.js @@ -27,8 +27,8 @@ namespace M { export function F2(x: number): string { return x.toString(); } } -var aNumber = 9.9; -throw aNumber; +var a number = 9.9; +throw a number; var aString = 'this is a string'; throw aString; var aDate = new Date(12); @@ -103,8 +103,8 @@ var M; function F2(x) { return x.toString(); } M.F2 = F2; })(M || (M = {})); -var aNumber = 9.9; -throw aNumber; +var a number = 9.9; +throw a number; var aString = 'this is a string'; throw aString; var aDate = new Date(12); diff --git a/tests/baselines/reference/throwStatements.symbols b/tests/baselines/reference/throwStatements.symbols index 76a369927a894..de61fd50f1c6a 100644 --- a/tests/baselines/reference/throwStatements.symbols +++ b/tests/baselines/reference/throwStatements.symbols @@ -60,11 +60,11 @@ namespace M { >toString : Symbol(Number.toString, Decl(lib.es5.d.ts, --, --)) } -var aNumber = 9.9; ->aNumber : Symbol(aNumber, Decl(throwStatements.ts, 26, 3)) +var a number = 9.9; +>a number : Symbol(a number, Decl(throwStatements.ts, 26, 3)) -throw aNumber; ->aNumber : Symbol(aNumber, Decl(throwStatements.ts, 26, 3)) +throw a number; +>a number : Symbol(a number, Decl(throwStatements.ts, 26, 3)) var aString = 'this is a string'; >aString : Symbol(aString, Decl(throwStatements.ts, 28, 3)) diff --git a/tests/baselines/reference/throwStatements.types b/tests/baselines/reference/throwStatements.types index d55edb6cdbf4f..2600663feed91 100644 --- a/tests/baselines/reference/throwStatements.types +++ b/tests/baselines/reference/throwStatements.types @@ -71,14 +71,14 @@ namespace M { > : ^ ^^^ ^^^^^ } -var aNumber = 9.9; ->aNumber : number +var a number = 9.9; +>a number : number > : ^^^^^^ >9.9 : 9.9 > : ^^^ -throw aNumber; ->aNumber : number +throw a number; +>a number : number > : ^^^^^^ var aString = 'this is a string'; diff --git a/tests/baselines/reference/transformNestedGeneratorsWithTry(target=es5).js b/tests/baselines/reference/transformNestedGeneratorsWithTry(target=es5).js index 8e2ab4802f6f1..ea1617cd686d8 100644 --- a/tests/baselines/reference/transformNestedGeneratorsWithTry(target=es5).js +++ b/tests/baselines/reference/transformNestedGeneratorsWithTry(target=es5).js @@ -67,7 +67,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge }); }; var __generator = (this && this.__generator) || function (thisArg, body) { - var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); + var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, tries: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; function verb(n) { return function (v) { return step([n, v]); }; } function step(op) { @@ -79,14 +79,14 @@ var __generator = (this && this.__generator) || function (thisArg, body) { case 0: case 1: t = op; break; case 4: _.label++; return { value: op[1], done: false }; case 5: _.label++; y = op[1]; op = [0]; continue; - case 7: op = _.ops.pop(); _.trys.pop(); continue; + case 7: op = _.ops.pop(); _.tries.pop(); continue; default: - if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } + if (!(t = _.tries, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } if (t[2]) _.ops.pop(); - _.trys.pop(); continue; + _.tries.pop(); continue; } op = body.call(thisArg, _); } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } @@ -102,14 +102,14 @@ function a() { return __generator(this, function (_a) { switch (_a.label) { case 0: - _a.trys.push([0, 2, , 3]); + _a.tries.push([0, 2, , 3]); b = function b() { return __awaiter(this, void 0, void 0, function () { var error_2; return __generator(this, function (_a) { switch (_a.label) { case 0: - _a.trys.push([0, 2, , 3]); + _a.tries.push([0, 2, , 3]); return [4 /*yield*/, Bluebird.resolve()]; case 1: _a.sent(); // -- remove this and it compiles diff --git a/tests/baselines/reference/tsbuild/amdModulesWithOut/modules-and-globals-mixed-in-amd.js b/tests/baselines/reference/tsbuild/amdModulesWithOut/modules-and-globals-mixed-in-amd.js index a234c8b8c84b8..00f1b4cb99edf 100644 --- a/tests/baselines/reference/tsbuild/amdModulesWithOut/modules-and-globals-mixed-in-amd.js +++ b/tests/baselines/reference/tsbuild/amdModulesWithOut/modules-and-globals-mixed-in-amd.js @@ -1,14 +1,14 @@ -currentDirectory:: /home/src/workspaces/soltion useCaseSensitiveFileNames:: false +currentDirectory:: /home/src/workspaces/solution useCaseSensitiveFileNames:: false Input:: -//// [/home/src/workspaces/soltion/app/file3.ts] +//// [/home/src/workspaces/solution/app/file3.ts] export const z = 30; import { x } from "file1"; -//// [/home/src/workspaces/soltion/app/file4.ts] +//// [/home/src/workspaces/solution/app/file4.ts] const myVar = 30; -//// [/home/src/workspaces/soltion/app/tsconfig.json] +//// [/home/src/workspaces/solution/app/tsconfig.json] { "compilerOptions": { "target": "es5", @@ -29,19 +29,19 @@ const myVar = 30; ] } -//// [/home/src/workspaces/soltion/lib/file0.ts] +//// [/home/src/workspaces/solution/lib/file0.ts] const myGlob = 20; -//// [/home/src/workspaces/soltion/lib/file1.ts] +//// [/home/src/workspaces/solution/lib/file1.ts] export const x = 10; -//// [/home/src/workspaces/soltion/lib/file2.ts] +//// [/home/src/workspaces/solution/lib/file2.ts] export const y = 20; -//// [/home/src/workspaces/soltion/lib/global.ts] +//// [/home/src/workspaces/solution/lib/global.ts] const globalConst = 10; -//// [/home/src/workspaces/soltion/lib/tsconfig.json] +//// [/home/src/workspaces/solution/lib/tsconfig.json] { "compilerOptions": { "target": "es5", @@ -80,7 +80,7 @@ Output:: [HH:MM:SS AM] Project 'lib/tsconfig.json' is out of date because output file 'lib/module.tsbuildinfo' does not exist -[HH:MM:SS AM] Building project '/home/src/workspaces/soltion/lib/tsconfig.json'... +[HH:MM:SS AM] Building project '/home/src/workspaces/solution/lib/tsconfig.json'... lib/tsconfig.json:3:15 - error TS5107: Option 'target=ES5' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error. @@ -99,7 +99,7 @@ Output:: [HH:MM:SS AM] Project 'app/tsconfig.json' is out of date because output file 'app/module.tsbuildinfo' does not exist -[HH:MM:SS AM] Building project '/home/src/workspaces/soltion/app/tsconfig.json'... +[HH:MM:SS AM] Building project '/home/src/workspaces/solution/app/tsconfig.json'... app/tsconfig.json:3:15 - error TS5107: Option 'target=ES5' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error. @@ -121,10 +121,10 @@ Found 6 errors. -//// [/home/src/workspaces/soltion/lib/module.js.map] +//// [/home/src/workspaces/solution/lib/module.js.map] {"version":3,"file":"module.js","sourceRoot":"","sources":["file0.ts","file1.ts","file2.ts","global.ts"],"names":[],"mappings":";AAAA,IAAM,MAAM,GAAG,EAAE,CAAC;;;;;ICAL,QAAA,CAAC,GAAG,EAAE,CAAC;;;;;;ICAP,QAAA,CAAC,GAAG,EAAE,CAAC;;ACApB,IAAM,WAAW,GAAG,EAAE,CAAC"} -//// [/home/src/workspaces/soltion/lib/module.js] +//// [/home/src/workspaces/solution/lib/module.js] "use strict"; var myGlob = 20; define("file1", ["require", "exports"], function (require, exports) { @@ -142,10 +142,10 @@ define("file2", ["require", "exports"], function (require, exports) { var globalConst = 10; //# sourceMappingURL=module.js.map -//// [/home/src/workspaces/soltion/lib/module.d.ts.map] +//// [/home/src/workspaces/solution/lib/module.d.ts.map] {"version":3,"file":"module.d.ts","sourceRoot":"","sources":["file0.ts","file1.ts","file2.ts","global.ts"],"names":[],"mappings":"AAAA,QAAA,MAAM,MAAM,KAAK,CAAC;;ICAlB,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC;;;ICApB,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC;;ACApB,QAAA,MAAM,WAAW,KAAK,CAAC"} -//// [/home/src/workspaces/soltion/lib/module.d.ts] +//// [/home/src/workspaces/solution/lib/module.d.ts] declare const myGlob = 20; declare module "file1" { export const x = 10; @@ -156,10 +156,10 @@ declare module "file2" { declare const globalConst = 10; //# sourceMappingURL=module.d.ts.map -//// [/home/src/workspaces/soltion/lib/module.tsbuildinfo] +//// [/home/src/workspaces/solution/lib/module.tsbuildinfo] {"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./file0.ts","./file1.ts","./file2.ts","./global.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array { length: number; [n: number]: T; }\ninterface ReadonlyArray {}\ndeclare const console: { log(msg: any): void; };","3587416848-const myGlob = 20;","-10726455937-export const x = 10;","-13729954175-export const y = 20;","1028229885-const globalConst = 10;"],"root":[[2,5]],"options":{"composite":true,"declarationMap":true,"module":2,"outFile":"./module.js","sourceMap":true,"strict":false,"target":1},"semanticDiagnosticsPerFile":[1,2,3,4,5],"outSignature":"29754794677-declare const myGlob = 20;\ndeclare module \"file1\" {\n export const x = 10;\n}\ndeclare module \"file2\" {\n export const y = 20;\n}\ndeclare const globalConst = 10;\n","latestChangedDtsFile":"./module.d.ts","version":"FakeTSVersion"} -//// [/home/src/workspaces/soltion/lib/module.tsbuildinfo.readable.baseline.txt] +//// [/home/src/workspaces/solution/lib/module.tsbuildinfo.readable.baseline.txt] { "fileNames": [ "../../../tslibs/ts/lib/lib.d.ts", @@ -226,10 +226,10 @@ declare const globalConst = 10; "size": 1113 } -//// [/home/src/workspaces/soltion/app/module.js.map] +//// [/home/src/workspaces/solution/app/module.js.map] {"version":3,"file":"module.js","sourceRoot":"","sources":["file4.ts","file3.ts"],"names":[],"mappings":";;;;;ICAa,QAAA,CAAC,GAAG,EAAE,CAAC;;ADApB,IAAM,KAAK,GAAG,EAAE,CAAC"} -//// [/home/src/workspaces/soltion/app/module.js] +//// [/home/src/workspaces/solution/app/module.js] "use strict"; define("file3", ["require", "exports"], function (require, exports) { "use strict"; @@ -240,20 +240,20 @@ define("file3", ["require", "exports"], function (require, exports) { var myVar = 30; //# sourceMappingURL=module.js.map -//// [/home/src/workspaces/soltion/app/module.d.ts.map] +//// [/home/src/workspaces/solution/app/module.d.ts.map] {"version":3,"file":"module.d.ts","sourceRoot":"","sources":["file3.ts","file4.ts"],"names":[],"mappings":";IAAA,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC;;ACApB,QAAA,MAAM,KAAK,KAAK,CAAC"} -//// [/home/src/workspaces/soltion/app/module.d.ts] +//// [/home/src/workspaces/solution/app/module.d.ts] declare module "file3" { export const z = 30; } declare const myVar = 30; //# sourceMappingURL=module.d.ts.map -//// [/home/src/workspaces/soltion/app/module.tsbuildinfo] +//// [/home/src/workspaces/solution/app/module.tsbuildinfo] {"fileNames":["../../../tslibs/ts/lib/lib.d.ts","../lib/module.d.ts","./file3.ts","./file4.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array { length: number; [n: number]: T; }\ninterface ReadonlyArray {}\ndeclare const console: { log(msg: any): void; };","29754794677-declare const myGlob = 20;\ndeclare module \"file1\" {\n export const x = 10;\n}\ndeclare module \"file2\" {\n export const y = 20;\n}\ndeclare const globalConst = 10;\n","-10505171738-export const z = 30;\nimport { x } from \"file1\";\n","1463681686-const myVar = 30;"],"root":[3,4],"options":{"composite":true,"declarationMap":true,"module":2,"outFile":"./module.js","sourceMap":true,"strict":false,"target":1},"semanticDiagnosticsPerFile":[1,2,3,4],"outSignature":"-23302177839-declare module \"file3\" {\n export const z = 30;\n}\ndeclare const myVar = 30;\n","latestChangedDtsFile":"./module.d.ts","version":"FakeTSVersion"} -//// [/home/src/workspaces/soltion/app/module.tsbuildinfo.readable.baseline.txt] +//// [/home/src/workspaces/solution/app/module.tsbuildinfo.readable.baseline.txt] { "fileNames": [ "../../../tslibs/ts/lib/lib.d.ts", @@ -310,7 +310,7 @@ declare const myVar = 30; "size": 1161 } -//// [/home/src/workspaces/soltion/lib/module.js.map.baseline.txt] +//// [/home/src/workspaces/solution/lib/module.js.map.baseline.txt] =================================================================== JsFile: module.js mapUrl: module.js.map @@ -318,7 +318,7 @@ sourceRoot: sources: file0.ts,file1.ts,file2.ts,global.ts =================================================================== ------------------------------------------------------------------- -emittedFile:/home/src/workspaces/soltion/lib/module.js +emittedFile:/home/src/workspaces/solution/lib/module.js sourceFile:file0.ts ------------------------------------------------------------------- >>>"use strict"; @@ -344,7 +344,7 @@ sourceFile:file0.ts 6 >Emitted(2, 17) Source(1, 19) + SourceIndex(0) --- ------------------------------------------------------------------- -emittedFile:/home/src/workspaces/soltion/lib/module.js +emittedFile:/home/src/workspaces/solution/lib/module.js sourceFile:file1.ts ------------------------------------------------------------------- >>>define("file1", ["require", "exports"], function (require, exports) { @@ -372,7 +372,7 @@ sourceFile:file1.ts 6 >Emitted(7, 20) Source(1, 21) + SourceIndex(1) --- ------------------------------------------------------------------- -emittedFile:/home/src/workspaces/soltion/lib/module.js +emittedFile:/home/src/workspaces/solution/lib/module.js sourceFile:file2.ts ------------------------------------------------------------------- >>>}); @@ -401,7 +401,7 @@ sourceFile:file2.ts 6 >Emitted(13, 20) Source(1, 21) + SourceIndex(2) --- ------------------------------------------------------------------- -emittedFile:/home/src/workspaces/soltion/lib/module.js +emittedFile:/home/src/workspaces/solution/lib/module.js sourceFile:global.ts ------------------------------------------------------------------- >>>}); @@ -428,7 +428,7 @@ sourceFile:global.ts --- >>>//# sourceMappingURL=module.js.map -//// [/home/src/workspaces/soltion/lib/module.d.ts.map.baseline.txt] +//// [/home/src/workspaces/solution/lib/module.d.ts.map.baseline.txt] =================================================================== JsFile: module.d.ts mapUrl: module.d.ts.map @@ -436,7 +436,7 @@ sourceRoot: sources: file0.ts,file1.ts,file2.ts,global.ts =================================================================== ------------------------------------------------------------------- -emittedFile:/home/src/workspaces/soltion/lib/module.d.ts +emittedFile:/home/src/workspaces/solution/lib/module.d.ts sourceFile:file0.ts ------------------------------------------------------------------- >>>declare const myGlob = 20; @@ -460,7 +460,7 @@ sourceFile:file0.ts 6 >Emitted(1, 27) Source(1, 19) + SourceIndex(0) --- ------------------------------------------------------------------- -emittedFile:/home/src/workspaces/soltion/lib/module.d.ts +emittedFile:/home/src/workspaces/solution/lib/module.d.ts sourceFile:file1.ts ------------------------------------------------------------------- >>>declare module "file1" { @@ -488,7 +488,7 @@ sourceFile:file1.ts 7 >Emitted(3, 25) Source(1, 21) + SourceIndex(1) --- ------------------------------------------------------------------- -emittedFile:/home/src/workspaces/soltion/lib/module.d.ts +emittedFile:/home/src/workspaces/solution/lib/module.d.ts sourceFile:file2.ts ------------------------------------------------------------------- >>>} @@ -517,7 +517,7 @@ sourceFile:file2.ts 7 >Emitted(6, 25) Source(1, 21) + SourceIndex(2) --- ------------------------------------------------------------------- -emittedFile:/home/src/workspaces/soltion/lib/module.d.ts +emittedFile:/home/src/workspaces/solution/lib/module.d.ts sourceFile:global.ts ------------------------------------------------------------------- >>>} @@ -544,7 +544,7 @@ sourceFile:global.ts --- >>>//# sourceMappingURL=module.d.ts.map -//// [/home/src/workspaces/soltion/app/module.js.map.baseline.txt] +//// [/home/src/workspaces/solution/app/module.js.map.baseline.txt] =================================================================== JsFile: module.js mapUrl: module.js.map @@ -552,7 +552,7 @@ sourceRoot: sources: file4.ts,file3.ts =================================================================== ------------------------------------------------------------------- -emittedFile:/home/src/workspaces/soltion/app/module.js +emittedFile:/home/src/workspaces/solution/app/module.js sourceFile:file3.ts ------------------------------------------------------------------- >>>"use strict"; @@ -581,7 +581,7 @@ sourceFile:file3.ts 6 >Emitted(6, 20) Source(1, 21) + SourceIndex(1) --- ------------------------------------------------------------------- -emittedFile:/home/src/workspaces/soltion/app/module.js +emittedFile:/home/src/workspaces/solution/app/module.js sourceFile:file4.ts ------------------------------------------------------------------- >>>}); @@ -608,7 +608,7 @@ sourceFile:file4.ts --- >>>//# sourceMappingURL=module.js.map -//// [/home/src/workspaces/soltion/app/module.d.ts.map.baseline.txt] +//// [/home/src/workspaces/solution/app/module.d.ts.map.baseline.txt] =================================================================== JsFile: module.d.ts mapUrl: module.d.ts.map @@ -616,7 +616,7 @@ sourceRoot: sources: file3.ts,file4.ts =================================================================== ------------------------------------------------------------------- -emittedFile:/home/src/workspaces/soltion/app/module.d.ts +emittedFile:/home/src/workspaces/solution/app/module.d.ts sourceFile:file3.ts ------------------------------------------------------------------- >>>declare module "file3" { @@ -644,7 +644,7 @@ sourceFile:file3.ts 7 >Emitted(2, 25) Source(1, 21) + SourceIndex(0) --- ------------------------------------------------------------------- -emittedFile:/home/src/workspaces/soltion/app/module.d.ts +emittedFile:/home/src/workspaces/solution/app/module.d.ts sourceFile:file4.ts ------------------------------------------------------------------- >>>} @@ -677,7 +677,7 @@ exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped Change:: incremental-declaration-doesnt-change Input:: -//// [/home/src/workspaces/soltion/lib/file1.ts] +//// [/home/src/workspaces/solution/lib/file1.ts] export const x = 10;console.log(x); @@ -689,7 +689,7 @@ Output:: [HH:MM:SS AM] Project 'lib/tsconfig.json' is out of date because buildinfo file 'lib/module.tsbuildinfo' indicates that program needs to report errors. -[HH:MM:SS AM] Building project '/home/src/workspaces/soltion/lib/tsconfig.json'... +[HH:MM:SS AM] Building project '/home/src/workspaces/solution/lib/tsconfig.json'... lib/tsconfig.json:3:15 - error TS5107: Option 'target=ES5' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error. @@ -708,7 +708,7 @@ Output:: [HH:MM:SS AM] Project 'app/tsconfig.json' is out of date because buildinfo file 'app/module.tsbuildinfo' indicates that program needs to report errors. -[HH:MM:SS AM] Building project '/home/src/workspaces/soltion/app/tsconfig.json'... +[HH:MM:SS AM] Building project '/home/src/workspaces/solution/app/tsconfig.json'... app/tsconfig.json:3:15 - error TS5107: Option 'target=ES5' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error. @@ -730,10 +730,10 @@ Found 6 errors. -//// [/home/src/workspaces/soltion/lib/module.js.map] +//// [/home/src/workspaces/solution/lib/module.js.map] {"version":3,"file":"module.js","sourceRoot":"","sources":["file0.ts","file1.ts","file2.ts","global.ts"],"names":[],"mappings":";AAAA,IAAM,MAAM,GAAG,EAAE,CAAC;;;;;ICAL,QAAA,CAAC,GAAG,EAAE,CAAC;IAAA,OAAO,CAAC,GAAG,CAAC,SAAC,CAAC,CAAC;;;;;;ICAtB,QAAA,CAAC,GAAG,EAAE,CAAC;;ACApB,IAAM,WAAW,GAAG,EAAE,CAAC"} -//// [/home/src/workspaces/soltion/lib/module.js] +//// [/home/src/workspaces/solution/lib/module.js] "use strict"; var myGlob = 20; define("file1", ["require", "exports"], function (require, exports) { @@ -752,11 +752,11 @@ define("file2", ["require", "exports"], function (require, exports) { var globalConst = 10; //# sourceMappingURL=module.js.map -//// [/home/src/workspaces/soltion/lib/module.d.ts.map] file written with same contents -//// [/home/src/workspaces/soltion/lib/module.tsbuildinfo] +//// [/home/src/workspaces/solution/lib/module.d.ts.map] file written with same contents +//// [/home/src/workspaces/solution/lib/module.tsbuildinfo] {"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./file0.ts","./file1.ts","./file2.ts","./global.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array { length: number; [n: number]: T; }\ninterface ReadonlyArray {}\ndeclare const console: { log(msg: any): void; };","3587416848-const myGlob = 20;","-4405159098-export const x = 10;console.log(x);","-13729954175-export const y = 20;","1028229885-const globalConst = 10;"],"root":[[2,5]],"options":{"composite":true,"declarationMap":true,"module":2,"outFile":"./module.js","sourceMap":true,"strict":false,"target":1},"semanticDiagnosticsPerFile":[1,2,3,4,5],"outSignature":"29754794677-declare const myGlob = 20;\ndeclare module \"file1\" {\n export const x = 10;\n}\ndeclare module \"file2\" {\n export const y = 20;\n}\ndeclare const globalConst = 10;\n","latestChangedDtsFile":"./module.d.ts","version":"FakeTSVersion"} -//// [/home/src/workspaces/soltion/lib/module.tsbuildinfo.readable.baseline.txt] +//// [/home/src/workspaces/solution/lib/module.tsbuildinfo.readable.baseline.txt] { "fileNames": [ "../../../tslibs/ts/lib/lib.d.ts", @@ -823,7 +823,7 @@ var globalConst = 10; "size": 1127 } -//// [/home/src/workspaces/soltion/lib/module.js.map.baseline.txt] +//// [/home/src/workspaces/solution/lib/module.js.map.baseline.txt] =================================================================== JsFile: module.js mapUrl: module.js.map @@ -831,7 +831,7 @@ sourceRoot: sources: file0.ts,file1.ts,file2.ts,global.ts =================================================================== ------------------------------------------------------------------- -emittedFile:/home/src/workspaces/soltion/lib/module.js +emittedFile:/home/src/workspaces/solution/lib/module.js sourceFile:file0.ts ------------------------------------------------------------------- >>>"use strict"; @@ -857,7 +857,7 @@ sourceFile:file0.ts 6 >Emitted(2, 17) Source(1, 19) + SourceIndex(0) --- ------------------------------------------------------------------- -emittedFile:/home/src/workspaces/soltion/lib/module.js +emittedFile:/home/src/workspaces/solution/lib/module.js sourceFile:file1.ts ------------------------------------------------------------------- >>>define("file1", ["require", "exports"], function (require, exports) { @@ -912,7 +912,7 @@ sourceFile:file1.ts 8 >Emitted(8, 28) Source(1, 36) + SourceIndex(1) --- ------------------------------------------------------------------- -emittedFile:/home/src/workspaces/soltion/lib/module.js +emittedFile:/home/src/workspaces/solution/lib/module.js sourceFile:file2.ts ------------------------------------------------------------------- >>>}); @@ -941,7 +941,7 @@ sourceFile:file2.ts 6 >Emitted(14, 20) Source(1, 21) + SourceIndex(2) --- ------------------------------------------------------------------- -emittedFile:/home/src/workspaces/soltion/lib/module.js +emittedFile:/home/src/workspaces/solution/lib/module.js sourceFile:global.ts ------------------------------------------------------------------- >>>}); @@ -968,6 +968,6 @@ sourceFile:global.ts --- >>>//# sourceMappingURL=module.js.map -//// [/home/src/workspaces/soltion/lib/module.d.ts.map.baseline.txt] file written with same contents +//// [/home/src/workspaces/solution/lib/module.d.ts.map.baseline.txt] file written with same contents exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped diff --git a/tests/baselines/reference/tsbuild/amdModulesWithOut/prepend-reports-deprecation-error.js b/tests/baselines/reference/tsbuild/amdModulesWithOut/prepend-reports-deprecation-error.js index 557d7c7b9577f..3bbaf4ab1d0aa 100644 --- a/tests/baselines/reference/tsbuild/amdModulesWithOut/prepend-reports-deprecation-error.js +++ b/tests/baselines/reference/tsbuild/amdModulesWithOut/prepend-reports-deprecation-error.js @@ -1,14 +1,14 @@ -currentDirectory:: /home/src/workspaces/soltion useCaseSensitiveFileNames:: false +currentDirectory:: /home/src/workspaces/solution useCaseSensitiveFileNames:: false Input:: -//// [/home/src/workspaces/soltion/app/file3.ts] +//// [/home/src/workspaces/solution/app/file3.ts] export const z = 30; import { x } from "file1"; -//// [/home/src/workspaces/soltion/app/file4.ts] +//// [/home/src/workspaces/solution/app/file4.ts] const myVar = 30; -//// [/home/src/workspaces/soltion/app/tsconfig.json] +//// [/home/src/workspaces/solution/app/tsconfig.json] { "compilerOptions": { "target": "es5", @@ -30,19 +30,19 @@ const myVar = 30; ] } -//// [/home/src/workspaces/soltion/lib/file0.ts] +//// [/home/src/workspaces/solution/lib/file0.ts] const myGlob = 20; -//// [/home/src/workspaces/soltion/lib/file1.ts] +//// [/home/src/workspaces/solution/lib/file1.ts] export const x = 10; -//// [/home/src/workspaces/soltion/lib/file2.ts] +//// [/home/src/workspaces/solution/lib/file2.ts] export const y = 20; -//// [/home/src/workspaces/soltion/lib/global.ts] +//// [/home/src/workspaces/solution/lib/global.ts] const globalConst = 10; -//// [/home/src/workspaces/soltion/lib/tsconfig.json] +//// [/home/src/workspaces/solution/lib/tsconfig.json] { "compilerOptions": { "target": "es5", @@ -81,7 +81,7 @@ Output:: [HH:MM:SS AM] Project 'lib/tsconfig.json' is out of date because output file 'lib/module.tsbuildinfo' does not exist -[HH:MM:SS AM] Building project '/home/src/workspaces/soltion/lib/tsconfig.json'... +[HH:MM:SS AM] Building project '/home/src/workspaces/solution/lib/tsconfig.json'... lib/tsconfig.json:3:15 - error TS5107: Option 'target=ES5' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error. @@ -100,7 +100,7 @@ Output:: [HH:MM:SS AM] Project 'app/tsconfig.json' is out of date because output file 'app/module.tsbuildinfo' does not exist -[HH:MM:SS AM] Building project '/home/src/workspaces/soltion/app/tsconfig.json'... +[HH:MM:SS AM] Building project '/home/src/workspaces/solution/app/tsconfig.json'... app/tsconfig.json:3:15 - error TS5107: Option 'target=ES5' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error. @@ -133,10 +133,10 @@ Found 7 errors. -//// [/home/src/workspaces/soltion/lib/module.js.map] +//// [/home/src/workspaces/solution/lib/module.js.map] {"version":3,"file":"module.js","sourceRoot":"","sources":["file0.ts","file1.ts","file2.ts","global.ts"],"names":[],"mappings":";AAAA,IAAM,MAAM,GAAG,EAAE,CAAC;;;;;ICAL,QAAA,CAAC,GAAG,EAAE,CAAC;;;;;;ICAP,QAAA,CAAC,GAAG,EAAE,CAAC;;ACApB,IAAM,WAAW,GAAG,EAAE,CAAC"} -//// [/home/src/workspaces/soltion/lib/module.js] +//// [/home/src/workspaces/solution/lib/module.js] "use strict"; var myGlob = 20; define("file1", ["require", "exports"], function (require, exports) { @@ -154,10 +154,10 @@ define("file2", ["require", "exports"], function (require, exports) { var globalConst = 10; //# sourceMappingURL=module.js.map -//// [/home/src/workspaces/soltion/lib/module.d.ts.map] +//// [/home/src/workspaces/solution/lib/module.d.ts.map] {"version":3,"file":"module.d.ts","sourceRoot":"","sources":["file0.ts","file1.ts","file2.ts","global.ts"],"names":[],"mappings":"AAAA,QAAA,MAAM,MAAM,KAAK,CAAC;;ICAlB,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC;;;ICApB,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC;;ACApB,QAAA,MAAM,WAAW,KAAK,CAAC"} -//// [/home/src/workspaces/soltion/lib/module.d.ts] +//// [/home/src/workspaces/solution/lib/module.d.ts] declare const myGlob = 20; declare module "file1" { export const x = 10; @@ -168,10 +168,10 @@ declare module "file2" { declare const globalConst = 10; //# sourceMappingURL=module.d.ts.map -//// [/home/src/workspaces/soltion/lib/module.tsbuildinfo] +//// [/home/src/workspaces/solution/lib/module.tsbuildinfo] {"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./file0.ts","./file1.ts","./file2.ts","./global.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array { length: number; [n: number]: T; }\ninterface ReadonlyArray {}\ndeclare const console: { log(msg: any): void; };","3587416848-const myGlob = 20;","-10726455937-export const x = 10;","-13729954175-export const y = 20;","1028229885-const globalConst = 10;"],"root":[[2,5]],"options":{"composite":true,"declarationMap":true,"module":2,"outFile":"./module.js","sourceMap":true,"strict":false,"target":1},"semanticDiagnosticsPerFile":[1,2,3,4,5],"outSignature":"29754794677-declare const myGlob = 20;\ndeclare module \"file1\" {\n export const x = 10;\n}\ndeclare module \"file2\" {\n export const y = 20;\n}\ndeclare const globalConst = 10;\n","latestChangedDtsFile":"./module.d.ts","version":"FakeTSVersion"} -//// [/home/src/workspaces/soltion/lib/module.tsbuildinfo.readable.baseline.txt] +//// [/home/src/workspaces/solution/lib/module.tsbuildinfo.readable.baseline.txt] { "fileNames": [ "../../../tslibs/ts/lib/lib.d.ts", @@ -238,10 +238,10 @@ declare const globalConst = 10; "size": 1113 } -//// [/home/src/workspaces/soltion/app/module.js.map] +//// [/home/src/workspaces/solution/app/module.js.map] {"version":3,"file":"module.js","sourceRoot":"","sources":["file4.ts","file3.ts"],"names":[],"mappings":";;;;;ICAa,QAAA,CAAC,GAAG,EAAE,CAAC;;ADApB,IAAM,KAAK,GAAG,EAAE,CAAC"} -//// [/home/src/workspaces/soltion/app/module.js] +//// [/home/src/workspaces/solution/app/module.js] "use strict"; define("file3", ["require", "exports"], function (require, exports) { "use strict"; @@ -252,20 +252,20 @@ define("file3", ["require", "exports"], function (require, exports) { var myVar = 30; //# sourceMappingURL=module.js.map -//// [/home/src/workspaces/soltion/app/module.d.ts.map] +//// [/home/src/workspaces/solution/app/module.d.ts.map] {"version":3,"file":"module.d.ts","sourceRoot":"","sources":["file3.ts","file4.ts"],"names":[],"mappings":";IAAA,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC;;ACApB,QAAA,MAAM,KAAK,KAAK,CAAC"} -//// [/home/src/workspaces/soltion/app/module.d.ts] +//// [/home/src/workspaces/solution/app/module.d.ts] declare module "file3" { export const z = 30; } declare const myVar = 30; //# sourceMappingURL=module.d.ts.map -//// [/home/src/workspaces/soltion/app/module.tsbuildinfo] +//// [/home/src/workspaces/solution/app/module.tsbuildinfo] {"fileNames":["../../../tslibs/ts/lib/lib.d.ts","../lib/module.d.ts","./file3.ts","./file4.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array { length: number; [n: number]: T; }\ninterface ReadonlyArray {}\ndeclare const console: { log(msg: any): void; };","29754794677-declare const myGlob = 20;\ndeclare module \"file1\" {\n export const x = 10;\n}\ndeclare module \"file2\" {\n export const y = 20;\n}\ndeclare const globalConst = 10;\n","-10505171738-export const z = 30;\nimport { x } from \"file1\";\n","1463681686-const myVar = 30;"],"root":[3,4],"options":{"composite":true,"declarationMap":true,"module":2,"outFile":"./module.js","sourceMap":true,"strict":false,"target":1},"semanticDiagnosticsPerFile":[1,2,3,4],"outSignature":"-23302177839-declare module \"file3\" {\n export const z = 30;\n}\ndeclare const myVar = 30;\n","latestChangedDtsFile":"./module.d.ts","version":"FakeTSVersion"} -//// [/home/src/workspaces/soltion/app/module.tsbuildinfo.readable.baseline.txt] +//// [/home/src/workspaces/solution/app/module.tsbuildinfo.readable.baseline.txt] { "fileNames": [ "../../../tslibs/ts/lib/lib.d.ts", @@ -322,7 +322,7 @@ declare const myVar = 30; "size": 1161 } -//// [/home/src/workspaces/soltion/lib/module.js.map.baseline.txt] +//// [/home/src/workspaces/solution/lib/module.js.map.baseline.txt] =================================================================== JsFile: module.js mapUrl: module.js.map @@ -330,7 +330,7 @@ sourceRoot: sources: file0.ts,file1.ts,file2.ts,global.ts =================================================================== ------------------------------------------------------------------- -emittedFile:/home/src/workspaces/soltion/lib/module.js +emittedFile:/home/src/workspaces/solution/lib/module.js sourceFile:file0.ts ------------------------------------------------------------------- >>>"use strict"; @@ -356,7 +356,7 @@ sourceFile:file0.ts 6 >Emitted(2, 17) Source(1, 19) + SourceIndex(0) --- ------------------------------------------------------------------- -emittedFile:/home/src/workspaces/soltion/lib/module.js +emittedFile:/home/src/workspaces/solution/lib/module.js sourceFile:file1.ts ------------------------------------------------------------------- >>>define("file1", ["require", "exports"], function (require, exports) { @@ -384,7 +384,7 @@ sourceFile:file1.ts 6 >Emitted(7, 20) Source(1, 21) + SourceIndex(1) --- ------------------------------------------------------------------- -emittedFile:/home/src/workspaces/soltion/lib/module.js +emittedFile:/home/src/workspaces/solution/lib/module.js sourceFile:file2.ts ------------------------------------------------------------------- >>>}); @@ -413,7 +413,7 @@ sourceFile:file2.ts 6 >Emitted(13, 20) Source(1, 21) + SourceIndex(2) --- ------------------------------------------------------------------- -emittedFile:/home/src/workspaces/soltion/lib/module.js +emittedFile:/home/src/workspaces/solution/lib/module.js sourceFile:global.ts ------------------------------------------------------------------- >>>}); @@ -440,7 +440,7 @@ sourceFile:global.ts --- >>>//# sourceMappingURL=module.js.map -//// [/home/src/workspaces/soltion/lib/module.d.ts.map.baseline.txt] +//// [/home/src/workspaces/solution/lib/module.d.ts.map.baseline.txt] =================================================================== JsFile: module.d.ts mapUrl: module.d.ts.map @@ -448,7 +448,7 @@ sourceRoot: sources: file0.ts,file1.ts,file2.ts,global.ts =================================================================== ------------------------------------------------------------------- -emittedFile:/home/src/workspaces/soltion/lib/module.d.ts +emittedFile:/home/src/workspaces/solution/lib/module.d.ts sourceFile:file0.ts ------------------------------------------------------------------- >>>declare const myGlob = 20; @@ -472,7 +472,7 @@ sourceFile:file0.ts 6 >Emitted(1, 27) Source(1, 19) + SourceIndex(0) --- ------------------------------------------------------------------- -emittedFile:/home/src/workspaces/soltion/lib/module.d.ts +emittedFile:/home/src/workspaces/solution/lib/module.d.ts sourceFile:file1.ts ------------------------------------------------------------------- >>>declare module "file1" { @@ -500,7 +500,7 @@ sourceFile:file1.ts 7 >Emitted(3, 25) Source(1, 21) + SourceIndex(1) --- ------------------------------------------------------------------- -emittedFile:/home/src/workspaces/soltion/lib/module.d.ts +emittedFile:/home/src/workspaces/solution/lib/module.d.ts sourceFile:file2.ts ------------------------------------------------------------------- >>>} @@ -529,7 +529,7 @@ sourceFile:file2.ts 7 >Emitted(6, 25) Source(1, 21) + SourceIndex(2) --- ------------------------------------------------------------------- -emittedFile:/home/src/workspaces/soltion/lib/module.d.ts +emittedFile:/home/src/workspaces/solution/lib/module.d.ts sourceFile:global.ts ------------------------------------------------------------------- >>>} @@ -556,7 +556,7 @@ sourceFile:global.ts --- >>>//# sourceMappingURL=module.d.ts.map -//// [/home/src/workspaces/soltion/app/module.js.map.baseline.txt] +//// [/home/src/workspaces/solution/app/module.js.map.baseline.txt] =================================================================== JsFile: module.js mapUrl: module.js.map @@ -564,7 +564,7 @@ sourceRoot: sources: file4.ts,file3.ts =================================================================== ------------------------------------------------------------------- -emittedFile:/home/src/workspaces/soltion/app/module.js +emittedFile:/home/src/workspaces/solution/app/module.js sourceFile:file3.ts ------------------------------------------------------------------- >>>"use strict"; @@ -593,7 +593,7 @@ sourceFile:file3.ts 6 >Emitted(6, 20) Source(1, 21) + SourceIndex(1) --- ------------------------------------------------------------------- -emittedFile:/home/src/workspaces/soltion/app/module.js +emittedFile:/home/src/workspaces/solution/app/module.js sourceFile:file4.ts ------------------------------------------------------------------- >>>}); @@ -620,7 +620,7 @@ sourceFile:file4.ts --- >>>//# sourceMappingURL=module.js.map -//// [/home/src/workspaces/soltion/app/module.d.ts.map.baseline.txt] +//// [/home/src/workspaces/solution/app/module.d.ts.map.baseline.txt] =================================================================== JsFile: module.d.ts mapUrl: module.d.ts.map @@ -628,7 +628,7 @@ sourceRoot: sources: file3.ts,file4.ts =================================================================== ------------------------------------------------------------------- -emittedFile:/home/src/workspaces/soltion/app/module.d.ts +emittedFile:/home/src/workspaces/solution/app/module.d.ts sourceFile:file3.ts ------------------------------------------------------------------- >>>declare module "file3" { @@ -656,7 +656,7 @@ sourceFile:file3.ts 7 >Emitted(2, 25) Source(1, 21) + SourceIndex(0) --- ------------------------------------------------------------------- -emittedFile:/home/src/workspaces/soltion/app/module.d.ts +emittedFile:/home/src/workspaces/solution/app/module.d.ts sourceFile:file4.ts ------------------------------------------------------------------- >>>} @@ -689,7 +689,7 @@ exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped Change:: incremental-declaration-doesnt-change Input:: -//// [/home/src/workspaces/soltion/lib/file1.ts] +//// [/home/src/workspaces/solution/lib/file1.ts] export const x = 10;console.log(x); @@ -701,7 +701,7 @@ Output:: [HH:MM:SS AM] Project 'lib/tsconfig.json' is out of date because buildinfo file 'lib/module.tsbuildinfo' indicates that program needs to report errors. -[HH:MM:SS AM] Building project '/home/src/workspaces/soltion/lib/tsconfig.json'... +[HH:MM:SS AM] Building project '/home/src/workspaces/solution/lib/tsconfig.json'... lib/tsconfig.json:3:15 - error TS5107: Option 'target=ES5' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error. @@ -720,7 +720,7 @@ Output:: [HH:MM:SS AM] Project 'app/tsconfig.json' is out of date because buildinfo file 'app/module.tsbuildinfo' indicates that program needs to report errors. -[HH:MM:SS AM] Building project '/home/src/workspaces/soltion/app/tsconfig.json'... +[HH:MM:SS AM] Building project '/home/src/workspaces/solution/app/tsconfig.json'... app/tsconfig.json:3:15 - error TS5107: Option 'target=ES5' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error. @@ -753,10 +753,10 @@ Found 7 errors. -//// [/home/src/workspaces/soltion/lib/module.js.map] +//// [/home/src/workspaces/solution/lib/module.js.map] {"version":3,"file":"module.js","sourceRoot":"","sources":["file0.ts","file1.ts","file2.ts","global.ts"],"names":[],"mappings":";AAAA,IAAM,MAAM,GAAG,EAAE,CAAC;;;;;ICAL,QAAA,CAAC,GAAG,EAAE,CAAC;IAAA,OAAO,CAAC,GAAG,CAAC,SAAC,CAAC,CAAC;;;;;;ICAtB,QAAA,CAAC,GAAG,EAAE,CAAC;;ACApB,IAAM,WAAW,GAAG,EAAE,CAAC"} -//// [/home/src/workspaces/soltion/lib/module.js] +//// [/home/src/workspaces/solution/lib/module.js] "use strict"; var myGlob = 20; define("file1", ["require", "exports"], function (require, exports) { @@ -775,11 +775,11 @@ define("file2", ["require", "exports"], function (require, exports) { var globalConst = 10; //# sourceMappingURL=module.js.map -//// [/home/src/workspaces/soltion/lib/module.d.ts.map] file written with same contents -//// [/home/src/workspaces/soltion/lib/module.tsbuildinfo] +//// [/home/src/workspaces/solution/lib/module.d.ts.map] file written with same contents +//// [/home/src/workspaces/solution/lib/module.tsbuildinfo] {"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./file0.ts","./file1.ts","./file2.ts","./global.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array { length: number; [n: number]: T; }\ninterface ReadonlyArray {}\ndeclare const console: { log(msg: any): void; };","3587416848-const myGlob = 20;","-4405159098-export const x = 10;console.log(x);","-13729954175-export const y = 20;","1028229885-const globalConst = 10;"],"root":[[2,5]],"options":{"composite":true,"declarationMap":true,"module":2,"outFile":"./module.js","sourceMap":true,"strict":false,"target":1},"semanticDiagnosticsPerFile":[1,2,3,4,5],"outSignature":"29754794677-declare const myGlob = 20;\ndeclare module \"file1\" {\n export const x = 10;\n}\ndeclare module \"file2\" {\n export const y = 20;\n}\ndeclare const globalConst = 10;\n","latestChangedDtsFile":"./module.d.ts","version":"FakeTSVersion"} -//// [/home/src/workspaces/soltion/lib/module.tsbuildinfo.readable.baseline.txt] +//// [/home/src/workspaces/solution/lib/module.tsbuildinfo.readable.baseline.txt] { "fileNames": [ "../../../tslibs/ts/lib/lib.d.ts", @@ -846,7 +846,7 @@ var globalConst = 10; "size": 1127 } -//// [/home/src/workspaces/soltion/lib/module.js.map.baseline.txt] +//// [/home/src/workspaces/solution/lib/module.js.map.baseline.txt] =================================================================== JsFile: module.js mapUrl: module.js.map @@ -854,7 +854,7 @@ sourceRoot: sources: file0.ts,file1.ts,file2.ts,global.ts =================================================================== ------------------------------------------------------------------- -emittedFile:/home/src/workspaces/soltion/lib/module.js +emittedFile:/home/src/workspaces/solution/lib/module.js sourceFile:file0.ts ------------------------------------------------------------------- >>>"use strict"; @@ -880,7 +880,7 @@ sourceFile:file0.ts 6 >Emitted(2, 17) Source(1, 19) + SourceIndex(0) --- ------------------------------------------------------------------- -emittedFile:/home/src/workspaces/soltion/lib/module.js +emittedFile:/home/src/workspaces/solution/lib/module.js sourceFile:file1.ts ------------------------------------------------------------------- >>>define("file1", ["require", "exports"], function (require, exports) { @@ -935,7 +935,7 @@ sourceFile:file1.ts 8 >Emitted(8, 28) Source(1, 36) + SourceIndex(1) --- ------------------------------------------------------------------- -emittedFile:/home/src/workspaces/soltion/lib/module.js +emittedFile:/home/src/workspaces/solution/lib/module.js sourceFile:file2.ts ------------------------------------------------------------------- >>>}); @@ -964,7 +964,7 @@ sourceFile:file2.ts 6 >Emitted(14, 20) Source(1, 21) + SourceIndex(2) --- ------------------------------------------------------------------- -emittedFile:/home/src/workspaces/soltion/lib/module.js +emittedFile:/home/src/workspaces/solution/lib/module.js sourceFile:global.ts ------------------------------------------------------------------- >>>}); @@ -991,6 +991,6 @@ sourceFile:global.ts --- >>>//# sourceMappingURL=module.js.map -//// [/home/src/workspaces/soltion/lib/module.d.ts.map.baseline.txt] file written with same contents +//// [/home/src/workspaces/solution/lib/module.d.ts.map.baseline.txt] file written with same contents exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped diff --git a/tests/baselines/reference/tsbuild/amdModulesWithOut/when-the-module-resolution-finds-original-source-file.js b/tests/baselines/reference/tsbuild/amdModulesWithOut/when-the-module-resolution-finds-original-source-file.js index e2f7aab717c4b..ae6987c553c28 100644 --- a/tests/baselines/reference/tsbuild/amdModulesWithOut/when-the-module-resolution-finds-original-source-file.js +++ b/tests/baselines/reference/tsbuild/amdModulesWithOut/when-the-module-resolution-finds-original-source-file.js @@ -1,14 +1,14 @@ -currentDirectory:: /home/src/workspaces/soltion useCaseSensitiveFileNames:: false +currentDirectory:: /home/src/workspaces/solution useCaseSensitiveFileNames:: false Input:: -//// [/home/src/workspaces/soltion/app/file3.ts] +//// [/home/src/workspaces/solution/app/file3.ts] export const z = 30; import { x } from "lib/file1"; -//// [/home/src/workspaces/soltion/app/file4.ts] +//// [/home/src/workspaces/solution/app/file4.ts] const myVar = 30; -//// [/home/src/workspaces/soltion/app/tsconfig.json] +//// [/home/src/workspaces/solution/app/tsconfig.json] { "compilerOptions": { "target": "es5", @@ -29,19 +29,19 @@ const myVar = 30; ] } -//// [/home/src/workspaces/soltion/lib/file0.ts] +//// [/home/src/workspaces/solution/lib/file0.ts] const myGlob = 20; -//// [/home/src/workspaces/soltion/lib/file1.ts] +//// [/home/src/workspaces/solution/lib/file1.ts] export const x = 10; -//// [/home/src/workspaces/soltion/lib/file2.ts] +//// [/home/src/workspaces/solution/lib/file2.ts] export const y = 20; -//// [/home/src/workspaces/soltion/lib/global.ts] +//// [/home/src/workspaces/solution/lib/global.ts] const globalConst = 10; -//// [/home/src/workspaces/soltion/lib/tsconfig.json] +//// [/home/src/workspaces/solution/lib/tsconfig.json] { "compilerOptions": { "target": "es5", @@ -80,7 +80,7 @@ Output:: [HH:MM:SS AM] Project 'lib/tsconfig.json' is out of date because output file 'module.tsbuildinfo' does not exist -[HH:MM:SS AM] Building project '/home/src/workspaces/soltion/lib/tsconfig.json'... +[HH:MM:SS AM] Building project '/home/src/workspaces/solution/lib/tsconfig.json'... lib/tsconfig.json:3:15 - error TS5107: Option 'target=ES5' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error. @@ -99,7 +99,7 @@ Output:: [HH:MM:SS AM] Project 'app/tsconfig.json' is out of date because output file 'app/module.tsbuildinfo' does not exist -[HH:MM:SS AM] Building project '/home/src/workspaces/soltion/app/tsconfig.json'... +[HH:MM:SS AM] Building project '/home/src/workspaces/solution/app/tsconfig.json'... app/tsconfig.json:3:15 - error TS5107: Option 'target=ES5' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error. @@ -121,10 +121,10 @@ Found 6 errors. -//// [/home/src/workspaces/soltion/module.js.map] +//// [/home/src/workspaces/solution/module.js.map] {"version":3,"file":"module.js","sourceRoot":"","sources":["lib/file0.ts","lib/file1.ts","lib/file2.ts","lib/global.ts"],"names":[],"mappings":";AAAA,IAAM,MAAM,GAAG,EAAE,CAAC;;;;;ICAL,QAAA,CAAC,GAAG,EAAE,CAAC;;;;;;ICAP,QAAA,CAAC,GAAG,EAAE,CAAC;;ACApB,IAAM,WAAW,GAAG,EAAE,CAAC"} -//// [/home/src/workspaces/soltion/module.js] +//// [/home/src/workspaces/solution/module.js] "use strict"; var myGlob = 20; define("lib/file1", ["require", "exports"], function (require, exports) { @@ -142,10 +142,10 @@ define("lib/file2", ["require", "exports"], function (require, exports) { var globalConst = 10; //# sourceMappingURL=module.js.map -//// [/home/src/workspaces/soltion/module.d.ts.map] +//// [/home/src/workspaces/solution/module.d.ts.map] {"version":3,"file":"module.d.ts","sourceRoot":"","sources":["lib/file0.ts","lib/file1.ts","lib/file2.ts","lib/global.ts"],"names":[],"mappings":"AAAA,QAAA,MAAM,MAAM,KAAK,CAAC;;ICAlB,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC;;;ICApB,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC;;ACApB,QAAA,MAAM,WAAW,KAAK,CAAC"} -//// [/home/src/workspaces/soltion/module.d.ts] +//// [/home/src/workspaces/solution/module.d.ts] declare const myGlob = 20; declare module "lib/file1" { export const x = 10; @@ -156,10 +156,10 @@ declare module "lib/file2" { declare const globalConst = 10; //# sourceMappingURL=module.d.ts.map -//// [/home/src/workspaces/soltion/module.tsbuildinfo] +//// [/home/src/workspaces/solution/module.tsbuildinfo] {"fileNames":["../../tslibs/ts/lib/lib.d.ts","./lib/file0.ts","./lib/file1.ts","./lib/file2.ts","./lib/global.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array { length: number; [n: number]: T; }\ninterface ReadonlyArray {}\ndeclare const console: { log(msg: any): void; };","3587416848-const myGlob = 20;","-10726455937-export const x = 10;","-13729954175-export const y = 20;","1028229885-const globalConst = 10;"],"root":[[2,5]],"options":{"composite":true,"declarationMap":true,"module":2,"outFile":"./module.js","rootDir":"./","sourceMap":true,"strict":false,"target":1},"semanticDiagnosticsPerFile":[1,2,3,4,5],"outSignature":"-21806566655-declare const myGlob = 20;\ndeclare module \"lib/file1\" {\n export const x = 10;\n}\ndeclare module \"lib/file2\" {\n export const y = 20;\n}\ndeclare const globalConst = 10;\n","latestChangedDtsFile":"./module.d.ts","version":"FakeTSVersion"} -//// [/home/src/workspaces/soltion/module.tsbuildinfo.readable.baseline.txt] +//// [/home/src/workspaces/solution/module.tsbuildinfo.readable.baseline.txt] { "fileNames": [ "../../tslibs/ts/lib/lib.d.ts", @@ -227,10 +227,10 @@ declare const globalConst = 10; "size": 1150 } -//// [/home/src/workspaces/soltion/app/module.js.map] +//// [/home/src/workspaces/solution/app/module.js.map] {"version":3,"file":"module.js","sourceRoot":"","sources":["file4.ts","file3.ts"],"names":[],"mappings":";;;;;ICAa,QAAA,CAAC,GAAG,EAAE,CAAC;;ADApB,IAAM,KAAK,GAAG,EAAE,CAAC"} -//// [/home/src/workspaces/soltion/app/module.js] +//// [/home/src/workspaces/solution/app/module.js] "use strict"; define("file3", ["require", "exports"], function (require, exports) { "use strict"; @@ -241,20 +241,20 @@ define("file3", ["require", "exports"], function (require, exports) { var myVar = 30; //# sourceMappingURL=module.js.map -//// [/home/src/workspaces/soltion/app/module.d.ts.map] +//// [/home/src/workspaces/solution/app/module.d.ts.map] {"version":3,"file":"module.d.ts","sourceRoot":"","sources":["file3.ts","file4.ts"],"names":[],"mappings":";IAAA,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC;;ACApB,QAAA,MAAM,KAAK,KAAK,CAAC"} -//// [/home/src/workspaces/soltion/app/module.d.ts] +//// [/home/src/workspaces/solution/app/module.d.ts] declare module "file3" { export const z = 30; } declare const myVar = 30; //# sourceMappingURL=module.d.ts.map -//// [/home/src/workspaces/soltion/app/module.tsbuildinfo] +//// [/home/src/workspaces/solution/app/module.tsbuildinfo] {"fileNames":["../../../tslibs/ts/lib/lib.d.ts","../module.d.ts","./file3.ts","./file4.ts"],"fileInfos":["-25093698414-interface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array { length: number; [n: number]: T; }\ninterface ReadonlyArray {}\ndeclare const console: { log(msg: any): void; };","-21806566655-declare const myGlob = 20;\ndeclare module \"lib/file1\" {\n export const x = 10;\n}\ndeclare module \"lib/file2\" {\n export const y = 20;\n}\ndeclare const globalConst = 10;\n","-16038404532-export const z = 30;\nimport { x } from \"lib/file1\";\n","1463681686-const myVar = 30;"],"root":[3,4],"options":{"composite":true,"declarationMap":true,"module":2,"outFile":"./module.js","sourceMap":true,"strict":false,"target":1},"semanticDiagnosticsPerFile":[1,2,3,4],"outSignature":"-23302177839-declare module \"file3\" {\n export const z = 30;\n}\ndeclare const myVar = 30;\n","latestChangedDtsFile":"./module.d.ts","version":"FakeTSVersion"} -//// [/home/src/workspaces/soltion/app/module.tsbuildinfo.readable.baseline.txt] +//// [/home/src/workspaces/solution/app/module.tsbuildinfo.readable.baseline.txt] { "fileNames": [ "../../../tslibs/ts/lib/lib.d.ts", @@ -311,7 +311,7 @@ declare const myVar = 30; "size": 1170 } -//// [/home/src/workspaces/soltion/module.js.map.baseline.txt] +//// [/home/src/workspaces/solution/module.js.map.baseline.txt] =================================================================== JsFile: module.js mapUrl: module.js.map @@ -319,7 +319,7 @@ sourceRoot: sources: lib/file0.ts,lib/file1.ts,lib/file2.ts,lib/global.ts =================================================================== ------------------------------------------------------------------- -emittedFile:/home/src/workspaces/soltion/module.js +emittedFile:/home/src/workspaces/solution/module.js sourceFile:lib/file0.ts ------------------------------------------------------------------- >>>"use strict"; @@ -345,7 +345,7 @@ sourceFile:lib/file0.ts 6 >Emitted(2, 17) Source(1, 19) + SourceIndex(0) --- ------------------------------------------------------------------- -emittedFile:/home/src/workspaces/soltion/module.js +emittedFile:/home/src/workspaces/solution/module.js sourceFile:lib/file1.ts ------------------------------------------------------------------- >>>define("lib/file1", ["require", "exports"], function (require, exports) { @@ -373,7 +373,7 @@ sourceFile:lib/file1.ts 6 >Emitted(7, 20) Source(1, 21) + SourceIndex(1) --- ------------------------------------------------------------------- -emittedFile:/home/src/workspaces/soltion/module.js +emittedFile:/home/src/workspaces/solution/module.js sourceFile:lib/file2.ts ------------------------------------------------------------------- >>>}); @@ -402,7 +402,7 @@ sourceFile:lib/file2.ts 6 >Emitted(13, 20) Source(1, 21) + SourceIndex(2) --- ------------------------------------------------------------------- -emittedFile:/home/src/workspaces/soltion/module.js +emittedFile:/home/src/workspaces/solution/module.js sourceFile:lib/global.ts ------------------------------------------------------------------- >>>}); @@ -429,7 +429,7 @@ sourceFile:lib/global.ts --- >>>//# sourceMappingURL=module.js.map -//// [/home/src/workspaces/soltion/module.d.ts.map.baseline.txt] +//// [/home/src/workspaces/solution/module.d.ts.map.baseline.txt] =================================================================== JsFile: module.d.ts mapUrl: module.d.ts.map @@ -437,7 +437,7 @@ sourceRoot: sources: lib/file0.ts,lib/file1.ts,lib/file2.ts,lib/global.ts =================================================================== ------------------------------------------------------------------- -emittedFile:/home/src/workspaces/soltion/module.d.ts +emittedFile:/home/src/workspaces/solution/module.d.ts sourceFile:lib/file0.ts ------------------------------------------------------------------- >>>declare const myGlob = 20; @@ -462,7 +462,7 @@ sourceFile:lib/file0.ts 6 >Emitted(1, 27) Source(1, 19) + SourceIndex(0) --- ------------------------------------------------------------------- -emittedFile:/home/src/workspaces/soltion/module.d.ts +emittedFile:/home/src/workspaces/solution/module.d.ts sourceFile:lib/file1.ts ------------------------------------------------------------------- >>>declare module "lib/file1" { @@ -490,7 +490,7 @@ sourceFile:lib/file1.ts 7 >Emitted(3, 25) Source(1, 21) + SourceIndex(1) --- ------------------------------------------------------------------- -emittedFile:/home/src/workspaces/soltion/module.d.ts +emittedFile:/home/src/workspaces/solution/module.d.ts sourceFile:lib/file2.ts ------------------------------------------------------------------- >>>} @@ -519,7 +519,7 @@ sourceFile:lib/file2.ts 7 >Emitted(6, 25) Source(1, 21) + SourceIndex(2) --- ------------------------------------------------------------------- -emittedFile:/home/src/workspaces/soltion/module.d.ts +emittedFile:/home/src/workspaces/solution/module.d.ts sourceFile:lib/global.ts ------------------------------------------------------------------- >>>} @@ -546,7 +546,7 @@ sourceFile:lib/global.ts --- >>>//# sourceMappingURL=module.d.ts.map -//// [/home/src/workspaces/soltion/app/module.js.map.baseline.txt] +//// [/home/src/workspaces/solution/app/module.js.map.baseline.txt] =================================================================== JsFile: module.js mapUrl: module.js.map @@ -554,7 +554,7 @@ sourceRoot: sources: file4.ts,file3.ts =================================================================== ------------------------------------------------------------------- -emittedFile:/home/src/workspaces/soltion/app/module.js +emittedFile:/home/src/workspaces/solution/app/module.js sourceFile:file3.ts ------------------------------------------------------------------- >>>"use strict"; @@ -583,7 +583,7 @@ sourceFile:file3.ts 6 >Emitted(6, 20) Source(1, 21) + SourceIndex(1) --- ------------------------------------------------------------------- -emittedFile:/home/src/workspaces/soltion/app/module.js +emittedFile:/home/src/workspaces/solution/app/module.js sourceFile:file4.ts ------------------------------------------------------------------- >>>}); @@ -610,7 +610,7 @@ sourceFile:file4.ts --- >>>//# sourceMappingURL=module.js.map -//// [/home/src/workspaces/soltion/app/module.d.ts.map.baseline.txt] +//// [/home/src/workspaces/solution/app/module.d.ts.map.baseline.txt] =================================================================== JsFile: module.d.ts mapUrl: module.d.ts.map @@ -618,7 +618,7 @@ sourceRoot: sources: file3.ts,file4.ts =================================================================== ------------------------------------------------------------------- -emittedFile:/home/src/workspaces/soltion/app/module.d.ts +emittedFile:/home/src/workspaces/solution/app/module.d.ts sourceFile:file3.ts ------------------------------------------------------------------- >>>declare module "file3" { @@ -646,7 +646,7 @@ sourceFile:file3.ts 7 >Emitted(2, 25) Source(1, 21) + SourceIndex(0) --- ------------------------------------------------------------------- -emittedFile:/home/src/workspaces/soltion/app/module.d.ts +emittedFile:/home/src/workspaces/solution/app/module.d.ts sourceFile:file4.ts ------------------------------------------------------------------- >>>} diff --git a/tests/baselines/reference/tsbuild/noCheck/multiFile/dts-errors-discrepancies.js b/tests/baselines/reference/tsbuild/noCheck/multiFile/dts-errors-discrepancies.js index edbbcd2a92674..dac1bbcb3d008 100644 --- a/tests/baselines/reference/tsbuild/noCheck/multiFile/dts-errors-discrepancies.js +++ b/tests/baselines/reference/tsbuild/noCheck/multiFile/dts-errors-discrepancies.js @@ -1,6 +1,6 @@ 5:: no-change-run -Clean build will have check pending since it didnt type check -Incremental build has typechecked before this so wont have checkPending +Clean build will have check pending since it didn't type check +Incremental build has typechecked before this so won't have checkPending TsBuild info text without affectedFilesPendingEmit:: /home/src/workspaces/project/tsconfig.tsbuildinfo.readable.baseline.txt:: CleanBuild: { @@ -20,8 +20,8 @@ IncrementalBuild: "version": "FakeTSVersion" } 15:: no-change-run -Clean build will have check pending since it didnt type check -Incremental build has typechecked before this so wont have checkPending +Clean build will have check pending since it didn't type check +Incremental build has typechecked before this so won't have checkPending TsBuild info text without affectedFilesPendingEmit:: /home/src/workspaces/project/tsconfig.tsbuildinfo.readable.baseline.txt:: CleanBuild: { diff --git a/tests/baselines/reference/tsbuild/noCheck/multiFile/dts-errors-with-incremental-discrepancies.js b/tests/baselines/reference/tsbuild/noCheck/multiFile/dts-errors-with-incremental-discrepancies.js index eb43fc1cc603f..b5b3fe516d4e4 100644 --- a/tests/baselines/reference/tsbuild/noCheck/multiFile/dts-errors-with-incremental-discrepancies.js +++ b/tests/baselines/reference/tsbuild/noCheck/multiFile/dts-errors-with-incremental-discrepancies.js @@ -1,6 +1,6 @@ 5:: no-change-run -Clean build will have check pending since it didnt type check -Incremental build has typechecked before this so wont have checkPending +Clean build will have check pending since it didn't type check +Incremental build has typechecked before this so won't have checkPending TsBuild info text without affectedFilesPendingEmit:: /home/src/workspaces/project/tsconfig.tsbuildinfo.readable.baseline.txt:: CleanBuild: { @@ -62,8 +62,8 @@ IncrementalBuild: "version": "FakeTSVersion" } 15:: no-change-run -Clean build will have check pending since it didnt type check -Incremental build has typechecked before this so wont have checkPending +Clean build will have check pending since it didn't type check +Incremental build has typechecked before this so won't have checkPending TsBuild info text without affectedFilesPendingEmit:: /home/src/workspaces/project/tsconfig.tsbuildinfo.readable.baseline.txt:: CleanBuild: { diff --git a/tests/baselines/reference/tsbuild/noCheck/multiFile/semantic-errors-discrepancies.js b/tests/baselines/reference/tsbuild/noCheck/multiFile/semantic-errors-discrepancies.js index edbbcd2a92674..dac1bbcb3d008 100644 --- a/tests/baselines/reference/tsbuild/noCheck/multiFile/semantic-errors-discrepancies.js +++ b/tests/baselines/reference/tsbuild/noCheck/multiFile/semantic-errors-discrepancies.js @@ -1,6 +1,6 @@ 5:: no-change-run -Clean build will have check pending since it didnt type check -Incremental build has typechecked before this so wont have checkPending +Clean build will have check pending since it didn't type check +Incremental build has typechecked before this so won't have checkPending TsBuild info text without affectedFilesPendingEmit:: /home/src/workspaces/project/tsconfig.tsbuildinfo.readable.baseline.txt:: CleanBuild: { @@ -20,8 +20,8 @@ IncrementalBuild: "version": "FakeTSVersion" } 15:: no-change-run -Clean build will have check pending since it didnt type check -Incremental build has typechecked before this so wont have checkPending +Clean build will have check pending since it didn't type check +Incremental build has typechecked before this so won't have checkPending TsBuild info text without affectedFilesPendingEmit:: /home/src/workspaces/project/tsconfig.tsbuildinfo.readable.baseline.txt:: CleanBuild: { diff --git a/tests/baselines/reference/tsbuild/noCheck/multiFile/semantic-errors-with-incremental-discrepancies.js b/tests/baselines/reference/tsbuild/noCheck/multiFile/semantic-errors-with-incremental-discrepancies.js index eb43fc1cc603f..b5b3fe516d4e4 100644 --- a/tests/baselines/reference/tsbuild/noCheck/multiFile/semantic-errors-with-incremental-discrepancies.js +++ b/tests/baselines/reference/tsbuild/noCheck/multiFile/semantic-errors-with-incremental-discrepancies.js @@ -1,6 +1,6 @@ 5:: no-change-run -Clean build will have check pending since it didnt type check -Incremental build has typechecked before this so wont have checkPending +Clean build will have check pending since it didn't type check +Incremental build has typechecked before this so won't have checkPending TsBuild info text without affectedFilesPendingEmit:: /home/src/workspaces/project/tsconfig.tsbuildinfo.readable.baseline.txt:: CleanBuild: { @@ -62,8 +62,8 @@ IncrementalBuild: "version": "FakeTSVersion" } 15:: no-change-run -Clean build will have check pending since it didnt type check -Incremental build has typechecked before this so wont have checkPending +Clean build will have check pending since it didn't type check +Incremental build has typechecked before this so won't have checkPending TsBuild info text without affectedFilesPendingEmit:: /home/src/workspaces/project/tsconfig.tsbuildinfo.readable.baseline.txt:: CleanBuild: { diff --git a/tests/baselines/reference/tsbuild/noCheck/multiFile/syntax-errors-discrepancies.js b/tests/baselines/reference/tsbuild/noCheck/multiFile/syntax-errors-discrepancies.js index edbbcd2a92674..dac1bbcb3d008 100644 --- a/tests/baselines/reference/tsbuild/noCheck/multiFile/syntax-errors-discrepancies.js +++ b/tests/baselines/reference/tsbuild/noCheck/multiFile/syntax-errors-discrepancies.js @@ -1,6 +1,6 @@ 5:: no-change-run -Clean build will have check pending since it didnt type check -Incremental build has typechecked before this so wont have checkPending +Clean build will have check pending since it didn't type check +Incremental build has typechecked before this so won't have checkPending TsBuild info text without affectedFilesPendingEmit:: /home/src/workspaces/project/tsconfig.tsbuildinfo.readable.baseline.txt:: CleanBuild: { @@ -20,8 +20,8 @@ IncrementalBuild: "version": "FakeTSVersion" } 15:: no-change-run -Clean build will have check pending since it didnt type check -Incremental build has typechecked before this so wont have checkPending +Clean build will have check pending since it didn't type check +Incremental build has typechecked before this so won't have checkPending TsBuild info text without affectedFilesPendingEmit:: /home/src/workspaces/project/tsconfig.tsbuildinfo.readable.baseline.txt:: CleanBuild: { diff --git a/tests/baselines/reference/tsbuild/noCheck/multiFile/syntax-errors-with-incremental-discrepancies.js b/tests/baselines/reference/tsbuild/noCheck/multiFile/syntax-errors-with-incremental-discrepancies.js index eb43fc1cc603f..b5b3fe516d4e4 100644 --- a/tests/baselines/reference/tsbuild/noCheck/multiFile/syntax-errors-with-incremental-discrepancies.js +++ b/tests/baselines/reference/tsbuild/noCheck/multiFile/syntax-errors-with-incremental-discrepancies.js @@ -1,6 +1,6 @@ 5:: no-change-run -Clean build will have check pending since it didnt type check -Incremental build has typechecked before this so wont have checkPending +Clean build will have check pending since it didn't type check +Incremental build has typechecked before this so won't have checkPending TsBuild info text without affectedFilesPendingEmit:: /home/src/workspaces/project/tsconfig.tsbuildinfo.readable.baseline.txt:: CleanBuild: { @@ -62,8 +62,8 @@ IncrementalBuild: "version": "FakeTSVersion" } 15:: no-change-run -Clean build will have check pending since it didnt type check -Incremental build has typechecked before this so wont have checkPending +Clean build will have check pending since it didn't type check +Incremental build has typechecked before this so won't have checkPending TsBuild info text without affectedFilesPendingEmit:: /home/src/workspaces/project/tsconfig.tsbuildinfo.readable.baseline.txt:: CleanBuild: { diff --git a/tests/baselines/reference/tsbuild/noCheck/outFile/dts-errors-discrepancies.js b/tests/baselines/reference/tsbuild/noCheck/outFile/dts-errors-discrepancies.js index e859968afda99..444bae3841ef5 100644 --- a/tests/baselines/reference/tsbuild/noCheck/outFile/dts-errors-discrepancies.js +++ b/tests/baselines/reference/tsbuild/noCheck/outFile/dts-errors-discrepancies.js @@ -1,6 +1,6 @@ 5:: no-change-run -Clean build will have check pending since it didnt type check -Incremental build has typechecked before this so wont have checkPending +Clean build will have check pending since it didn't type check +Incremental build has typechecked before this so won't have checkPending TsBuild info text without affectedFilesPendingEmit:: /home/src/workspaces/outfile.tsbuildinfo.readable.baseline.txt:: CleanBuild: { @@ -22,8 +22,8 @@ IncrementalBuild: "version": "FakeTSVersion" } 15:: no-change-run -Clean build will have check pending since it didnt type check -Incremental build has typechecked before this so wont have checkPending +Clean build will have check pending since it didn't type check +Incremental build has typechecked before this so won't have checkPending TsBuild info text without affectedFilesPendingEmit:: /home/src/workspaces/outfile.tsbuildinfo.readable.baseline.txt:: CleanBuild: { diff --git a/tests/baselines/reference/tsbuild/noCheck/outFile/dts-errors-with-incremental-discrepancies.js b/tests/baselines/reference/tsbuild/noCheck/outFile/dts-errors-with-incremental-discrepancies.js index b9f874e71c1a3..0f43c3b0a9acc 100644 --- a/tests/baselines/reference/tsbuild/noCheck/outFile/dts-errors-with-incremental-discrepancies.js +++ b/tests/baselines/reference/tsbuild/noCheck/outFile/dts-errors-with-incremental-discrepancies.js @@ -1,6 +1,6 @@ 5:: no-change-run -Clean build will have check pending since it didnt type check -Incremental build has typechecked before this so wont have checkPending +Clean build will have check pending since it didn't type check +Incremental build has typechecked before this so won't have checkPending TsBuild info text without affectedFilesPendingEmit:: /home/src/workspaces/outfile.tsbuildinfo.readable.baseline.txt:: CleanBuild: { @@ -52,8 +52,8 @@ IncrementalBuild: "version": "FakeTSVersion" } 15:: no-change-run -Clean build will have check pending since it didnt type check -Incremental build has typechecked before this so wont have checkPending +Clean build will have check pending since it didn't type check +Incremental build has typechecked before this so won't have checkPending TsBuild info text without affectedFilesPendingEmit:: /home/src/workspaces/outfile.tsbuildinfo.readable.baseline.txt:: CleanBuild: { diff --git a/tests/baselines/reference/tsbuild/noCheck/outFile/semantic-errors-discrepancies.js b/tests/baselines/reference/tsbuild/noCheck/outFile/semantic-errors-discrepancies.js index e859968afda99..444bae3841ef5 100644 --- a/tests/baselines/reference/tsbuild/noCheck/outFile/semantic-errors-discrepancies.js +++ b/tests/baselines/reference/tsbuild/noCheck/outFile/semantic-errors-discrepancies.js @@ -1,6 +1,6 @@ 5:: no-change-run -Clean build will have check pending since it didnt type check -Incremental build has typechecked before this so wont have checkPending +Clean build will have check pending since it didn't type check +Incremental build has typechecked before this so won't have checkPending TsBuild info text without affectedFilesPendingEmit:: /home/src/workspaces/outfile.tsbuildinfo.readable.baseline.txt:: CleanBuild: { @@ -22,8 +22,8 @@ IncrementalBuild: "version": "FakeTSVersion" } 15:: no-change-run -Clean build will have check pending since it didnt type check -Incremental build has typechecked before this so wont have checkPending +Clean build will have check pending since it didn't type check +Incremental build has typechecked before this so won't have checkPending TsBuild info text without affectedFilesPendingEmit:: /home/src/workspaces/outfile.tsbuildinfo.readable.baseline.txt:: CleanBuild: { diff --git a/tests/baselines/reference/tsbuild/noCheck/outFile/semantic-errors-with-incremental-discrepancies.js b/tests/baselines/reference/tsbuild/noCheck/outFile/semantic-errors-with-incremental-discrepancies.js index b9f874e71c1a3..0f43c3b0a9acc 100644 --- a/tests/baselines/reference/tsbuild/noCheck/outFile/semantic-errors-with-incremental-discrepancies.js +++ b/tests/baselines/reference/tsbuild/noCheck/outFile/semantic-errors-with-incremental-discrepancies.js @@ -1,6 +1,6 @@ 5:: no-change-run -Clean build will have check pending since it didnt type check -Incremental build has typechecked before this so wont have checkPending +Clean build will have check pending since it didn't type check +Incremental build has typechecked before this so won't have checkPending TsBuild info text without affectedFilesPendingEmit:: /home/src/workspaces/outfile.tsbuildinfo.readable.baseline.txt:: CleanBuild: { @@ -52,8 +52,8 @@ IncrementalBuild: "version": "FakeTSVersion" } 15:: no-change-run -Clean build will have check pending since it didnt type check -Incremental build has typechecked before this so wont have checkPending +Clean build will have check pending since it didn't type check +Incremental build has typechecked before this so won't have checkPending TsBuild info text without affectedFilesPendingEmit:: /home/src/workspaces/outfile.tsbuildinfo.readable.baseline.txt:: CleanBuild: { diff --git a/tests/baselines/reference/tsbuild/noCheck/outFile/syntax-errors-discrepancies.js b/tests/baselines/reference/tsbuild/noCheck/outFile/syntax-errors-discrepancies.js index e859968afda99..444bae3841ef5 100644 --- a/tests/baselines/reference/tsbuild/noCheck/outFile/syntax-errors-discrepancies.js +++ b/tests/baselines/reference/tsbuild/noCheck/outFile/syntax-errors-discrepancies.js @@ -1,6 +1,6 @@ 5:: no-change-run -Clean build will have check pending since it didnt type check -Incremental build has typechecked before this so wont have checkPending +Clean build will have check pending since it didn't type check +Incremental build has typechecked before this so won't have checkPending TsBuild info text without affectedFilesPendingEmit:: /home/src/workspaces/outfile.tsbuildinfo.readable.baseline.txt:: CleanBuild: { @@ -22,8 +22,8 @@ IncrementalBuild: "version": "FakeTSVersion" } 15:: no-change-run -Clean build will have check pending since it didnt type check -Incremental build has typechecked before this so wont have checkPending +Clean build will have check pending since it didn't type check +Incremental build has typechecked before this so won't have checkPending TsBuild info text without affectedFilesPendingEmit:: /home/src/workspaces/outfile.tsbuildinfo.readable.baseline.txt:: CleanBuild: { diff --git a/tests/baselines/reference/tsbuild/noCheck/outFile/syntax-errors-with-incremental-discrepancies.js b/tests/baselines/reference/tsbuild/noCheck/outFile/syntax-errors-with-incremental-discrepancies.js index b9f874e71c1a3..0f43c3b0a9acc 100644 --- a/tests/baselines/reference/tsbuild/noCheck/outFile/syntax-errors-with-incremental-discrepancies.js +++ b/tests/baselines/reference/tsbuild/noCheck/outFile/syntax-errors-with-incremental-discrepancies.js @@ -1,6 +1,6 @@ 5:: no-change-run -Clean build will have check pending since it didnt type check -Incremental build has typechecked before this so wont have checkPending +Clean build will have check pending since it didn't type check +Incremental build has typechecked before this so won't have checkPending TsBuild info text without affectedFilesPendingEmit:: /home/src/workspaces/outfile.tsbuildinfo.readable.baseline.txt:: CleanBuild: { @@ -52,8 +52,8 @@ IncrementalBuild: "version": "FakeTSVersion" } 15:: no-change-run -Clean build will have check pending since it didnt type check -Incremental build has typechecked before this so wont have checkPending +Clean build will have check pending since it didn't type check +Incremental build has typechecked before this so won't have checkPending TsBuild info text without affectedFilesPendingEmit:: /home/src/workspaces/outfile.tsbuildinfo.readable.baseline.txt:: CleanBuild: { diff --git a/tests/baselines/reference/tsbuild/noEmit/outFile/dts-errors-with-declaration-enable-changes-with-incremental-as-modules-discrepancies.js b/tests/baselines/reference/tsbuild/noEmit/outFile/dts-errors-with-declaration-enable-changes-with-incremental-as-modules-discrepancies.js index c41bb8f3a7a53..2b4418f2edd40 100644 --- a/tests/baselines/reference/tsbuild/noEmit/outFile/dts-errors-with-declaration-enable-changes-with-incremental-as-modules-discrepancies.js +++ b/tests/baselines/reference/tsbuild/noEmit/outFile/dts-errors-with-declaration-enable-changes-with-incremental-as-modules-discrepancies.js @@ -53,4 +53,4 @@ IncrementalBuild: 7:: With declaration and declarationMap noEmit Clean build will have declaration and declarationMap Incremental build will have previous buildInfo so will have declaration and declarationMap -*** Supplied discrepancy explanation but didnt find any difference \ No newline at end of file +*** Supplied discrepancy explanation but didn't find any difference \ No newline at end of file diff --git a/tests/baselines/reference/tsbuild/noEmit/outFile/dts-errors-with-declaration-enable-changes-with-incremental-discrepancies.js b/tests/baselines/reference/tsbuild/noEmit/outFile/dts-errors-with-declaration-enable-changes-with-incremental-discrepancies.js index 3779a8243a4a3..4c2d782419225 100644 --- a/tests/baselines/reference/tsbuild/noEmit/outFile/dts-errors-with-declaration-enable-changes-with-incremental-discrepancies.js +++ b/tests/baselines/reference/tsbuild/noEmit/outFile/dts-errors-with-declaration-enable-changes-with-incremental-discrepancies.js @@ -41,4 +41,4 @@ IncrementalBuild: 7:: With declaration and declarationMap noEmit Clean build will have declaration and declarationMap Incremental build will have previous buildInfo so will have declaration and declarationMap -*** Supplied discrepancy explanation but didnt find any difference \ No newline at end of file +*** Supplied discrepancy explanation but didn't find any difference \ No newline at end of file diff --git a/tests/baselines/reference/tsbuild/outFile/baseline-sectioned-sourcemaps.js b/tests/baselines/reference/tsbuild/outFile/baseline-sectioned-sourcemaps.js index 4cb1902f16eee..0d8d521c17071 100644 --- a/tests/baselines/reference/tsbuild/outFile/baseline-sectioned-sourcemaps.js +++ b/tests/baselines/reference/tsbuild/outFile/baseline-sectioned-sourcemaps.js @@ -296,7 +296,7 @@ declare function f(): string; } //// [/home/src/workspaces/solution/2/second-output.js.map] -{"version":3,"file":"second-output.js","sourceRoot":"","sources":["../second/second_part1.ts","../second/second_part2.ts"],"names":[],"mappings":";AAIA,IAAU,CAAC,CAMV;AAND,WAAU,CAAC;IACP,SAAS,CAAC;QACN,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAC3B,CAAC;IAED,CAAC,EAAE,CAAC;AACR,CAAC,EANS,CAAC,KAAD,CAAC,QAMV;ACVD;IAAA;IAIA,CAAC;IAHG,uBAAW,GAAX;QACI,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;IACtC,CAAC;IACL,QAAC;AAAD,CAAC,AAJD,IAIC"} +{"version":3,"file":"second-output.js","sourceRoot":"","sources":["../second/second_part1.ts","../second/second_part2.ts"],"names":[],"mappings":";AAIA,IAAU,CAAC,CAMV;AND,WAAU,CAAC;IACP,SAAS,CAAC;QACN,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAC3B,CAAC;IAED,CAAC,EAAE,CAAC;AACR,CAAC,EANS,CAAC,KAAD,CAAC,QAMV;ACVD;IAAA;IAIA,CAAC;IAHG,uBAAW,GAAX;QACI,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;IACtC,CAAC;IACL,QAAC;AAAD,CAAC,AAJD,IAIC"} //// [/home/src/workspaces/solution/2/second-output.js] "use strict"; diff --git a/tests/baselines/reference/tsbuild/outFile/builds-till-project-specified.js b/tests/baselines/reference/tsbuild/outFile/builds-till-project-specified.js index 9158142247af6..aabb3cef8aad2 100644 --- a/tests/baselines/reference/tsbuild/outFile/builds-till-project-specified.js +++ b/tests/baselines/reference/tsbuild/outFile/builds-till-project-specified.js @@ -143,7 +143,7 @@ Output:: //// [/home/src/workspaces/solution/2/second-output.js.map] -{"version":3,"file":"second-output.js","sourceRoot":"","sources":["../second/second_part1.ts","../second/second_part2.ts"],"names":[],"mappings":";AAIA,IAAU,CAAC,CAMV;AAND,WAAU,CAAC;IACP,SAAS,CAAC;QACN,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAC3B,CAAC;IAED,CAAC,EAAE,CAAC;AACR,CAAC,EANS,CAAC,KAAD,CAAC,QAMV;ACVD;IAAA;IAIA,CAAC;IAHG,uBAAW,GAAX;QACI,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;IACtC,CAAC;IACL,QAAC;AAAD,CAAC,AAJD,IAIC"} +{"version":3,"file":"second-output.js","sourceRoot":"","sources":["../second/second_part1.ts","../second/second_part2.ts"],"names":[],"mappings":";AAIA,IAAU,CAAC,CAMV;AND,WAAU,CAAC;IACP,SAAS,CAAC;QACN,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAC3B,CAAC;IAED,CAAC,EAAE,CAAC;AACR,CAAC,EANS,CAAC,KAAD,CAAC,QAMV;ACVD;IAAA;IAIA,CAAC;IAHG,uBAAW,GAAX;QACI,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;IACtC,CAAC;IACL,QAAC;AAAD,CAAC,AAJD,IAIC"} //// [/home/src/workspaces/solution/2/second-output.js] "use strict"; diff --git a/tests/baselines/reference/tsbuild/outFile/clean-projects.js b/tests/baselines/reference/tsbuild/outFile/clean-projects.js index 2a63cb767eabe..99ab7327c2f04 100644 --- a/tests/baselines/reference/tsbuild/outFile/clean-projects.js +++ b/tests/baselines/reference/tsbuild/outFile/clean-projects.js @@ -219,7 +219,7 @@ declare function f(): string; } //// [/home/src/workspaces/solution/2/second-output.js.map] -{"version":3,"file":"second-output.js","sourceRoot":"","sources":["../second/second_part1.ts","../second/second_part2.ts"],"names":[],"mappings":";AAIA,IAAU,CAAC,CAMV;AAND,WAAU,CAAC;IACP,SAAS,CAAC;QACN,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAC3B,CAAC;IAED,CAAC,EAAE,CAAC;AACR,CAAC,EANS,CAAC,KAAD,CAAC,QAMV;ACVD;IAAA;IAIA,CAAC;IAHG,uBAAW,GAAX;QACI,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;IACtC,CAAC;IACL,QAAC;AAAD,CAAC,AAJD,IAIC"} +{"version":3,"file":"second-output.js","sourceRoot":"","sources":["../second/second_part1.ts","../second/second_part2.ts"],"names":[],"mappings":";AAIA,IAAU,CAAC,CAMV;AND,WAAU,CAAC;IACP,SAAS,CAAC;QACN,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAC3B,CAAC;IAED,CAAC,EAAE,CAAC;AACR,CAAC,EANS,CAAC,KAAD,CAAC,QAMV;ACVD;IAAA;IAIA,CAAC;IAHG,uBAAW,GAAX;QACI,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;IACtC,CAAC;IACL,QAAC;AAAD,CAAC,AAJD,IAIC"} //// [/home/src/workspaces/solution/2/second-output.js] "use strict"; diff --git a/tests/baselines/reference/tsbuild/outFile/cleans-till-project-specified.js b/tests/baselines/reference/tsbuild/outFile/cleans-till-project-specified.js index 99926a573f072..d5937501c2706 100644 --- a/tests/baselines/reference/tsbuild/outFile/cleans-till-project-specified.js +++ b/tests/baselines/reference/tsbuild/outFile/cleans-till-project-specified.js @@ -219,7 +219,7 @@ declare function f(): string; } //// [/home/src/workspaces/solution/2/second-output.js.map] -{"version":3,"file":"second-output.js","sourceRoot":"","sources":["../second/second_part1.ts","../second/second_part2.ts"],"names":[],"mappings":";AAIA,IAAU,CAAC,CAMV;AAND,WAAU,CAAC;IACP,SAAS,CAAC;QACN,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAC3B,CAAC;IAED,CAAC,EAAE,CAAC;AACR,CAAC,EANS,CAAC,KAAD,CAAC,QAMV;ACVD;IAAA;IAIA,CAAC;IAHG,uBAAW,GAAX;QACI,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;IACtC,CAAC;IACL,QAAC;AAAD,CAAC,AAJD,IAIC"} +{"version":3,"file":"second-output.js","sourceRoot":"","sources":["../second/second_part1.ts","../second/second_part2.ts"],"names":[],"mappings":";AAIA,IAAU,CAAC,CAMV;AND,WAAU,CAAC;IACP,SAAS,CAAC;QACN,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAC3B,CAAC;IAED,CAAC,EAAE,CAAC;AACR,CAAC,EANS,CAAC,KAAD,CAAC,QAMV;ACVD;IAAA;IAIA,CAAC;IAHG,uBAAW,GAAX;QACI,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;IACtC,CAAC;IACL,QAAC;AAAD,CAAC,AAJD,IAIC"} //// [/home/src/workspaces/solution/2/second-output.js] "use strict"; diff --git a/tests/baselines/reference/tsbuild/outFile/non-module-projects-without-prepend.js b/tests/baselines/reference/tsbuild/outFile/non-module-projects-without-prepend.js index 413614a98fec5..23fda7c089cd8 100644 --- a/tests/baselines/reference/tsbuild/outFile/non-module-projects-without-prepend.js +++ b/tests/baselines/reference/tsbuild/outFile/non-module-projects-without-prepend.js @@ -334,7 +334,7 @@ declare function f(): string; } //// [/home/src/workspaces/solution/second/second_part1.js.map] -{"version":3,"file":"second_part1.js","sourceRoot":"","sources":["second_part1.ts"],"names":[],"mappings":";AAIA,IAAU,CAAC,CAMV;AAND,WAAU,CAAC;IACP,SAAS,CAAC;QACN,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAC3B,CAAC;IAED,CAAC,EAAE,CAAC;AACR,CAAC,EANS,CAAC,KAAD,CAAC,QAMV"} +{"version":3,"file":"second_part1.js","sourceRoot":"","sources":["second_part1.ts"],"names":[],"mappings":";AAIA,IAAU,CAAC,CAMV;AND,WAAU,CAAC;IACP,SAAS,CAAC;QACN,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAC3B,CAAC;IAED,CAAC,EAAE,CAAC;AACR,CAAC,EANS,CAAC,KAAD,CAAC,QAMV"} //// [/home/src/workspaces/solution/second/second_part1.js] "use strict"; diff --git a/tests/baselines/reference/tsbuild/outFile/rebuilds-completely-when-command-line-incremental-flag-changes-between-non-dts-changes.js b/tests/baselines/reference/tsbuild/outFile/rebuilds-completely-when-command-line-incremental-flag-changes-between-non-dts-changes.js index dc5cd6f28b088..cc9494fb65dee 100644 --- a/tests/baselines/reference/tsbuild/outFile/rebuilds-completely-when-command-line-incremental-flag-changes-between-non-dts-changes.js +++ b/tests/baselines/reference/tsbuild/outFile/rebuilds-completely-when-command-line-incremental-flag-changes-between-non-dts-changes.js @@ -274,7 +274,7 @@ declare function f(): string; } //// [/home/src/workspaces/solution/2/second-output.js.map] -{"version":3,"file":"second-output.js","sourceRoot":"","sources":["../second/second_part1.ts","../second/second_part2.ts"],"names":[],"mappings":";AAIA,IAAU,CAAC,CAMV;AAND,WAAU,CAAC;IACP,SAAS,CAAC;QACN,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAC3B,CAAC;IAED,CAAC,EAAE,CAAC;AACR,CAAC,EANS,CAAC,KAAD,CAAC,QAMV;ACVD;IAAA;IAIA,CAAC;IAHG,uBAAW,GAAX;QACI,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;IACtC,CAAC;IACL,QAAC;AAAD,CAAC,AAJD,IAIC"} +{"version":3,"file":"second-output.js","sourceRoot":"","sources":["../second/second_part1.ts","../second/second_part2.ts"],"names":[],"mappings":";AAIA,IAAU,CAAC,CAMV;AND,WAAU,CAAC;IACP,SAAS,CAAC;QACN,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAC3B,CAAC;IAED,CAAC,EAAE,CAAC;AACR,CAAC,EANS,CAAC,KAAD,CAAC,QAMV;ACVD;IAAA;IAIA,CAAC;IAHG,uBAAW,GAAX;QACI,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;IACtC,CAAC;IACL,QAAC;AAAD,CAAC,AAJD,IAIC"} //// [/home/src/workspaces/solution/2/second-output.js] "use strict"; diff --git a/tests/baselines/reference/tsbuild/outFile/rebuilds-completely-when-version-in-tsbuildinfo-doesnt-match-ts-version.js b/tests/baselines/reference/tsbuild/outFile/rebuilds-completely-when-version-in-tsbuildinfo-doesnt-match-ts-version.js index 9e0a1891adb6e..96bb23d646672 100644 --- a/tests/baselines/reference/tsbuild/outFile/rebuilds-completely-when-version-in-tsbuildinfo-doesnt-match-ts-version.js +++ b/tests/baselines/reference/tsbuild/outFile/rebuilds-completely-when-version-in-tsbuildinfo-doesnt-match-ts-version.js @@ -219,7 +219,7 @@ declare function f(): string; } //// [/home/src/workspaces/solution/2/second-output.js.map] -{"version":3,"file":"second-output.js","sourceRoot":"","sources":["../second/second_part1.ts","../second/second_part2.ts"],"names":[],"mappings":";AAIA,IAAU,CAAC,CAMV;AAND,WAAU,CAAC;IACP,SAAS,CAAC;QACN,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAC3B,CAAC;IAED,CAAC,EAAE,CAAC;AACR,CAAC,EANS,CAAC,KAAD,CAAC,QAMV;ACVD;IAAA;IAIA,CAAC;IAHG,uBAAW,GAAX;QACI,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;IACtC,CAAC;IACL,QAAC;AAAD,CAAC,AAJD,IAIC"} +{"version":3,"file":"second-output.js","sourceRoot":"","sources":["../second/second_part1.ts","../second/second_part2.ts"],"names":[],"mappings":";AAIA,IAAU,CAAC,CAMV;AND,WAAU,CAAC;IACP,SAAS,CAAC;QACN,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAC3B,CAAC;IAED,CAAC,EAAE,CAAC;AACR,CAAC,EANS,CAAC,KAAD,CAAC,QAMV;ACVD;IAAA;IAIA,CAAC;IAHG,uBAAW,GAAX;QACI,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;IACtC,CAAC;IACL,QAAC;AAAD,CAAC,AAJD,IAIC"} //// [/home/src/workspaces/solution/2/second-output.js] "use strict"; diff --git a/tests/baselines/reference/tsbuild/outFile/tsbuildinfo-is-not-generated-when-incremental-is-set-to-false.js b/tests/baselines/reference/tsbuild/outFile/tsbuildinfo-is-not-generated-when-incremental-is-set-to-false.js index c4c56ecf5ca6a..44f7ecce5bb9c 100644 --- a/tests/baselines/reference/tsbuild/outFile/tsbuildinfo-is-not-generated-when-incremental-is-set-to-false.js +++ b/tests/baselines/reference/tsbuild/outFile/tsbuildinfo-is-not-generated-when-incremental-is-set-to-false.js @@ -274,7 +274,7 @@ declare function f(): string; } //// [/home/src/workspaces/solution/2/second-output.js.map] -{"version":3,"file":"second-output.js","sourceRoot":"","sources":["../second/second_part1.ts","../second/second_part2.ts"],"names":[],"mappings":";AAIA,IAAU,CAAC,CAMV;AAND,WAAU,CAAC;IACP,SAAS,CAAC;QACN,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAC3B,CAAC;IAED,CAAC,EAAE,CAAC;AACR,CAAC,EANS,CAAC,KAAD,CAAC,QAMV;ACVD;IAAA;IAIA,CAAC;IAHG,uBAAW,GAAX;QACI,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;IACtC,CAAC;IACL,QAAC;AAAD,CAAC,AAJD,IAIC"} +{"version":3,"file":"second-output.js","sourceRoot":"","sources":["../second/second_part1.ts","../second/second_part2.ts"],"names":[],"mappings":";AAIA,IAAU,CAAC,CAMV;AND,WAAU,CAAC;IACP,SAAS,CAAC;QACN,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAC3B,CAAC;IAED,CAAC,EAAE,CAAC;AACR,CAAC,EANS,CAAC,KAAD,CAAC,QAMV;ACVD;IAAA;IAIA,CAAC;IAHG,uBAAW,GAAX;QACI,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;IACtC,CAAC;IACL,QAAC;AAAD,CAAC,AAJD,IAIC"} //// [/home/src/workspaces/solution/2/second-output.js] "use strict"; diff --git a/tests/baselines/reference/tsbuild/outFile/verify-buildInfo-absence-results-in-new-build.js b/tests/baselines/reference/tsbuild/outFile/verify-buildInfo-absence-results-in-new-build.js index dc0c1ff2a3f3c..d5b14d037e1a3 100644 --- a/tests/baselines/reference/tsbuild/outFile/verify-buildInfo-absence-results-in-new-build.js +++ b/tests/baselines/reference/tsbuild/outFile/verify-buildInfo-absence-results-in-new-build.js @@ -216,7 +216,7 @@ declare function f(): string; } //// [/home/src/workspaces/solution/2/second-output.js.map] -{"version":3,"file":"second-output.js","sourceRoot":"","sources":["../second/second_part1.ts","../second/second_part2.ts"],"names":[],"mappings":";AAIA,IAAU,CAAC,CAMV;AAND,WAAU,CAAC;IACP,SAAS,CAAC;QACN,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAC3B,CAAC;IAED,CAAC,EAAE,CAAC;AACR,CAAC,EANS,CAAC,KAAD,CAAC,QAMV;ACVD;IAAA;IAIA,CAAC;IAHG,uBAAW,GAAX;QACI,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;IACtC,CAAC;IACL,QAAC;AAAD,CAAC,AAJD,IAIC"} +{"version":3,"file":"second-output.js","sourceRoot":"","sources":["../second/second_part1.ts","../second/second_part2.ts"],"names":[],"mappings":";AAIA,IAAU,CAAC,CAMV;AND,WAAU,CAAC;IACP,SAAS,CAAC;QACN,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAC3B,CAAC;IAED,CAAC,EAAE,CAAC;AACR,CAAC,EANS,CAAC,KAAD,CAAC,QAMV;ACVD;IAAA;IAIA,CAAC;IAHG,uBAAW,GAAX;QACI,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;IACtC,CAAC;IACL,QAAC;AAAD,CAAC,AAJD,IAIC"} //// [/home/src/workspaces/solution/2/second-output.js] "use strict"; diff --git a/tests/baselines/reference/tsbuild/outFile/when-final-project-is-not-composite-but-incremental.js b/tests/baselines/reference/tsbuild/outFile/when-final-project-is-not-composite-but-incremental.js index ada79fcce95fb..3abcfcc33526d 100644 --- a/tests/baselines/reference/tsbuild/outFile/when-final-project-is-not-composite-but-incremental.js +++ b/tests/baselines/reference/tsbuild/outFile/when-final-project-is-not-composite-but-incremental.js @@ -274,7 +274,7 @@ declare function f(): string; } //// [/home/src/workspaces/solution/2/second-output.js.map] -{"version":3,"file":"second-output.js","sourceRoot":"","sources":["../second/second_part1.ts","../second/second_part2.ts"],"names":[],"mappings":";AAIA,IAAU,CAAC,CAMV;AAND,WAAU,CAAC;IACP,SAAS,CAAC;QACN,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAC3B,CAAC;IAED,CAAC,EAAE,CAAC;AACR,CAAC,EANS,CAAC,KAAD,CAAC,QAMV;ACVD;IAAA;IAIA,CAAC;IAHG,uBAAW,GAAX;QACI,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;IACtC,CAAC;IACL,QAAC;AAAD,CAAC,AAJD,IAIC"} +{"version":3,"file":"second-output.js","sourceRoot":"","sources":["../second/second_part1.ts","../second/second_part2.ts"],"names":[],"mappings":";AAIA,IAAU,CAAC,CAMV;AND,WAAU,CAAC;IACP,SAAS,CAAC;QACN,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAC3B,CAAC;IAED,CAAC,EAAE,CAAC;AACR,CAAC,EANS,CAAC,KAAD,CAAC,QAMV;ACVD;IAAA;IAIA,CAAC;IAHG,uBAAW,GAAX;QACI,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;IACtC,CAAC;IACL,QAAC;AAAD,CAAC,AAJD,IAIC"} //// [/home/src/workspaces/solution/2/second-output.js] "use strict"; diff --git a/tests/baselines/reference/tsbuild/outFile/when-final-project-is-not-composite-but-uses-project-references.js b/tests/baselines/reference/tsbuild/outFile/when-final-project-is-not-composite-but-uses-project-references.js index 1d3f6106fcc4f..65d9e30656e76 100644 --- a/tests/baselines/reference/tsbuild/outFile/when-final-project-is-not-composite-but-uses-project-references.js +++ b/tests/baselines/reference/tsbuild/outFile/when-final-project-is-not-composite-but-uses-project-references.js @@ -274,7 +274,7 @@ declare function f(): string; } //// [/home/src/workspaces/solution/2/second-output.js.map] -{"version":3,"file":"second-output.js","sourceRoot":"","sources":["../second/second_part1.ts","../second/second_part2.ts"],"names":[],"mappings":";AAIA,IAAU,CAAC,CAMV;AAND,WAAU,CAAC;IACP,SAAS,CAAC;QACN,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAC3B,CAAC;IAED,CAAC,EAAE,CAAC;AACR,CAAC,EANS,CAAC,KAAD,CAAC,QAMV;ACVD;IAAA;IAIA,CAAC;IAHG,uBAAW,GAAX;QACI,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;IACtC,CAAC;IACL,QAAC;AAAD,CAAC,AAJD,IAIC"} +{"version":3,"file":"second-output.js","sourceRoot":"","sources":["../second/second_part1.ts","../second/second_part2.ts"],"names":[],"mappings":";AAIA,IAAU,CAAC,CAMV;AND,WAAU,CAAC;IACP,SAAS,CAAC;QACN,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAC3B,CAAC;IAED,CAAC,EAAE,CAAC;AACR,CAAC,EANS,CAAC,KAAD,CAAC,QAMV;ACVD;IAAA;IAIA,CAAC;IAHG,uBAAW,GAAX;QACI,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;IACtC,CAAC;IACL,QAAC;AAAD,CAAC,AAJD,IAIC"} //// [/home/src/workspaces/solution/2/second-output.js] "use strict"; diff --git a/tests/baselines/reference/tsbuild/outFile/when-final-project-specifies-tsBuildInfoFile.js b/tests/baselines/reference/tsbuild/outFile/when-final-project-specifies-tsBuildInfoFile.js index c141a5ccc9975..b9bb97e415f9d 100644 --- a/tests/baselines/reference/tsbuild/outFile/when-final-project-specifies-tsBuildInfoFile.js +++ b/tests/baselines/reference/tsbuild/outFile/when-final-project-specifies-tsBuildInfoFile.js @@ -275,7 +275,7 @@ declare function f(): string; } //// [/home/src/workspaces/solution/2/second-output.js.map] -{"version":3,"file":"second-output.js","sourceRoot":"","sources":["../second/second_part1.ts","../second/second_part2.ts"],"names":[],"mappings":";AAIA,IAAU,CAAC,CAMV;AAND,WAAU,CAAC;IACP,SAAS,CAAC;QACN,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAC3B,CAAC;IAED,CAAC,EAAE,CAAC;AACR,CAAC,EANS,CAAC,KAAD,CAAC,QAMV;ACVD;IAAA;IAIA,CAAC;IAHG,uBAAW,GAAX;QACI,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;IACtC,CAAC;IACL,QAAC;AAAD,CAAC,AAJD,IAIC"} +{"version":3,"file":"second-output.js","sourceRoot":"","sources":["../second/second_part1.ts","../second/second_part2.ts"],"names":[],"mappings":";AAIA,IAAU,CAAC,CAMV;AND,WAAU,CAAC;IACP,SAAS,CAAC;QACN,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAC3B,CAAC;IAED,CAAC,EAAE,CAAC;AACR,CAAC,EANS,CAAC,KAAD,CAAC,QAMV;ACVD;IAAA;IAIA,CAAC;IAHG,uBAAW,GAAX;QACI,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;IACtC,CAAC;IACL,QAAC;AAAD,CAAC,AAJD,IAIC"} //// [/home/src/workspaces/solution/2/second-output.js] "use strict"; diff --git a/tests/baselines/reference/tsbuild/outFile/when-input-file-text-does-not-change-but-its-modified-time-changes.js b/tests/baselines/reference/tsbuild/outFile/when-input-file-text-does-not-change-but-its-modified-time-changes.js index 28f183c2c590e..d137ff5a23578 100644 --- a/tests/baselines/reference/tsbuild/outFile/when-input-file-text-does-not-change-but-its-modified-time-changes.js +++ b/tests/baselines/reference/tsbuild/outFile/when-input-file-text-does-not-change-but-its-modified-time-changes.js @@ -274,7 +274,7 @@ declare function f(): string; } //// [/home/src/workspaces/solution/2/second-output.js.map] -{"version":3,"file":"second-output.js","sourceRoot":"","sources":["../second/second_part1.ts","../second/second_part2.ts"],"names":[],"mappings":";AAIA,IAAU,CAAC,CAMV;AAND,WAAU,CAAC;IACP,SAAS,CAAC;QACN,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAC3B,CAAC;IAED,CAAC,EAAE,CAAC;AACR,CAAC,EANS,CAAC,KAAD,CAAC,QAMV;ACVD;IAAA;IAIA,CAAC;IAHG,uBAAW,GAAX;QACI,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;IACtC,CAAC;IACL,QAAC;AAAD,CAAC,AAJD,IAIC"} +{"version":3,"file":"second-output.js","sourceRoot":"","sources":["../second/second_part1.ts","../second/second_part2.ts"],"names":[],"mappings":";AAIA,IAAU,CAAC,CAMV;AND,WAAU,CAAC;IACP,SAAS,CAAC;QACN,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAC3B,CAAC;IAED,CAAC,EAAE,CAAC;AACR,CAAC,EANS,CAAC,KAAD,CAAC,QAMV;ACVD;IAAA;IAIA,CAAC;IAHG,uBAAW,GAAX;QACI,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;IACtC,CAAC;IACL,QAAC;AAAD,CAAC,AAJD,IAIC"} //// [/home/src/workspaces/solution/2/second-output.js] "use strict"; diff --git a/tests/baselines/reference/tsbuild/sample1/invalidates-projects-correctly.js b/tests/baselines/reference/tsbuild/sample1/invalidates-projects-correctly.js index 0db0c6ace9568..62ca9221651dd 100644 --- a/tests/baselines/reference/tsbuild/sample1/invalidates-projects-correctly.js +++ b/tests/baselines/reference/tsbuild/sample1/invalidates-projects-correctly.js @@ -370,7 +370,7 @@ export declare const m: typeof mod; } -Project should still be upto date: UpToDate +Project should still be upto date: up-to-date non Dts change to logic:: After rebuilding logicConfig //// [/user/username/projects/sample1/logic/index.ts] import * as c from '../core/index'; diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/works-with-extended-source-files.js b/tests/baselines/reference/tsbuildWatch/programUpdates/works-with-extended-source-files.js index 07b1249b6e6d6..5fd0901b76d3b 100644 --- a/tests/baselines/reference/tsbuildWatch/programUpdates/works-with-extended-source-files.js +++ b/tests/baselines/reference/tsbuildWatch/programUpdates/works-with-extended-source-files.js @@ -693,7 +693,7 @@ Shape signatures in builder refreshed for:: exitCode:: ExitStatus.undefined -Change:: update aplha config +Change:: update alpha config Input:: //// [/user/username/projects/project/alpha.tsconfig.json] diff --git a/tests/baselines/reference/tsc/declarationEmit/when-using-Windows-paths-and-uppercase-letters.js b/tests/baselines/reference/tsc/declarationEmit/when-using-Windows-paths-and-uppercase-letters.js index 35ed22da004f8..a9433509976d4 100644 --- a/tests/baselines/reference/tsc/declarationEmit/when-using-Windows-paths-and-uppercase-letters.js +++ b/tests/baselines/reference/tsc/declarationEmit/when-using-Windows-paths-and-uppercase-letters.js @@ -148,7 +148,7 @@ export interface MyType extends Function { //// [D:/Work/pkg1/dist/src/utils/index.js.map] -{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/utils/index.ts"],"names":[],"mappings":";;AAEA,kCAMC;AAND,SAAgB,WAAW,CAAI,QAAmB;IAC9C,MAAe,gBAAgB;QAC3B,gBAAe,CAAC;KACnB;IAED,OAAO,gBAAgC,CAAC;AAC5C,CAAC"} +{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/utils/index.ts"],"names":[],"mappings":";;AAEA,kCAMC;AND,SAAgB,WAAW,CAAI,QAAmB;IAC9C,MAAe,gBAAgB;QAC3B,gBAAe,CAAC;KACnB;IAED,OAAO,gBAAgC,CAAC;AAC5C,CAAC"} //// [D:/Work/pkg1/dist/src/utils/index.js] "use strict"; diff --git a/tests/baselines/reference/tsc/incremental/when-new-file-is-added-to-the-referenced-project-discrepancies.js b/tests/baselines/reference/tsc/incremental/when-new-file-is-added-to-the-referenced-project-discrepancies.js index bb476183eccd6..2e4ae893b5890 100644 --- a/tests/baselines/reference/tsc/incremental/when-new-file-is-added-to-the-referenced-project-discrepancies.js +++ b/tests/baselines/reference/tsc/incremental/when-new-file-is-added-to-the-referenced-project-discrepancies.js @@ -1,4 +1,4 @@ 0:: Add class3 to project1 and build it Ts buildinfo will not be updated in incremental build so it will have semantic diagnostics cached from previous build But in clean build because of global diagnostics, semantic diagnostics are not queried so not cached in tsbuildinfo -*** Supplied discrepancy explanation but didnt find any difference \ No newline at end of file +*** Supplied discrepancy explanation but didn't find any difference \ No newline at end of file diff --git a/tests/baselines/reference/tsc/noCheck/multiFile/dts-errors-with-incremental-discrepancies.js b/tests/baselines/reference/tsc/noCheck/multiFile/dts-errors-with-incremental-discrepancies.js index eb43fc1cc603f..b5b3fe516d4e4 100644 --- a/tests/baselines/reference/tsc/noCheck/multiFile/dts-errors-with-incremental-discrepancies.js +++ b/tests/baselines/reference/tsc/noCheck/multiFile/dts-errors-with-incremental-discrepancies.js @@ -1,6 +1,6 @@ 5:: no-change-run -Clean build will have check pending since it didnt type check -Incremental build has typechecked before this so wont have checkPending +Clean build will have check pending since it didn't type check +Incremental build has typechecked before this so won't have checkPending TsBuild info text without affectedFilesPendingEmit:: /home/src/workspaces/project/tsconfig.tsbuildinfo.readable.baseline.txt:: CleanBuild: { @@ -62,8 +62,8 @@ IncrementalBuild: "version": "FakeTSVersion" } 15:: no-change-run -Clean build will have check pending since it didnt type check -Incremental build has typechecked before this so wont have checkPending +Clean build will have check pending since it didn't type check +Incremental build has typechecked before this so won't have checkPending TsBuild info text without affectedFilesPendingEmit:: /home/src/workspaces/project/tsconfig.tsbuildinfo.readable.baseline.txt:: CleanBuild: { diff --git a/tests/baselines/reference/tsc/noCheck/multiFile/semantic-errors-with-incremental-discrepancies.js b/tests/baselines/reference/tsc/noCheck/multiFile/semantic-errors-with-incremental-discrepancies.js index eb43fc1cc603f..b5b3fe516d4e4 100644 --- a/tests/baselines/reference/tsc/noCheck/multiFile/semantic-errors-with-incremental-discrepancies.js +++ b/tests/baselines/reference/tsc/noCheck/multiFile/semantic-errors-with-incremental-discrepancies.js @@ -1,6 +1,6 @@ 5:: no-change-run -Clean build will have check pending since it didnt type check -Incremental build has typechecked before this so wont have checkPending +Clean build will have check pending since it didn't type check +Incremental build has typechecked before this so won't have checkPending TsBuild info text without affectedFilesPendingEmit:: /home/src/workspaces/project/tsconfig.tsbuildinfo.readable.baseline.txt:: CleanBuild: { @@ -62,8 +62,8 @@ IncrementalBuild: "version": "FakeTSVersion" } 15:: no-change-run -Clean build will have check pending since it didnt type check -Incremental build has typechecked before this so wont have checkPending +Clean build will have check pending since it didn't type check +Incremental build has typechecked before this so won't have checkPending TsBuild info text without affectedFilesPendingEmit:: /home/src/workspaces/project/tsconfig.tsbuildinfo.readable.baseline.txt:: CleanBuild: { diff --git a/tests/baselines/reference/tsc/noCheck/multiFile/syntax-errors-with-incremental-discrepancies.js b/tests/baselines/reference/tsc/noCheck/multiFile/syntax-errors-with-incremental-discrepancies.js index eb43fc1cc603f..b5b3fe516d4e4 100644 --- a/tests/baselines/reference/tsc/noCheck/multiFile/syntax-errors-with-incremental-discrepancies.js +++ b/tests/baselines/reference/tsc/noCheck/multiFile/syntax-errors-with-incremental-discrepancies.js @@ -1,6 +1,6 @@ 5:: no-change-run -Clean build will have check pending since it didnt type check -Incremental build has typechecked before this so wont have checkPending +Clean build will have check pending since it didn't type check +Incremental build has typechecked before this so won't have checkPending TsBuild info text without affectedFilesPendingEmit:: /home/src/workspaces/project/tsconfig.tsbuildinfo.readable.baseline.txt:: CleanBuild: { @@ -62,8 +62,8 @@ IncrementalBuild: "version": "FakeTSVersion" } 15:: no-change-run -Clean build will have check pending since it didnt type check -Incremental build has typechecked before this so wont have checkPending +Clean build will have check pending since it didn't type check +Incremental build has typechecked before this so won't have checkPending TsBuild info text without affectedFilesPendingEmit:: /home/src/workspaces/project/tsconfig.tsbuildinfo.readable.baseline.txt:: CleanBuild: { diff --git a/tests/baselines/reference/tsc/noCheck/outFile/dts-errors-with-incremental-discrepancies.js b/tests/baselines/reference/tsc/noCheck/outFile/dts-errors-with-incremental-discrepancies.js index db54e7badaee7..97cf0eb76f596 100644 --- a/tests/baselines/reference/tsc/noCheck/outFile/dts-errors-with-incremental-discrepancies.js +++ b/tests/baselines/reference/tsc/noCheck/outFile/dts-errors-with-incremental-discrepancies.js @@ -1,8 +1,8 @@ 5:: no-change-run -Clean build will have check pending since it didnt type check -Incremental build has typechecked before this so wont have checkPending -*** Supplied discrepancy explanation but didnt find any difference +Clean build will have check pending since it didn't type check +Incremental build has typechecked before this so won't have checkPending +*** Supplied discrepancy explanation but didn't find any difference 15:: no-change-run -Clean build will have check pending since it didnt type check -Incremental build has typechecked before this so wont have checkPending -*** Supplied discrepancy explanation but didnt find any difference \ No newline at end of file +Clean build will have check pending since it didn't type check +Incremental build has typechecked before this so won't have checkPending +*** Supplied discrepancy explanation but didn't find any difference \ No newline at end of file diff --git a/tests/baselines/reference/tsc/noCheck/outFile/semantic-errors-with-incremental-discrepancies.js b/tests/baselines/reference/tsc/noCheck/outFile/semantic-errors-with-incremental-discrepancies.js index db54e7badaee7..97cf0eb76f596 100644 --- a/tests/baselines/reference/tsc/noCheck/outFile/semantic-errors-with-incremental-discrepancies.js +++ b/tests/baselines/reference/tsc/noCheck/outFile/semantic-errors-with-incremental-discrepancies.js @@ -1,8 +1,8 @@ 5:: no-change-run -Clean build will have check pending since it didnt type check -Incremental build has typechecked before this so wont have checkPending -*** Supplied discrepancy explanation but didnt find any difference +Clean build will have check pending since it didn't type check +Incremental build has typechecked before this so won't have checkPending +*** Supplied discrepancy explanation but didn't find any difference 15:: no-change-run -Clean build will have check pending since it didnt type check -Incremental build has typechecked before this so wont have checkPending -*** Supplied discrepancy explanation but didnt find any difference \ No newline at end of file +Clean build will have check pending since it didn't type check +Incremental build has typechecked before this so won't have checkPending +*** Supplied discrepancy explanation but didn't find any difference \ No newline at end of file diff --git a/tests/baselines/reference/tsc/noCheck/outFile/syntax-errors-with-incremental-discrepancies.js b/tests/baselines/reference/tsc/noCheck/outFile/syntax-errors-with-incremental-discrepancies.js index db54e7badaee7..97cf0eb76f596 100644 --- a/tests/baselines/reference/tsc/noCheck/outFile/syntax-errors-with-incremental-discrepancies.js +++ b/tests/baselines/reference/tsc/noCheck/outFile/syntax-errors-with-incremental-discrepancies.js @@ -1,8 +1,8 @@ 5:: no-change-run -Clean build will have check pending since it didnt type check -Incremental build has typechecked before this so wont have checkPending -*** Supplied discrepancy explanation but didnt find any difference +Clean build will have check pending since it didn't type check +Incremental build has typechecked before this so won't have checkPending +*** Supplied discrepancy explanation but didn't find any difference 15:: no-change-run -Clean build will have check pending since it didnt type check -Incremental build has typechecked before this so wont have checkPending -*** Supplied discrepancy explanation but didnt find any difference \ No newline at end of file +Clean build will have check pending since it didn't type check +Incremental build has typechecked before this so won't have checkPending +*** Supplied discrepancy explanation but didn't find any difference \ No newline at end of file diff --git a/tests/baselines/reference/tsc/noEmitOnError/multiFile/when-declarationMap-changes-discrepancies.js b/tests/baselines/reference/tsc/noEmitOnError/multiFile/when-declarationMap-changes-discrepancies.js index 54d1345630b49..bfd683d8ddb14 100644 --- a/tests/baselines/reference/tsc/noEmitOnError/multiFile/when-declarationMap-changes-discrepancies.js +++ b/tests/baselines/reference/tsc/noEmitOnError/multiFile/when-declarationMap-changes-discrepancies.js @@ -1,6 +1,6 @@ 0:: error and enable declarationMap Clean build does not emit any file so will have emitSignatures with all files since they are not emitted -Incremental build has emitSignatures from before, so it will have a.ts with signature since file.version isnt same +Incremental build has emitSignatures from before, so it will have a.ts with signature since file.version isn't same Incremental build will also have emitSignatureDtsMapDiffers for both files since the emitSignatures were without declarationMap but currentOptions have declrationMap TsBuild info text without affectedFilesPendingEmit:: /home/src/workspaces/project/tsconfig.tsbuildinfo.readable.baseline.txt:: CleanBuild: diff --git a/tests/baselines/reference/tsc/noEmitOnError/outFile/when-declarationMap-changes-discrepancies.js b/tests/baselines/reference/tsc/noEmitOnError/outFile/when-declarationMap-changes-discrepancies.js index 51aa64397a347..40a1335b0e895 100644 --- a/tests/baselines/reference/tsc/noEmitOnError/outFile/when-declarationMap-changes-discrepancies.js +++ b/tests/baselines/reference/tsc/noEmitOnError/outFile/when-declarationMap-changes-discrepancies.js @@ -1,4 +1,4 @@ 0:: error and enable declarationMap Clean build does not emit any file so will not have outSignature Incremental build has outSignature from before -*** Supplied discrepancy explanation but didnt find any difference \ No newline at end of file +*** Supplied discrepancy explanation but didn't find any difference \ No newline at end of file diff --git a/tests/baselines/reference/tscWatch/programUpdates/two-watch-programs-are-not-affected-by-each-other.js b/tests/baselines/reference/tscWatch/programUpdates/two-watch-programs-are-not-affected-by-each-other.js index c8069319770bd..c1c78ae3e2d7d 100644 --- a/tests/baselines/reference/tscWatch/programUpdates/two-watch-programs-are-not-affected-by-each-other.js +++ b/tests/baselines/reference/tscWatch/programUpdates/two-watch-programs-are-not-affected-by-each-other.js @@ -3,12 +3,12 @@ Input:: //// [/user/username/workspace/solution/projects/project/f1.ts] export * from "../projectc/f2"; - export * from "../projectd/f3"; + export * from "../projected/f3"; //// [/user/username/workspace/solution/projects/projectc/f2.ts] export let x = 1; -//// [/user/username/workspace/solution/projects/projectd/f3.ts] +//// [/user/username/workspace/solution/projects/projected/f3.ts] export let y = 1; //// [/home/src/tslibs/TS/Lib/lib.d.ts] @@ -26,7 +26,7 @@ interface ReadonlyArray {} declare const console: { log(msg: any): void; }; -/home/src/tslibs/TS/Lib/tsc.js --w /user/username/workspace/solution/projects/projectc/f2.ts /user/username/workspace/solution/projects/projectd/f3.ts +/home/src/tslibs/TS/Lib/tsc.js --w /user/username/workspace/solution/projects/projectc/f2.ts /user/username/workspace/solution/projects/projected/f3.ts Output:: >> Screen clear [HH:MM:SS AM] Starting compilation in watch mode... @@ -41,7 +41,7 @@ Output:: export let x = 1; -//// [/user/username/workspace/solution/projects/projectd/f3.js] +//// [/user/username/workspace/solution/projects/projected/f3.js] export let y = 1; @@ -51,12 +51,12 @@ FsWatches:: {} /user/username/workspace/solution/projects/projectc/f2.ts: *new* {} -/user/username/workspace/solution/projects/projectd/f3.ts: *new* +/user/username/workspace/solution/projects/projected/f3.ts: *new* {} Program root files: [ "/user/username/workspace/solution/projects/projectc/f2.ts", - "/user/username/workspace/solution/projects/projectd/f3.ts" + "/user/username/workspace/solution/projects/projected/f3.ts" ] Program options: { "allowNonTsExtensions": true @@ -65,21 +65,21 @@ Program structureReused: Not Program files:: /home/src/tslibs/TS/Lib/lib.es2025.full.d.ts /user/username/workspace/solution/projects/projectc/f2.ts -/user/username/workspace/solution/projects/projectd/f3.ts +/user/username/workspace/solution/projects/projected/f3.ts Semantic diagnostics in builder refreshed for:: /home/src/tslibs/TS/Lib/lib.es2025.full.d.ts /user/username/workspace/solution/projects/projectc/f2.ts -/user/username/workspace/solution/projects/projectd/f3.ts +/user/username/workspace/solution/projects/projected/f3.ts Shape signatures in builder refreshed for:: /home/src/tslibs/ts/lib/lib.es2025.full.d.ts (used version) /user/username/workspace/solution/projects/projectc/f2.ts (used version) -/user/username/workspace/solution/projects/projectd/f3.ts (used version) +/user/username/workspace/solution/projects/projected/f3.ts (used version) exitCode:: ExitStatus.undefined -createing separate watcher +creating separate watcher Output:: >> Screen clear [HH:MM:SS AM] Starting compilation in watch mode... @@ -89,10 +89,10 @@ Output:: //// [/user/username/workspace/solution/projects/projectc/f2.js] file written with same contents -//// [/user/username/workspace/solution/projects/projectd/f3.js] file written with same contents +//// [/user/username/workspace/solution/projects/projected/f3.js] file written with same contents //// [/user/username/workspace/solution/projects/project/f1.js] export * from "../projectc/f2"; -export * from "../projectd/f3"; +export * from "../projected/f3"; @@ -103,7 +103,7 @@ FsWatches:: {} /user/username/workspace/solution/projects/projectc/f2.ts: {} -/user/username/workspace/solution/projects/projectd/f3.ts: +/user/username/workspace/solution/projects/projected/f3.ts: {} Program root files: [ @@ -116,19 +116,19 @@ Program structureReused: Not Program files:: /home/src/tslibs/TS/Lib/lib.es2025.full.d.ts /user/username/workspace/solution/projects/projectc/f2.ts -/user/username/workspace/solution/projects/projectd/f3.ts +/user/username/workspace/solution/projects/projected/f3.ts /user/username/workspace/solution/projects/project/f1.ts Semantic diagnostics in builder refreshed for:: /home/src/tslibs/TS/Lib/lib.es2025.full.d.ts /user/username/workspace/solution/projects/projectc/f2.ts -/user/username/workspace/solution/projects/projectd/f3.ts +/user/username/workspace/solution/projects/projected/f3.ts /user/username/workspace/solution/projects/project/f1.ts Shape signatures in builder refreshed for:: /home/src/tslibs/ts/lib/lib.es2025.full.d.ts (used version) /user/username/workspace/solution/projects/projectc/f2.ts (used version) -/user/username/workspace/solution/projects/projectd/f3.ts (used version) +/user/username/workspace/solution/projects/projected/f3.ts (used version) /user/username/workspace/solution/projects/project/f1.ts (used version) exitCode:: ExitStatus.undefined diff --git a/tests/baselines/reference/tscWatch/programUpdates/when-changing-checkJs-of-config-file.js b/tests/baselines/reference/tscWatch/programUpdates/when-changing-checkJs-of-config-file.js index 2c09a707844da..b5b4e1ffca513 100644 --- a/tests/baselines/reference/tscWatch/programUpdates/when-changing-checkJs-of-config-file.js +++ b/tests/baselines/reference/tscWatch/programUpdates/when-changing-checkJs-of-config-file.js @@ -1,10 +1,10 @@ currentDirectory:: /user/username/projects/myproject useCaseSensitiveFileNames:: false Input:: //// [/user/username/projects/myproject/a.js] -export const aNumber: number = "string" +export const a number: number = "string" //// [/user/username/projects/myproject/b.ts] -import { aNumber } from "./a.js"; +import { a number } from "./a.js"; //// [/user/username/projects/myproject/tsconfig.json] { @@ -46,7 +46,7 @@ DirectoryWatcher:: Triggered with /user/username/projects/myproject/b.js :: Watc Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/b.js :: WatchInfo: /user/username/projects/myproject 0 undefined Failed Lookup Locations b.ts:1:25 - error TS7016: Could not find a declaration file for module './a.js'. '/user/username/projects/myproject/a.js' implicitly has an 'any' type. -1 import { aNumber } from "./a.js"; +1 import { a number } from "./a.js";    ~~~~~~~~ [HH:MM:SS AM] Found 1 error. Watching for file changes. @@ -137,7 +137,7 @@ CreatingProgramWith:: FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/a.js 250 undefined Source file a.js:1:23 - error TS8010: Type annotations can only be used in TypeScript files. -1 export const aNumber: number = "string" +1 export const a number: number = "string"    ~~~~~~ [HH:MM:SS AM] Found 1 error. Watching for file changes. diff --git a/tests/baselines/reference/tscWatch/programUpdates/when-new-file-is-added-to-the-referenced-project.js b/tests/baselines/reference/tscWatch/programUpdates/when-new-file-is-added-to-the-referenced-project.js index fb64f816e3804..53421f5548aad 100644 --- a/tests/baselines/reference/tscWatch/programUpdates/when-new-file-is-added-to-the-referenced-project.js +++ b/tests/baselines/reference/tscWatch/programUpdates/when-new-file-is-added-to-the-referenced-project.js @@ -72,7 +72,7 @@ FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es2025.full.d.ts 25 DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/projects/project2 1 undefined Wild card directory Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/projects/project2 1 undefined Wild card directory -FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/projects/project1/tsconfig.json 2000 undefined Config file of referened project +FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/projects/project1/tsconfig.json 2000 undefined Config file of referenced project DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project diff --git a/tests/baselines/reference/tscWatch/projectsWithReferences/watch-options-differing-between-projects.js b/tests/baselines/reference/tscWatch/projectsWithReferences/watch-options-differing-between-projects.js index 0041b74df5df6..ebc6eb24f9ec7 100644 --- a/tests/baselines/reference/tscWatch/projectsWithReferences/watch-options-differing-between-projects.js +++ b/tests/baselines/reference/tscWatch/projectsWithReferences/watch-options-differing-between-projects.js @@ -130,7 +130,7 @@ FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es2025.full.d.ts 25 DirectoryWatcher:: Added:: WatchInfo: /user/username/workspace/project/src/b 1 {"excludeDirectories":["/user/username/workspace/project/**/node_modules"]} Wild card directory Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/workspace/project/src/b 1 {"excludeDirectories":["/user/username/workspace/project/**/node_modules"]} Wild card directory FileWatcher:: Added:: WatchInfo: /user/username/workspace/project/tsconfig.base.json 2000 {"excludeDirectories":["/user/username/workspace/project/**/node_modules"]} Extended config file -FileWatcher:: Added:: WatchInfo: /user/username/workspace/project/tsconfig.A.json 2000 {"excludeDirectories":["/user/username/workspace/project/**/excludes_by_A"]} Config file of referened project +FileWatcher:: Added:: WatchInfo: /user/username/workspace/project/tsconfig.A.json 2000 {"excludeDirectories":["/user/username/workspace/project/**/excludes_by_A"]} Config file of referenced project DirectoryWatcher:: Added:: WatchInfo: /user/username/workspace/project/src/a 1 {"excludeDirectories":["/user/username/workspace/project/**/excludes_by_A"]} Wild card directory of referenced project Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/workspace/project/src/a 1 {"excludeDirectories":["/user/username/workspace/project/**/excludes_by_A"]} Wild card directory of referenced project diff --git a/tests/baselines/reference/tscWatch/projectsWithReferences/when-declarationMap-changes-for-dependency.js b/tests/baselines/reference/tscWatch/projectsWithReferences/when-declarationMap-changes-for-dependency.js index bc619dff3da32..fbb709cb5dba6 100644 --- a/tests/baselines/reference/tscWatch/projectsWithReferences/when-declarationMap-changes-for-dependency.js +++ b/tests/baselines/reference/tscWatch/projectsWithReferences/when-declarationMap-changes-for-dependency.js @@ -381,7 +381,7 @@ Dependencies for:: exitCode:: ExitStatus.undefined -Change:: change declration map in core +Change:: change declaration map in core Input:: //// [/user/username/projects/sample1/core/tsconfig.json] diff --git a/tests/baselines/reference/tscWatch/watchApi/multiFile/when-emitting-with-emitOnlyDtsFiles.js b/tests/baselines/reference/tscWatch/watchApi/multiFile/when-emitting-with-emitOnlyDtsFiles.js index 14f1599bb370c..912274fc915c3 100644 --- a/tests/baselines/reference/tscWatch/watchApi/multiFile/when-emitting-with-emitOnlyDtsFiles.js +++ b/tests/baselines/reference/tscWatch/watchApi/multiFile/when-emitting-with-emitOnlyDtsFiles.js @@ -303,7 +303,7 @@ Shape signatures in builder refreshed for:: exitCode:: ExitStatus.undefined -Change:: Emit with emitOnlyDts shouldnt emit anything +Change:: Emit with emitOnlyDts shouldn't emit anything Input:: @@ -325,7 +325,7 @@ BuilderProgram: Same as old builder program exitCode:: ExitStatus.undefined -Change:: Emit with emitOnlyDts shouldnt emit anything +Change:: Emit with emitOnlyDts shouldn't emit anything Input:: diff --git a/tests/baselines/reference/tscWatch/watchApi/outFile/when-emitting-with-emitOnlyDtsFiles.js b/tests/baselines/reference/tscWatch/watchApi/outFile/when-emitting-with-emitOnlyDtsFiles.js index a50e0252a6317..a3412901d057b 100644 --- a/tests/baselines/reference/tscWatch/watchApi/outFile/when-emitting-with-emitOnlyDtsFiles.js +++ b/tests/baselines/reference/tscWatch/watchApi/outFile/when-emitting-with-emitOnlyDtsFiles.js @@ -259,7 +259,7 @@ No shapes updated in the builder:: exitCode:: ExitStatus.undefined -Change:: Emit with emitOnlyDts shouldnt emit anything +Change:: Emit with emitOnlyDts shouldn't emit anything Input:: @@ -281,7 +281,7 @@ BuilderProgram: Same as old builder program exitCode:: ExitStatus.undefined -Change:: Emit with emitOnlyDts shouldnt emit anything +Change:: Emit with emitOnlyDts shouldn't emit anything Input:: diff --git a/tests/baselines/reference/tscWatch/watchApi/when-new-file-is-added-to-the-referenced-project-with-host-implementing-getParsedCommandLine-without-implementing-useSourceOfProjectReferenceRedirect.js b/tests/baselines/reference/tscWatch/watchApi/when-new-file-is-added-to-the-referenced-project-with-host-implementing-getParsedCommandLine-without-implementing-useSourceOfProjectReferenceRedirect.js index 0ba7c17b5305b..e7ba021f19c5c 100644 --- a/tests/baselines/reference/tscWatch/watchApi/when-new-file-is-added-to-the-referenced-project-with-host-implementing-getParsedCommandLine-without-implementing-useSourceOfProjectReferenceRedirect.js +++ b/tests/baselines/reference/tscWatch/watchApi/when-new-file-is-added-to-the-referenced-project-with-host-implementing-getParsedCommandLine-without-implementing-useSourceOfProjectReferenceRedirect.js @@ -72,7 +72,7 @@ FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es2025.full.d.ts 25 DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/projects/project2 1 undefined Wild card directory Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/projects/project2 1 undefined Wild card directory -FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/projects/project1/tsconfig.json 2000 undefined Config file of referened project +FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/projects/project1/tsconfig.json 2000 undefined Config file of referenced project DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project diff --git a/tests/baselines/reference/tscWatch/watchApi/when-new-file-is-added-to-the-referenced-project-with-host-implementing-getParsedCommandLine.js b/tests/baselines/reference/tscWatch/watchApi/when-new-file-is-added-to-the-referenced-project-with-host-implementing-getParsedCommandLine.js index 2cf30a8bf1406..15bc4af32335f 100644 --- a/tests/baselines/reference/tscWatch/watchApi/when-new-file-is-added-to-the-referenced-project-with-host-implementing-getParsedCommandLine.js +++ b/tests/baselines/reference/tscWatch/watchApi/when-new-file-is-added-to-the-referenced-project-with-host-implementing-getParsedCommandLine.js @@ -72,7 +72,7 @@ FileWatcher:: Added:: WatchInfo: /home/src/tslibs/TS/Lib/lib.es2025.full.d.ts 25 DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/projects/project2 1 undefined Wild card directory Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/projects/project2 1 undefined Wild card directory -FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/projects/project1/tsconfig.json 2000 undefined Config file of referened project +FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/projects/project1/tsconfig.json 2000 undefined Config file of referenced project DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project diff --git a/tests/baselines/reference/tscWatch/watchApi/when-watching-referenced-project-when-there-is-no-config-file-name.js b/tests/baselines/reference/tscWatch/watchApi/when-watching-referenced-project-when-there-is-no-config-file-name.js index 8ca375ff5d69d..1a696ff407e8b 100644 --- a/tests/baselines/reference/tscWatch/watchApi/when-watching-referenced-project-when-there-is-no-config-file-name.js +++ b/tests/baselines/reference/tscWatch/watchApi/when-watching-referenced-project-when-there-is-no-config-file-name.js @@ -82,7 +82,7 @@ DirectoryWatcher:: Triggered with /user/username/projects/project/app.js :: Watc Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/project/app.js :: WatchInfo: /user/username/projects/project 0 undefined Failed Lookup Locations [HH:MM:SS AM] Found 0 errors. Watching for file changes. -FileWatcher:: Added:: WatchInfo: /user/username/projects/project/lib/tsconfig.json 2000 undefined Config file of referened project +FileWatcher:: Added:: WatchInfo: /user/username/projects/project/lib/tsconfig.json 2000 undefined Config file of referenced project //// [/home/src/tslibs/TS/Lib/lib.es2025.full.d.ts] *Lib* @@ -150,9 +150,9 @@ Input:: Output:: -FileWatcher:: Triggered with /user/username/projects/project/lib/tsconfig.json 1:: WatchInfo: /user/username/projects/project/lib/tsconfig.json 2000 undefined Config file of referened project +FileWatcher:: Triggered with /user/username/projects/project/lib/tsconfig.json 1:: WatchInfo: /user/username/projects/project/lib/tsconfig.json 2000 undefined Config file of referenced project Scheduling update -Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/project/lib/tsconfig.json 1:: WatchInfo: /user/username/projects/project/lib/tsconfig.json 2000 undefined Config file of referened project +Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/project/lib/tsconfig.json 1:: WatchInfo: /user/username/projects/project/lib/tsconfig.json 2000 undefined Config file of referenced project Timeout callback:: count: 1 diff --git a/tests/baselines/reference/tscWatch/watchApi/when-watching-referenced-project-with-extends-when-there-is-no-config-file-name.js b/tests/baselines/reference/tscWatch/watchApi/when-watching-referenced-project-with-extends-when-there-is-no-config-file-name.js index 0f52461fbd6f7..dbaf3c984ba52 100644 --- a/tests/baselines/reference/tscWatch/watchApi/when-watching-referenced-project-with-extends-when-there-is-no-config-file-name.js +++ b/tests/baselines/reference/tscWatch/watchApi/when-watching-referenced-project-with-extends-when-there-is-no-config-file-name.js @@ -79,7 +79,7 @@ DirectoryWatcher:: Triggered with /user/username/projects/project/app.js :: Watc Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/project/app.js :: WatchInfo: /user/username/projects/project 0 undefined Failed Lookup Locations [HH:MM:SS AM] Found 0 errors. Watching for file changes. -FileWatcher:: Added:: WatchInfo: /user/username/projects/project/lib/tsconfig.json 2000 undefined Config file of referened project +FileWatcher:: Added:: WatchInfo: /user/username/projects/project/lib/tsconfig.json 2000 undefined Config file of referenced project FileWatcher:: Added:: WatchInfo: /user/username/projects/project/lib/tsconfig.base.json 2000 undefined Extended config file of referenced project @@ -151,9 +151,9 @@ Input:: Output:: -FileWatcher:: Triggered with /user/username/projects/project/lib/tsconfig.json 1:: WatchInfo: /user/username/projects/project/lib/tsconfig.json 2000 undefined Config file of referened project +FileWatcher:: Triggered with /user/username/projects/project/lib/tsconfig.json 1:: WatchInfo: /user/username/projects/project/lib/tsconfig.json 2000 undefined Config file of referenced project Scheduling update -Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/project/lib/tsconfig.json 1:: WatchInfo: /user/username/projects/project/lib/tsconfig.json 2000 undefined Config file of referened project +Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/project/lib/tsconfig.json 1:: WatchInfo: /user/username/projects/project/lib/tsconfig.json 2000 undefined Config file of referenced project Timeout callback:: count: 1 diff --git a/tests/baselines/reference/tsserver/auxiliaryProject/file-is-added-later-through-finding-definition.js b/tests/baselines/reference/tsserver/auxiliaryProject/file-is-added-later-through-finding-definition.js index e89f55d758313..7c92aa8922e57 100644 --- a/tests/baselines/reference/tsserver/auxiliaryProject/file-is-added-later-through-finding-definition.js +++ b/tests/baselines/reference/tsserver/auxiliaryProject/file-is-added-later-through-finding-definition.js @@ -32,7 +32,7 @@ export class Yargs { positional() { } } //// [/user/users/projects/myproject/node_modules/yargs/index.js] -// Specifically didnt have ./callback import to ensure that resolving module sepcifier adds the file to project at later stage +// Specifically didn't have ./callback import to ensure that resolving module specifier adds the file to project at later stage export function command(cmd, cb) { cb(Yargs) } @@ -197,7 +197,7 @@ Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /user/users/projects/m Info seq [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/auxiliaryProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms Info seq [hh:mm:ss:mss] Project '/dev/null/auxiliaryProject1*' (Auxiliary) Info seq [hh:mm:ss:mss] Files (2) - /user/users/projects/myproject/node_modules/yargs/index.js Text-1 "// Specifically didnt have ./callback import to ensure that resolving module sepcifier adds the file to project at later stage\nexport function command(cmd, cb) { cb(Yargs) }\n" + /user/users/projects/myproject/node_modules/yargs/index.js Text-1 "// Specifically didn't have ./callback import to ensure that resolving module specifier adds the file to project at later stage\nexport function command(cmd, cb) { cb(Yargs) }\n" /user/users/projects/myproject/index.ts SVC-1-0 "import { command } from \"yargs\";\ncommand(\"foo\", yargs => {\n yargs.positional();\n});\n" @@ -211,7 +211,7 @@ Info seq [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/auxiliar Info seq [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/auxiliaryProject1* projectStateVersion: 2 projectProgramVersion: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms Info seq [hh:mm:ss:mss] Project '/dev/null/auxiliaryProject1*' (Auxiliary) Info seq [hh:mm:ss:mss] Files (3) - /user/users/projects/myproject/node_modules/yargs/index.js Text-1 "// Specifically didnt have ./callback import to ensure that resolving module sepcifier adds the file to project at later stage\nexport function command(cmd, cb) { cb(Yargs) }\n" + /user/users/projects/myproject/node_modules/yargs/index.js Text-1 "// Specifically didn't have ./callback import to ensure that resolving module specifier adds the file to project at later stage\nexport function command(cmd, cb) { cb(Yargs) }\n" /user/users/projects/myproject/index.ts SVC-1-0 "import { command } from \"yargs\";\ncommand(\"foo\", yargs => {\n yargs.positional();\n});\n" /user/users/projects/myproject/node_modules/yargs/callback.js Text-1 "export class Yargs { positional() { } }\n" diff --git a/tests/baselines/reference/tsserver/auxiliaryProject/resolution-is-reused-from-different-folder.js b/tests/baselines/reference/tsserver/auxiliaryProject/resolution-is-reused-from-different-folder.js index dfc7418529922..9b89317ec7f54 100644 --- a/tests/baselines/reference/tsserver/auxiliaryProject/resolution-is-reused-from-different-folder.js +++ b/tests/baselines/reference/tsserver/auxiliaryProject/resolution-is-reused-from-different-folder.js @@ -32,7 +32,7 @@ export class Yargs { positional() { } } //// [/user/users/projects/myproject/node_modules/yargs/index.js] -// Specifically didnt have ./callback import to ensure that resolving module sepcifier adds the file to project at later stage +// Specifically didn't have ./callback import to ensure that resolving module specifier adds the file to project at later stage export function command(cmd, cb) { cb(Yargs) } @@ -245,7 +245,7 @@ Info seq [hh:mm:ss:mss] Project '/dev/null/auxiliaryProject1*' (Auxiliary) Info seq [hh:mm:ss:mss] Files (4) /user/users/projects/myproject/node_modules/yargs/callback.js Text-1 "export class Yargs { positional() { } }\n" /user/users/projects/myproject/folder/random.ts Text-1 "import { Yargs } from \"yargs/callback\";\n" - /user/users/projects/myproject/node_modules/yargs/index.js Text-1 "// Specifically didnt have ./callback import to ensure that resolving module sepcifier adds the file to project at later stage\nexport function command(cmd, cb) { cb(Yargs) }\n" + /user/users/projects/myproject/node_modules/yargs/index.js Text-1 "// Specifically didn't have ./callback import to ensure that resolving module specifier adds the file to project at later stage\nexport function command(cmd, cb) { cb(Yargs) }\n" /user/users/projects/myproject/some/index.ts SVC-1-0 "import { random } from \"../folder/random\";\nimport { command } from \"yargs\";\ncommand(\"foo\", yargs => {\n yargs.positional();\n});\n" diff --git a/tests/baselines/reference/tsserver/fourslashServer/goToSource17_AddsFileToProject.js b/tests/baselines/reference/tsserver/fourslashServer/goToSource17_AddsFileToProject.js index 4a42890569ead..1be81df0c7cd7 100644 --- a/tests/baselines/reference/tsserver/fourslashServer/goToSource17_AddsFileToProject.js +++ b/tests/baselines/reference/tsserver/fourslashServer/goToSource17_AddsFileToProject.js @@ -51,7 +51,7 @@ export declare function command(command: string, cb: (yargs: Yargs) => void): vo export class Yargs { positional() { } } //// [/home/src/workspaces/project/node_modules/yargs/index.js] -// Specifically didnt have ./callback import to ensure that resolving module sepcifier adds the file to project at later stage +// Specifically didn't have ./callback import to ensure that resolving module specifier adds the file to project at later stage export function command(cmd, cb) { cb(Yargs) } //// [/home/src/workspaces/project/node_modules/yargs/package.json] @@ -348,7 +348,7 @@ Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /home/src/workspaces/p Info seq [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/auxiliaryProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms Info seq [hh:mm:ss:mss] Project '/dev/null/auxiliaryProject1*' (Auxiliary) Info seq [hh:mm:ss:mss] Files (2) - /home/src/workspaces/project/node_modules/yargs/index.js Text-1 "// Specifically didnt have ./callback import to ensure that resolving module sepcifier adds the file to project at later stage\nexport function command(cmd, cb) { cb(Yargs) }" + /home/src/workspaces/project/node_modules/yargs/index.js Text-1 "// Specifically didn't have ./callback import to ensure that resolving module specifier adds the file to project at later stage\nexport function command(cmd, cb) { cb(Yargs) }" /home/src/workspaces/project/index.ts SVC-1-0 "import { command } from \"yargs\";\ncommand(\"foo\", yargs => {\n yargs.positional();\n});" @@ -363,7 +363,7 @@ Info seq [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/auxiliar Info seq [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/auxiliaryProject1* projectStateVersion: 2 projectProgramVersion: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms Info seq [hh:mm:ss:mss] Project '/dev/null/auxiliaryProject1*' (Auxiliary) Info seq [hh:mm:ss:mss] Files (3) - /home/src/workspaces/project/node_modules/yargs/index.js Text-1 "// Specifically didnt have ./callback import to ensure that resolving module sepcifier adds the file to project at later stage\nexport function command(cmd, cb) { cb(Yargs) }" + /home/src/workspaces/project/node_modules/yargs/index.js Text-1 "// Specifically didn't have ./callback import to ensure that resolving module specifier adds the file to project at later stage\nexport function command(cmd, cb) { cb(Yargs) }" /home/src/workspaces/project/index.ts SVC-1-0 "import { command } from \"yargs\";\ncommand(\"foo\", yargs => {\n yargs.positional();\n});" /home/src/workspaces/project/node_modules/yargs/callback.js Text-1 "export class Yargs { positional() { } }" diff --git a/tests/baselines/reference/tsserver/fourslashServer/goToSource18_reusedFromDifferentFolder.js b/tests/baselines/reference/tsserver/fourslashServer/goToSource18_reusedFromDifferentFolder.js index 055345fc7e47c..06bce00bb19f9 100644 --- a/tests/baselines/reference/tsserver/fourslashServer/goToSource18_reusedFromDifferentFolder.js +++ b/tests/baselines/reference/tsserver/fourslashServer/goToSource18_reusedFromDifferentFolder.js @@ -48,7 +48,7 @@ export declare function command(command: string, cb: (yargs: Yargs) => void): vo export class Yargs { positional() { } } //// [/home/src/workspaces/project/node_modules/yargs/index.js] -// Specifically didnt have ./callback import to ensure that resolving module sepcifier adds the file to project at later stage +// Specifically didn't have ./callback import to ensure that resolving module specifier adds the file to project at later stage export function command(cmd, cb) { cb(Yargs) } //// [/home/src/workspaces/project/node_modules/yargs/package.json] @@ -396,7 +396,7 @@ Info seq [hh:mm:ss:mss] Project '/dev/null/auxiliaryProject1*' (Auxiliary) Info seq [hh:mm:ss:mss] Files (4) /home/src/workspaces/project/node_modules/yargs/callback.js Text-1 "export class Yargs { positional() { } }" /home/src/workspaces/project/folder/random.ts Text-1 "import { Yargs } from \"yargs/callback\";" - /home/src/workspaces/project/node_modules/yargs/index.js Text-1 "// Specifically didnt have ./callback import to ensure that resolving module sepcifier adds the file to project at later stage\nexport function command(cmd, cb) { cb(Yargs) }" + /home/src/workspaces/project/node_modules/yargs/index.js Text-1 "// Specifically didn't have ./callback import to ensure that resolving module specifier adds the file to project at later stage\nexport function command(cmd, cb) { cb(Yargs) }" /home/src/workspaces/project/some/index.ts SVC-1-0 "import { random } from \"../folder/random\";\nimport { command } from \"yargs\";\ncommand(\"foo\", yargs => {\n yargs.positional();\n});" diff --git a/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_multiplePastesConsistentlyLargerInSize.js b/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_multiplePastesConsistentlyLargerInSize.js index 389d1a431474e..a7eb2961cf250 100644 --- a/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_multiplePastesConsistentlyLargerInSize.js +++ b/tests/baselines/reference/tsserver/fourslashServer/pasteEdits_multiplePastesConsistentlyLargerInSize.js @@ -251,7 +251,7 @@ Info seq [hh:mm:ss:mss] request: "file": "/home/src/workspaces/project/a.ts", "pastedText": [ "const t = 1 + juice + p;", - "function avacado() { return sauce; }", + "function avocado() { return sauce; }", "fig + kiwi", "function k() {\n const cherry = 3 + tomato + cucumber;\n }" ], @@ -307,7 +307,7 @@ Info seq [hh:mm:ss:mss] Files (5) /home/src/tslibs/TS/Lib/lib.es5.d.ts Text-1 lib.es5.d.ts-Text /home/src/tslibs/TS/Lib/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text /home/src/tslibs/TS/Lib/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text - /home/src/workspaces/project/a.ts SVC-1-1 "function foo() {\n const p = 1;\n const t = 1 + juice + p;\n}\nclass bar {\n constructor() {\n function a() {\n function avacado() { return sauce; }\n }\n a();\n function b() {\n function c() {\n const test = fig + kiwi + 3;\n } \n }\n b();\n }\n c() {\n console.log(\"hello again\");\n function k() {\n const cherry = 3 + tomato + cucumber;\n }\n }\n}" + /home/src/workspaces/project/a.ts SVC-1-1 "function foo() {\n const p = 1;\n const t = 1 + juice + p;\n}\nclass bar {\n constructor() {\n function a() {\n function avocado() { return sauce; }\n }\n a();\n function b() {\n function c() {\n const test = fig + kiwi + 3;\n } \n }\n b();\n }\n c() {\n console.log(\"hello again\");\n function k() {\n const cherry = 3 + tomato + cucumber;\n }\n }\n}" /home/src/workspaces/project/b.ts Text-1 "export const juice = 1;\nexport const sauce = 2;\nexport const fig = 3;\nexport const tomato = 4;" Info seq [hh:mm:ss:mss] ----------------------------------------------- @@ -357,7 +357,7 @@ Info seq [hh:mm:ss:mss] response: "line": 8, "offset": 44 }, - "newText": "function avacado() { return sauce; }" + "newText": "function avocado() { return sauce; }" }, { "start": { diff --git a/tests/baselines/reference/typeAliasDoesntMakeModuleInstantiated.js b/tests/baselines/reference/typeAliasDoesntMakeModuleInstantiated.js index 0973792bf2f0a..a84c30d765c8f 100644 --- a/tests/baselines/reference/typeAliasDoesntMakeModuleInstantiated.js +++ b/tests/baselines/reference/typeAliasDoesntMakeModuleInstantiated.js @@ -2,7 +2,7 @@ //// [typeAliasDoesntMakeModuleInstantiated.ts] declare namespace m { - // type alias declaration here shouldnt make the module declaration instantiated + // type alias declaration here shouldn't make the module declaration instantiated type Selector = string| string[] |Function; export interface IStatic { diff --git a/tests/baselines/reference/typeAliasDoesntMakeModuleInstantiated.symbols b/tests/baselines/reference/typeAliasDoesntMakeModuleInstantiated.symbols index a0017f14d6e25..0edee6705f20e 100644 --- a/tests/baselines/reference/typeAliasDoesntMakeModuleInstantiated.symbols +++ b/tests/baselines/reference/typeAliasDoesntMakeModuleInstantiated.symbols @@ -4,7 +4,7 @@ declare namespace m { >m : Symbol(m, Decl(typeAliasDoesntMakeModuleInstantiated.ts, 0, 0), Decl(typeAliasDoesntMakeModuleInstantiated.ts, 9, 11)) - // type alias declaration here shouldnt make the module declaration instantiated + // type alias declaration here shouldn't make the module declaration instantiated type Selector = string| string[] |Function; >Selector : Symbol(Selector, Decl(typeAliasDoesntMakeModuleInstantiated.ts, 0, 21)) >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --)) diff --git a/tests/baselines/reference/typeAliasDoesntMakeModuleInstantiated.types b/tests/baselines/reference/typeAliasDoesntMakeModuleInstantiated.types index 4bd9a796df44d..9aa4e5fe0a07b 100644 --- a/tests/baselines/reference/typeAliasDoesntMakeModuleInstantiated.types +++ b/tests/baselines/reference/typeAliasDoesntMakeModuleInstantiated.types @@ -2,7 +2,7 @@ === typeAliasDoesntMakeModuleInstantiated.ts === declare namespace m { - // type alias declaration here shouldnt make the module declaration instantiated + // type alias declaration here shouldn't make the module declaration instantiated type Selector = string| string[] |Function; >Selector : Selector > : ^^^^^^^^ diff --git a/tests/baselines/reference/typeFromPropertyAssignment29.errors.txt b/tests/baselines/reference/typeFromPropertyAssignment29.errors.txt index e0e11b7327889..3fcceb8a897fe 100644 --- a/tests/baselines/reference/typeFromPropertyAssignment29.errors.txt +++ b/tests/baselines/reference/typeFromPropertyAssignment29.errors.txt @@ -86,7 +86,7 @@ typeFromPropertyAssignment29.ts(84,42): error TS2339: Property 'm' does not exis ~ !!! error TS2339: Property 'm' does not exist on type '(n: number) => string'. - // Should not work in typescript -- classes already have statics + // Should not work in typescript -- classes already have statistics class ExpandoClass { n = 1001; } diff --git a/tests/baselines/reference/typeFromPropertyAssignment29.js b/tests/baselines/reference/typeFromPropertyAssignment29.js index 4af84327ea730..a08fd4df05160 100644 --- a/tests/baselines/reference/typeFromPropertyAssignment29.js +++ b/tests/baselines/reference/typeFromPropertyAssignment29.js @@ -66,7 +66,7 @@ ExpandoExpr2.m = function(n: number) { } var n = ExpandoExpr2.prop + ExpandoExpr2.m(12) + ExpandoExpr2(101).length -// Should not work in typescript -- classes already have statics +// Should not work in typescript -- classes already have statistics class ExpandoClass { n = 1001; } @@ -149,7 +149,7 @@ ExpandoExpr2.m = function (n) { return n + 1; }; var n = ExpandoExpr2.prop + ExpandoExpr2.m(12) + ExpandoExpr2(101).length; -// Should not work in typescript -- classes already have statics +// Should not work in typescript -- classes already have statistics class ExpandoClass { constructor() { this.n = 1001; diff --git a/tests/baselines/reference/typeFromPropertyAssignment29.symbols b/tests/baselines/reference/typeFromPropertyAssignment29.symbols index 71f5be0c2a073..6aa517e74867a 100644 --- a/tests/baselines/reference/typeFromPropertyAssignment29.symbols +++ b/tests/baselines/reference/typeFromPropertyAssignment29.symbols @@ -214,7 +214,7 @@ var n = ExpandoExpr2.prop + ExpandoExpr2.m(12) + ExpandoExpr2(101).length >ExpandoExpr2 : Symbol(ExpandoExpr2, Decl(typeFromPropertyAssignment29.ts, 56, 3), Decl(typeFromPropertyAssignment29.ts, 58, 1), Decl(typeFromPropertyAssignment29.ts, 59, 21)) >length : Symbol(String.length, Decl(lib.es5.d.ts, --, --)) -// Should not work in typescript -- classes already have statics +// Should not work in typescript -- classes already have statistics class ExpandoClass { >ExpandoClass : Symbol(ExpandoClass, Decl(typeFromPropertyAssignment29.ts, 63, 73)) diff --git a/tests/baselines/reference/typeFromPropertyAssignment29.types b/tests/baselines/reference/typeFromPropertyAssignment29.types index 24b9cb40ac25d..40aad3ab07fcb 100644 --- a/tests/baselines/reference/typeFromPropertyAssignment29.types +++ b/tests/baselines/reference/typeFromPropertyAssignment29.types @@ -507,7 +507,7 @@ var n = ExpandoExpr2.prop + ExpandoExpr2.m(12) + ExpandoExpr2(101).length >length : number > : ^^^^^^ -// Should not work in typescript -- classes already have statics +// Should not work in typescript -- classes already have statistics class ExpandoClass { >ExpandoClass : ExpandoClass > : ^^^^^^^^^^^^ diff --git a/tests/baselines/reference/typeFromPropertyAssignment37.symbols b/tests/baselines/reference/typeFromPropertyAssignment37.symbols index 9ede3eaba639f..ec569fda45a19 100644 --- a/tests/baselines/reference/typeFromPropertyAssignment37.symbols +++ b/tests/baselines/reference/typeFromPropertyAssignment37.symbols @@ -9,15 +9,15 @@ const util = require('./mod') function n() { >n : Symbol(n, Decl(use.js, 0, 29)) - util.existy // no error ->util.existy : Symbol(util.existy, Decl(mod.js, 1, 14)) + util.exist // no error +>util.exist : Symbol(util.exist, Decl(mod.js, 1, 14)) >util : Symbol(util, Decl(use.js, 0, 5)) ->existy : Symbol(util.existy, Decl(mod.js, 1, 14)) +>exist : Symbol(util.exist, Decl(mod.js, 1, 14)) } -util.existy // no error ->util.existy : Symbol(util.existy, Decl(mod.js, 1, 14)) +util.exist // no error +>util.exist : Symbol(util.exist, Decl(mod.js, 1, 14)) >util : Symbol(util, Decl(use.js, 0, 5)) ->existy : Symbol(util.existy, Decl(mod.js, 1, 14)) +>exist : Symbol(util.exist, Decl(mod.js, 1, 14)) === mod.js === const util = exports = module.exports = {} @@ -28,9 +28,9 @@ const util = exports = module.exports = {} >exports : Symbol(module.exports, Decl(mod.js, 0, 0)) if (!!false) { - util.existy = function () { } ->util.existy : Symbol(existy, Decl(mod.js, 1, 14)) + util.exist = function () { } +>util.exist : Symbol(exist, Decl(mod.js, 1, 14)) >util : Symbol(util, Decl(mod.js, 0, 5)) ->existy : Symbol(existy, Decl(mod.js, 1, 14)) +>exist : Symbol(exist, Decl(mod.js, 1, 14)) } diff --git a/tests/baselines/reference/typeFromPropertyAssignment37.types b/tests/baselines/reference/typeFromPropertyAssignment37.types index c59efb28e1140..0738f6fc942b9 100644 --- a/tests/baselines/reference/typeFromPropertyAssignment37.types +++ b/tests/baselines/reference/typeFromPropertyAssignment37.types @@ -14,20 +14,20 @@ function n() { >n : () => void > : ^^^^^^^^^^ - util.existy // no error ->util.existy : () => void + util.exist // no error +>util.exist : () => void > : ^^^^^^^^^^ >util : typeof util > : ^^^^^^^^^^^ ->existy : () => void +>exist : () => void > : ^^^^^^^^^^ } -util.existy // no error ->util.existy : () => void +util.exist // no error +>util.exist : () => void > : ^^^^^^^^^^ >util : typeof util > : ^^^^^^^^^^^ ->existy : () => void +>exist : () => void > : ^^^^^^^^^^ === mod.js === @@ -57,14 +57,14 @@ if (!!false) { >false : false > : ^^^^^ - util.existy = function () { } ->util.existy = function () { } : () => void + util.exist = function () { } +>util.exist = function () { } : () => void > : ^^^^^^^^^^ ->util.existy : () => void +>util.exist : () => void > : ^^^^^^^^^^ >util : typeof module.exports > : ^^^^^^^^^^^^^^^^^^^^^ ->existy : () => void +>exist : () => void > : ^^^^^^^^^^ >function () { } : () => void > : ^^^^^^^^^^ diff --git a/tests/baselines/reference/typeOfEnumAndVarRedeclarations.errors.txt b/tests/baselines/reference/typeOfEnumAndVarRedeclarations.errors.txt index 2b3a5240b3608..667a7226506b3 100644 --- a/tests/baselines/reference/typeOfEnumAndVarRedeclarations.errors.txt +++ b/tests/baselines/reference/typeOfEnumAndVarRedeclarations.errors.txt @@ -12,7 +12,7 @@ typeOfEnumAndVarRedeclarations.ts(10,70): error TS2374: Duplicate index signatur b = 1 } var x = E; - var x: { readonly a: E; readonly b: E; readonly [x: number]: string; }; // Shouldnt error + var x: { readonly a: E; readonly b: E; readonly [x: number]: string; }; // Shouldn't error ~ !!! error TS2403: Subsequent variable declarations must have the same type. Variable 'x' must be of type 'typeof E', but here has type '{ readonly [x: number]: string; readonly a: E; readonly b: E; }'. !!! related TS6203 typeOfEnumAndVarRedeclarations.ts:7:5: 'x' was also declared here. diff --git a/tests/baselines/reference/typeOfEnumAndVarRedeclarations.js b/tests/baselines/reference/typeOfEnumAndVarRedeclarations.js index a570d43670f48..dd130e478c14f 100644 --- a/tests/baselines/reference/typeOfEnumAndVarRedeclarations.js +++ b/tests/baselines/reference/typeOfEnumAndVarRedeclarations.js @@ -8,7 +8,7 @@ enum E { b = 1 } var x = E; -var x: { readonly a: E; readonly b: E; readonly [x: number]: string; }; // Shouldnt error +var x: { readonly a: E; readonly b: E; readonly [x: number]: string; }; // Shouldn't error var y = E; var y: { readonly a: E; readonly b: E; readonly [x: number]: string; readonly [x: number]: string } // two errors: the types are not identical and duplicate signatures @@ -22,6 +22,6 @@ var E; E[E["b"] = 1] = "b"; })(E || (E = {})); var x = E; -var x; // Shouldnt error +var x; // Shouldn't error var y = E; var y; // two errors: the types are not identical and duplicate signatures diff --git a/tests/baselines/reference/typeOfEnumAndVarRedeclarations.symbols b/tests/baselines/reference/typeOfEnumAndVarRedeclarations.symbols index de9b49260ef93..790254177ba7a 100644 --- a/tests/baselines/reference/typeOfEnumAndVarRedeclarations.symbols +++ b/tests/baselines/reference/typeOfEnumAndVarRedeclarations.symbols @@ -17,7 +17,7 @@ var x = E; >x : Symbol(x, Decl(typeOfEnumAndVarRedeclarations.ts, 6, 3), Decl(typeOfEnumAndVarRedeclarations.ts, 7, 3)) >E : Symbol(E, Decl(typeOfEnumAndVarRedeclarations.ts, 0, 0), Decl(typeOfEnumAndVarRedeclarations.ts, 2, 1)) -var x: { readonly a: E; readonly b: E; readonly [x: number]: string; }; // Shouldnt error +var x: { readonly a: E; readonly b: E; readonly [x: number]: string; }; // Shouldn't error >x : Symbol(x, Decl(typeOfEnumAndVarRedeclarations.ts, 6, 3), Decl(typeOfEnumAndVarRedeclarations.ts, 7, 3)) >a : Symbol(a, Decl(typeOfEnumAndVarRedeclarations.ts, 7, 8)) >E : Symbol(E, Decl(typeOfEnumAndVarRedeclarations.ts, 0, 0), Decl(typeOfEnumAndVarRedeclarations.ts, 2, 1)) diff --git a/tests/baselines/reference/typeOfEnumAndVarRedeclarations.types b/tests/baselines/reference/typeOfEnumAndVarRedeclarations.types index c38f7e8f112e6..d731b64790aea 100644 --- a/tests/baselines/reference/typeOfEnumAndVarRedeclarations.types +++ b/tests/baselines/reference/typeOfEnumAndVarRedeclarations.types @@ -25,7 +25,7 @@ var x = E; >E : typeof E > : ^^^^^^^^ -var x: { readonly a: E; readonly b: E; readonly [x: number]: string; }; // Shouldnt error +var x: { readonly a: E; readonly b: E; readonly [x: number]: string; }; // Shouldn't error >x : typeof E > : ^^^^^^^^ >a : E diff --git a/tests/baselines/reference/typeParameterConstModifiersReturnsAndYields.symbols b/tests/baselines/reference/typeParameterConstModifiersReturnsAndYields.symbols index 680c3eaf7cf5f..adfbd1a687451 100644 --- a/tests/baselines/reference/typeParameterConstModifiersReturnsAndYields.symbols +++ b/tests/baselines/reference/typeParameterConstModifiersReturnsAndYields.symbols @@ -339,8 +339,8 @@ declare function overloaded3(cb: () => T, cb2: () => U): [T, U]; >T : Symbol(T, Decl(typeParameterConstModifiersReturnsAndYields.ts, 96, 29)) >U : Symbol(U, Decl(typeParameterConstModifiersReturnsAndYields.ts, 96, 37)) -const overloadE = overloaded3(() => 42); ->overloadE : Symbol(overloadE, Decl(typeParameterConstModifiersReturnsAndYields.ts, 97, 5)) +const overload = overloaded3(() => 42); +>overload : Symbol(overload, Decl(typeParameterConstModifiersReturnsAndYields.ts, 97, 5)) >overloaded3 : Symbol(overloaded3, Decl(typeParameterConstModifiersReturnsAndYields.ts, 93, 54), Decl(typeParameterConstModifiersReturnsAndYields.ts, 95, 54)) const overloadF = overloaded3(() => "hi", () => true); diff --git a/tests/baselines/reference/typeParameterConstModifiersReturnsAndYields.types b/tests/baselines/reference/typeParameterConstModifiersReturnsAndYields.types index e5355c2453066..14dcd34743d6d 100644 --- a/tests/baselines/reference/typeParameterConstModifiersReturnsAndYields.types +++ b/tests/baselines/reference/typeParameterConstModifiersReturnsAndYields.types @@ -654,8 +654,8 @@ declare function overloaded3(cb: () => T, cb2: () => U): [T, U]; >cb2 : () => U > : ^^^^^^ -const overloadE = overloaded3(() => 42); ->overloadE : 42 +const overload = overloaded3(() => 42); +>overload : 42 > : ^^ >overloaded3(() => 42) : 42 > : ^^ diff --git a/tests/baselines/reference/typeofOperatorInvalidOperations.errors.txt b/tests/baselines/reference/typeofOperatorInvalidOperations.errors.txt index cac56b960a607..4bd16e9babedf 100644 --- a/tests/baselines/reference/typeofOperatorInvalidOperations.errors.txt +++ b/tests/baselines/reference/typeofOperatorInvalidOperations.errors.txt @@ -6,7 +6,7 @@ typeofOperatorInvalidOperations.ts(7,19): error TS1109: Expression expected. ==== typeofOperatorInvalidOperations.ts (3 errors) ==== // Unary operator typeof - // opreand before typeof + // operand before typeof var ANY = ANY typeof ; //expect error ~~~~~~ !!! error TS1005: ',' expected. diff --git a/tests/baselines/reference/typeofOperatorInvalidOperations.js b/tests/baselines/reference/typeofOperatorInvalidOperations.js index 063b1074c9ea3..649a1a4832852 100644 --- a/tests/baselines/reference/typeofOperatorInvalidOperations.js +++ b/tests/baselines/reference/typeofOperatorInvalidOperations.js @@ -3,7 +3,7 @@ //// [typeofOperatorInvalidOperations.ts] // Unary operator typeof -// opreand before typeof +// operand before typeof var ANY = ANY typeof ; //expect error // miss an operand @@ -12,7 +12,7 @@ var ANY1 = typeof ; //// [typeofOperatorInvalidOperations.js] "use strict"; // Unary operator typeof -// opreand before typeof +// operand before typeof var ANY = ANY; typeof ; //expect error // miss an operand diff --git a/tests/baselines/reference/typeofOperatorInvalidOperations.symbols b/tests/baselines/reference/typeofOperatorInvalidOperations.symbols index fc8d5da3acea1..aac4116413767 100644 --- a/tests/baselines/reference/typeofOperatorInvalidOperations.symbols +++ b/tests/baselines/reference/typeofOperatorInvalidOperations.symbols @@ -3,7 +3,7 @@ === typeofOperatorInvalidOperations.ts === // Unary operator typeof -// opreand before typeof +// operand before typeof var ANY = ANY typeof ; //expect error >ANY : Symbol(ANY, Decl(typeofOperatorInvalidOperations.ts, 3, 3)) >ANY : Symbol(ANY, Decl(typeofOperatorInvalidOperations.ts, 3, 3)) diff --git a/tests/baselines/reference/typeofOperatorInvalidOperations.types b/tests/baselines/reference/typeofOperatorInvalidOperations.types index 13a57d94c935b..e438545285650 100644 --- a/tests/baselines/reference/typeofOperatorInvalidOperations.types +++ b/tests/baselines/reference/typeofOperatorInvalidOperations.types @@ -3,7 +3,7 @@ === typeofOperatorInvalidOperations.ts === // Unary operator typeof -// opreand before typeof +// operand before typeof var ANY = ANY typeof ; //expect error >ANY : any > : ^^^ diff --git a/tests/baselines/reference/undefinedInferentialTyping.errors.txt b/tests/baselines/reference/undefinedInferentialTyping.errors.txt index 8aea7c10e3ba0..487824d4f2ce3 100644 --- a/tests/baselines/reference/undefinedInferentialTyping.errors.txt +++ b/tests/baselines/reference/undefinedInferentialTyping.errors.txt @@ -3,7 +3,7 @@ undefinedInferentialTyping.ts(2,5): error TS2322: Type 'null' is not assignable ==== undefinedInferentialTyping.ts (1 errors) ==== - function f(arr: T[], elemnt: T): T { + function f(arr: T[], element: T): T { return null; ~~~~~~ !!! error TS2322: Type 'null' is not assignable to type 'T'. diff --git a/tests/baselines/reference/undefinedInferentialTyping.js b/tests/baselines/reference/undefinedInferentialTyping.js index 663bf11cb8ca8..af5b2ef0613a3 100644 --- a/tests/baselines/reference/undefinedInferentialTyping.js +++ b/tests/baselines/reference/undefinedInferentialTyping.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/undefinedInferentialTyping.ts] //// //// [undefinedInferentialTyping.ts] -function f(arr: T[], elemnt: T): T { +function f(arr: T[], element: T): T { return null; } @@ -9,7 +9,7 @@ var a = f([], 3); // should be number //// [undefinedInferentialTyping.js] "use strict"; -function f(arr, elemnt) { +function f(arr, element) { return null; } var a = f([], 3); // should be number diff --git a/tests/baselines/reference/undefinedInferentialTyping.symbols b/tests/baselines/reference/undefinedInferentialTyping.symbols index 3d987a60797e9..1a2aee2373037 100644 --- a/tests/baselines/reference/undefinedInferentialTyping.symbols +++ b/tests/baselines/reference/undefinedInferentialTyping.symbols @@ -1,12 +1,12 @@ //// [tests/cases/compiler/undefinedInferentialTyping.ts] //// === undefinedInferentialTyping.ts === -function f(arr: T[], elemnt: T): T { +function f(arr: T[], element: T): T { >f : Symbol(f, Decl(undefinedInferentialTyping.ts, 0, 0)) >T : Symbol(T, Decl(undefinedInferentialTyping.ts, 0, 11)) >arr : Symbol(arr, Decl(undefinedInferentialTyping.ts, 0, 14)) >T : Symbol(T, Decl(undefinedInferentialTyping.ts, 0, 11)) ->elemnt : Symbol(elemnt, Decl(undefinedInferentialTyping.ts, 0, 23)) +>element : Symbol(element, Decl(undefinedInferentialTyping.ts, 0, 23)) >T : Symbol(T, Decl(undefinedInferentialTyping.ts, 0, 11)) >T : Symbol(T, Decl(undefinedInferentialTyping.ts, 0, 11)) diff --git a/tests/baselines/reference/undefinedInferentialTyping.types b/tests/baselines/reference/undefinedInferentialTyping.types index d4677182a6dc7..d3f9a238be3bb 100644 --- a/tests/baselines/reference/undefinedInferentialTyping.types +++ b/tests/baselines/reference/undefinedInferentialTyping.types @@ -1,12 +1,12 @@ //// [tests/cases/compiler/undefinedInferentialTyping.ts] //// === undefinedInferentialTyping.ts === -function f(arr: T[], elemnt: T): T { ->f : (arr: T[], elemnt: T) => T +function f(arr: T[], element: T): T { +>f : (arr: T[], element: T) => T > : ^ ^^ ^^ ^^ ^^ ^^^^^ >arr : T[] > : ^^^ ->elemnt : T +>element : T > : ^ return null; @@ -17,7 +17,7 @@ var a = f([], 3); // should be number > : ^^^^^^ >f([], 3) : 3 > : ^ ->f : (arr: T[], elemnt: T) => T +>f : (arr: T[], element: T) => T > : ^ ^^ ^^ ^^ ^^ ^^^^^ >[] : never[] > : ^^^^^^^ diff --git a/tests/baselines/reference/unionSubtypeIfEveryConstituentTypeIsSubtype.errors.txt b/tests/baselines/reference/unionSubtypeIfEveryConstituentTypeIsSubtype.errors.txt index cc962ed833188..a9e5ccb1fa42e 100644 --- a/tests/baselines/reference/unionSubtypeIfEveryConstituentTypeIsSubtype.errors.txt +++ b/tests/baselines/reference/unionSubtypeIfEveryConstituentTypeIsSubtype.errors.txt @@ -53,7 +53,7 @@ unionSubtypeIfEveryConstituentTypeIsSubtype.ts(129,5): error TS2411: Property 'f interface I3 { [x: string]: string; - foo: string | number; // error numer is not subtype of string + foo: string | number; // error number is not subtype of string ~~~ !!! error TS2411: Property 'foo' of type 'string | number' is not assignable to 'string' index type 'string'. foo2: e | number; // error e and number both not subtype of string diff --git a/tests/baselines/reference/unionSubtypeIfEveryConstituentTypeIsSubtype.js b/tests/baselines/reference/unionSubtypeIfEveryConstituentTypeIsSubtype.js index 59ed2388194c1..68b5b5e868e35 100644 --- a/tests/baselines/reference/unionSubtypeIfEveryConstituentTypeIsSubtype.js +++ b/tests/baselines/reference/unionSubtypeIfEveryConstituentTypeIsSubtype.js @@ -21,7 +21,7 @@ interface I2 { interface I3 { [x: string]: string; - foo: string | number; // error numer is not subtype of string + foo: string | number; // error number is not subtype of string foo2: e | number; // error e and number both not subtype of string } diff --git a/tests/baselines/reference/unionSubtypeIfEveryConstituentTypeIsSubtype.symbols b/tests/baselines/reference/unionSubtypeIfEveryConstituentTypeIsSubtype.symbols index 85dd8133b6a61..4dc132918bd6c 100644 --- a/tests/baselines/reference/unionSubtypeIfEveryConstituentTypeIsSubtype.symbols +++ b/tests/baselines/reference/unionSubtypeIfEveryConstituentTypeIsSubtype.symbols @@ -46,7 +46,7 @@ interface I3 { [x: string]: string; >x : Symbol(x, Decl(unionSubtypeIfEveryConstituentTypeIsSubtype.ts, 19, 5)) - foo: string | number; // error numer is not subtype of string + foo: string | number; // error number is not subtype of string >foo : Symbol(I3.foo, Decl(unionSubtypeIfEveryConstituentTypeIsSubtype.ts, 19, 24)) foo2: e | number; // error e and number both not subtype of string diff --git a/tests/baselines/reference/unionSubtypeIfEveryConstituentTypeIsSubtype.types b/tests/baselines/reference/unionSubtypeIfEveryConstituentTypeIsSubtype.types index a88c65fe41bdd..b02c7030c79f3 100644 --- a/tests/baselines/reference/unionSubtypeIfEveryConstituentTypeIsSubtype.types +++ b/tests/baselines/reference/unionSubtypeIfEveryConstituentTypeIsSubtype.types @@ -48,7 +48,7 @@ interface I3 { >x : string > : ^^^^^^ - foo: string | number; // error numer is not subtype of string + foo: string | number; // error number is not subtype of string >foo : string | number > : ^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/unionTypeMembers.errors.txt b/tests/baselines/reference/unionTypeMembers.errors.txt index 4a94ed8190542..b5fe47346dbdc 100644 --- a/tests/baselines/reference/unionTypeMembers.errors.txt +++ b/tests/baselines/reference/unionTypeMembers.errors.txt @@ -58,7 +58,7 @@ unionTypeMembers.ts(54,3): error TS2339: Property 'methodOnlyInI2' does not exis ~~~~~~~~ !!! error TS2345: Argument of type 'string | number' is not assignable to parameter of type 'never'. !!! error TS2345: Type 'string' is not assignable to type 'never'. - // and the call signatures arent identical + // and the call signatures aren't identical num = x.commonMethodWithTypeParameter(num); num = x.commonMethodWithOwnTypeParameter(num); str = x.commonMethodWithOwnTypeParameter(str); diff --git a/tests/baselines/reference/unionTypeMembers.js b/tests/baselines/reference/unionTypeMembers.js index e7bfd4dba50ad..888bffbb0bd9c 100644 --- a/tests/baselines/reference/unionTypeMembers.js +++ b/tests/baselines/reference/unionTypeMembers.js @@ -45,7 +45,7 @@ strOrNum = x.commonPropertyDifferenType; strOrNum = x.commonMethodDifferentReturnType(str); // string | union x.commonMethodDifferentParameterType; // No error - property exists x.commonMethodDifferentParameterType(strOrNum); // error - no call signatures because the type of this property is ((a: string) => string) | (a: number) => number - // and the call signatures arent identical + // and the call signatures aren't identical num = x.commonMethodWithTypeParameter(num); num = x.commonMethodWithOwnTypeParameter(num); str = x.commonMethodWithOwnTypeParameter(str); @@ -65,7 +65,7 @@ strOrNum = x.commonPropertyDifferenType; strOrNum = x.commonMethodDifferentReturnType(str); // string | union x.commonMethodDifferentParameterType; // No error - property exists x.commonMethodDifferentParameterType(strOrNum); // error - no call signatures because the type of this property is ((a: string) => string) | (a: number) => number -// and the call signatures arent identical +// and the call signatures aren't identical num = x.commonMethodWithTypeParameter(num); num = x.commonMethodWithOwnTypeParameter(num); str = x.commonMethodWithOwnTypeParameter(str); diff --git a/tests/baselines/reference/unionTypeMembers.symbols b/tests/baselines/reference/unionTypeMembers.symbols index 4e90aeb319eaa..2b8df1bc901ca 100644 --- a/tests/baselines/reference/unionTypeMembers.symbols +++ b/tests/baselines/reference/unionTypeMembers.symbols @@ -141,7 +141,7 @@ x.commonMethodDifferentParameterType(strOrNum); // error - no call signatures be >commonMethodDifferentParameterType : Symbol(commonMethodDifferentParameterType, Decl(unionTypeMembers.ts, 2, 31), Decl(unionTypeMembers.ts, 17, 31)) >strOrNum : Symbol(strOrNum, Decl(unionTypeMembers.ts, 35, 11)) - // and the call signatures arent identical + // and the call signatures aren't identical num = x.commonMethodWithTypeParameter(num); >num : Symbol(num, Decl(unionTypeMembers.ts, 34, 11)) >x.commonMethodWithTypeParameter : Symbol(commonMethodWithTypeParameter, Decl(unionTypeMembers.ts, 6, 39), Decl(unionTypeMembers.ts, 21, 39)) diff --git a/tests/baselines/reference/unionTypeMembers.types b/tests/baselines/reference/unionTypeMembers.types index 9523dcac4eadc..c70cef6d13e0d 100644 --- a/tests/baselines/reference/unionTypeMembers.types +++ b/tests/baselines/reference/unionTypeMembers.types @@ -196,7 +196,7 @@ x.commonMethodDifferentParameterType(strOrNum); // error - no call signatures be >strOrNum : string | number > : ^^^^^^^^^^^^^^^ - // and the call signatures arent identical + // and the call signatures aren't identical num = x.commonMethodWithTypeParameter(num); >num = x.commonMethodWithTypeParameter(num) : number > : ^^^^^^ diff --git a/tests/baselines/reference/unknownType2.errors.txt b/tests/baselines/reference/unknownType2.errors.txt index b9494b1949913..7e82d6c69e49f 100644 --- a/tests/baselines/reference/unknownType2.errors.txt +++ b/tests/baselines/reference/unknownType2.errors.txt @@ -56,7 +56,7 @@ unknownType2.ts(216,13): error TS2322: Type '"yes" | "no" | "maybe"' is not assi declare const aString: string; declare const aBoolean: boolean; - declare const aNumber: number; + declare const a number: number; declare const anObject: object; declare const anObjectLiteral: { x: number }; declare const aUnion: { x: number } | { y: string }; @@ -71,7 +71,7 @@ unknownType2.ts(216,13): error TS2322: Type '"yes" | "no" | "maybe"' is not assi let uString: boolean = u; } - if (u === aNumber) { + if (u === a number) { let uNumber: number = u; } diff --git a/tests/baselines/reference/unknownType2.js b/tests/baselines/reference/unknownType2.js index 18f88f65ce128..b0b7a85ac07f2 100644 --- a/tests/baselines/reference/unknownType2.js +++ b/tests/baselines/reference/unknownType2.js @@ -54,7 +54,7 @@ if (u == Object) { declare const aString: string; declare const aBoolean: boolean; -declare const aNumber: number; +declare const a number: number; declare const anObject: object; declare const anObjectLiteral: { x: number }; declare const aUnion: { x: number } | { y: string }; @@ -69,7 +69,7 @@ if (u === aBoolean) { let uString: boolean = u; } -if (u === aNumber) { +if (u === a number) { let uNumber: number = u; } @@ -297,7 +297,7 @@ if (u === aString) { if (u === aBoolean) { let uString = u; } -if (u === aNumber) { +if (u === a number) { let uNumber = u; } if (u === anObject) { diff --git a/tests/baselines/reference/unknownType2.symbols b/tests/baselines/reference/unknownType2.symbols index 6635b996339a6..54be4df2b945d 100644 --- a/tests/baselines/reference/unknownType2.symbols +++ b/tests/baselines/reference/unknownType2.symbols @@ -136,8 +136,8 @@ declare const aString: string; declare const aBoolean: boolean; >aBoolean : Symbol(aBoolean, Decl(unknownType2.ts, 52, 13)) -declare const aNumber: number; ->aNumber : Symbol(aNumber, Decl(unknownType2.ts, 53, 13)) +declare const a number: number; +>a number : Symbol(a number, Decl(unknownType2.ts, 53, 13)) declare const anObject: object; >anObject : Symbol(anObject, Decl(unknownType2.ts, 54, 13)) @@ -177,9 +177,9 @@ if (u === aBoolean) { >u : Symbol(u, Decl(unknownType2.ts, 6, 5)) } -if (u === aNumber) { +if (u === a number) { >u : Symbol(u, Decl(unknownType2.ts, 6, 5)) ->aNumber : Symbol(aNumber, Decl(unknownType2.ts, 53, 13)) +>a number : Symbol(a number, Decl(unknownType2.ts, 53, 13)) let uNumber: number = u; >uNumber : Symbol(uNumber, Decl(unknownType2.ts, 69, 7)) diff --git a/tests/baselines/reference/unknownType2.types b/tests/baselines/reference/unknownType2.types index a749e25e0ba6a..2b727ed029176 100644 --- a/tests/baselines/reference/unknownType2.types +++ b/tests/baselines/reference/unknownType2.types @@ -243,8 +243,8 @@ declare const aBoolean: boolean; >aBoolean : boolean > : ^^^^^^^ -declare const aNumber: number; ->aNumber : number +declare const a number: number; +>a number : number > : ^^^^^^ declare const anObject: object; @@ -307,12 +307,12 @@ if (u === aBoolean) { > : ^^^^^^^ } -if (u === aNumber) { ->u === aNumber : boolean +if (u === a number) { +>u === a number : boolean > : ^^^^^^^ >u : unknown > : ^^^^^^^ ->aNumber : number +>a number : number > : ^^^^^^ let uNumber: number = u; diff --git a/tests/baselines/reference/unusedInvalidTypeArguments.errors.txt b/tests/baselines/reference/unusedInvalidTypeArguments.errors.txt index a3bae0b35433c..f957ceeb6aade 100644 --- a/tests/baselines/reference/unusedInvalidTypeArguments.errors.txt +++ b/tests/baselines/reference/unusedInvalidTypeArguments.errors.txt @@ -39,7 +39,7 @@ foo(); ==== /new.ts (1 errors) ==== - import { Foo } from "unkown"; + import { Foo } from "unknown"; ~~~~~~~~ !!! error TS2307: Cannot find module 'unkown' or its corresponding type declarations. type T = number; diff --git a/tests/baselines/reference/unusedInvalidTypeArguments.js b/tests/baselines/reference/unusedInvalidTypeArguments.js index 86bafca625758..09bb10f6a3aa9 100644 --- a/tests/baselines/reference/unusedInvalidTypeArguments.js +++ b/tests/baselines/reference/unusedInvalidTypeArguments.js @@ -21,7 +21,7 @@ type T = number; foo(); //// [new.ts] -import { Foo } from "unkown"; +import { Foo } from "unknown"; type T = number; new Foo(); @@ -58,7 +58,7 @@ export {}; import { foo } from "unknown"; foo(); //// [new.js] -import { Foo } from "unkown"; +import { Foo } from "unknown"; new Foo(); //// [callAny.js] "use strict"; diff --git a/tests/baselines/reference/unusedInvalidTypeArguments.symbols b/tests/baselines/reference/unusedInvalidTypeArguments.symbols index d0901122875f0..d9705d7c536d9 100644 --- a/tests/baselines/reference/unusedInvalidTypeArguments.symbols +++ b/tests/baselines/reference/unusedInvalidTypeArguments.symbols @@ -48,7 +48,7 @@ foo(); >T : Symbol(T, Decl(call.ts, 0, 30)) === /new.ts === -import { Foo } from "unkown"; +import { Foo } from "unknown"; >Foo : Symbol(Foo, Decl(new.ts, 0, 8)) type T = number; diff --git a/tests/baselines/reference/unusedInvalidTypeArguments.types b/tests/baselines/reference/unusedInvalidTypeArguments.types index 1284e604461e3..abe9605437597 100644 --- a/tests/baselines/reference/unusedInvalidTypeArguments.types +++ b/tests/baselines/reference/unusedInvalidTypeArguments.types @@ -54,7 +54,7 @@ foo(); > : ^^^ === /new.ts === -import { Foo } from "unkown"; +import { Foo } from "unknown"; >Foo : any > : ^^^ diff --git a/tests/baselines/reference/unusedLocalsAndParameters.errors.txt b/tests/baselines/reference/unusedLocalsAndParameters.errors.txt index ed6545a77f36c..0ffb711ffd4e4 100644 --- a/tests/baselines/reference/unusedLocalsAndParameters.errors.txt +++ b/tests/baselines/reference/unusedLocalsAndParameters.errors.txt @@ -28,14 +28,14 @@ unusedLocalsAndParameters.ts(85,1): error TS1109: Expression expected. ==== unusedLocalsAndParameters.ts (25 errors) ==== export { }; - // function declaration paramter + // function declaration parameter function f(a) { ~ !!! error TS6133: 'a' is declared but its value is never read. } f(0); - // function expression paramter + // function expression parameter var fexp = function (a) { ~ !!! error TS6133: 'a' is declared but its value is never read. @@ -43,7 +43,7 @@ unusedLocalsAndParameters.ts(85,1): error TS1109: Expression expected. fexp(0); - // arrow function paramter + // arrow function parameter var farrow = (a) => { ~~~~~~ !!! error TS6133: 'farrow' is declared but its value is never read. @@ -54,12 +54,12 @@ unusedLocalsAndParameters.ts(85,1): error TS1109: Expression expected. class C { ~ !!! error TS6196: 'C' is declared but never used. - // Method declaration paramter + // Method declaration parameter method(a) { ~ !!! error TS6133: 'a' is declared but its value is never read. } - // Accessor declaration paramter + // Accessor declaration parameter set x(v: number) { ~ !!! error TS6133: 'v' is declared but its value is never read. @@ -69,12 +69,12 @@ unusedLocalsAndParameters.ts(85,1): error TS1109: Expression expected. var E = class { ~ !!! error TS6133: 'E' is declared but its value is never read. - // Method declaration paramter + // Method declaration parameter method(a) { ~ !!! error TS6133: 'a' is declared but its value is never read. } - // Accessor declaration paramter + // Accessor declaration parameter set x(v: number) { ~ !!! error TS6133: 'v' is declared but its value is never read. @@ -82,12 +82,12 @@ unusedLocalsAndParameters.ts(85,1): error TS1109: Expression expected. } var o = { - // Object literal method declaration paramter + // Object literal method declaration parameter method(a) { ~ !!! error TS6133: 'a' is declared but its value is never read. }, - // Accessor declaration paramter + // Accessor declaration parameter set x(v: number) { ~ !!! error TS6133: 'v' is declared but its value is never read. @@ -96,19 +96,19 @@ unusedLocalsAndParameters.ts(85,1): error TS1109: Expression expected. o; - // in a for..in statment + // in a for..in statement for (let i in o) { ~ !!! error TS6133: 'i' is declared but its value is never read. } - // in a for..of statment + // in a for..of statement for (let i of [1, 2, 3]) { ~ !!! error TS6133: 'i' is declared but its value is never read. } - // in a for. statment + // in a for. statement for (let i = 0, n; i < 10; i++) { ~ !!! error TS6133: 'n' is declared but its value is never read. diff --git a/tests/baselines/reference/unusedLocalsAndParameters.js b/tests/baselines/reference/unusedLocalsAndParameters.js index 28438ba1b5c01..f5ad84f9643f1 100644 --- a/tests/baselines/reference/unusedLocalsAndParameters.js +++ b/tests/baselines/reference/unusedLocalsAndParameters.js @@ -3,59 +3,59 @@ //// [unusedLocalsAndParameters.ts] export { }; -// function declaration paramter +// function declaration parameter function f(a) { } f(0); -// function expression paramter +// function expression parameter var fexp = function (a) { }; fexp(0); -// arrow function paramter +// arrow function parameter var farrow = (a) => { }; class C { - // Method declaration paramter + // Method declaration parameter method(a) { } - // Accessor declaration paramter + // Accessor declaration parameter set x(v: number) { } } var E = class { - // Method declaration paramter + // Method declaration parameter method(a) { } - // Accessor declaration paramter + // Accessor declaration parameter set x(v: number) { } } var o = { - // Object literal method declaration paramter + // Object literal method declaration parameter method(a) { }, - // Accessor declaration paramter + // Accessor declaration parameter set x(v: number) { } }; o; -// in a for..in statment +// in a for..in statement for (let i in o) { } -// in a for..of statment +// in a for..of statement for (let i of [1, 2, 3]) { } -// in a for. statment +// in a for. statement for (let i = 0, n; i < 10; i++) { } @@ -89,49 +89,49 @@ for (let x: y) { //// [unusedLocalsAndParameters.js] -// function declaration paramter +// function declaration parameter function f(a) { } f(0); -// function expression paramter +// function expression parameter var fexp = function (a) { }; fexp(0); -// arrow function paramter +// arrow function parameter var farrow = (a) => { }; class C { - // Method declaration paramter + // Method declaration parameter method(a) { } - // Accessor declaration paramter + // Accessor declaration parameter set x(v) { } } var E = class { - // Method declaration paramter + // Method declaration parameter method(a) { } - // Accessor declaration paramter + // Accessor declaration parameter set x(v) { } }; var o = { - // Object literal method declaration paramter + // Object literal method declaration parameter method(a) { }, - // Accessor declaration paramter + // Accessor declaration parameter set x(v) { } }; o; -// in a for..in statment +// in a for..in statement for (let i in o) { } -// in a for..of statment +// in a for..of statement for (let i of [1, 2, 3]) { } -// in a for. statment +// in a for. statement for (let i = 0, n; i < 10; i++) { } // in a block diff --git a/tests/baselines/reference/unusedLocalsAndParameters.symbols b/tests/baselines/reference/unusedLocalsAndParameters.symbols index f1a978a3e6da3..31be510d6c7db 100644 --- a/tests/baselines/reference/unusedLocalsAndParameters.symbols +++ b/tests/baselines/reference/unusedLocalsAndParameters.symbols @@ -3,7 +3,7 @@ === unusedLocalsAndParameters.ts === export { }; -// function declaration paramter +// function declaration parameter function f(a) { >f : Symbol(f, Decl(unusedLocalsAndParameters.ts, 0, 11)) >a : Symbol(a, Decl(unusedLocalsAndParameters.ts, 3, 11)) @@ -11,7 +11,7 @@ function f(a) { f(0); >f : Symbol(f, Decl(unusedLocalsAndParameters.ts, 0, 11)) -// function expression paramter +// function expression parameter var fexp = function (a) { >fexp : Symbol(fexp, Decl(unusedLocalsAndParameters.ts, 8, 3)) >a : Symbol(a, Decl(unusedLocalsAndParameters.ts, 8, 21)) @@ -21,7 +21,7 @@ var fexp = function (a) { fexp(0); >fexp : Symbol(fexp, Decl(unusedLocalsAndParameters.ts, 8, 3)) -// arrow function paramter +// arrow function parameter var farrow = (a) => { >farrow : Symbol(farrow, Decl(unusedLocalsAndParameters.ts, 14, 3)) >a : Symbol(a, Decl(unusedLocalsAndParameters.ts, 14, 14)) @@ -31,12 +31,12 @@ var farrow = (a) => { class C { >C : Symbol(C, Decl(unusedLocalsAndParameters.ts, 15, 2)) - // Method declaration paramter + // Method declaration parameter method(a) { >method : Symbol(C.method, Decl(unusedLocalsAndParameters.ts, 17, 9)) >a : Symbol(a, Decl(unusedLocalsAndParameters.ts, 19, 11)) } - // Accessor declaration paramter + // Accessor declaration parameter set x(v: number) { >x : Symbol(C.x, Decl(unusedLocalsAndParameters.ts, 20, 5)) >v : Symbol(v, Decl(unusedLocalsAndParameters.ts, 22, 10)) @@ -46,12 +46,12 @@ class C { var E = class { >E : Symbol(E, Decl(unusedLocalsAndParameters.ts, 26, 3)) - // Method declaration paramter + // Method declaration parameter method(a) { >method : Symbol(E.method, Decl(unusedLocalsAndParameters.ts, 26, 15)) >a : Symbol(a, Decl(unusedLocalsAndParameters.ts, 28, 11)) } - // Accessor declaration paramter + // Accessor declaration parameter set x(v: number) { >x : Symbol(E.x, Decl(unusedLocalsAndParameters.ts, 29, 5)) >v : Symbol(v, Decl(unusedLocalsAndParameters.ts, 31, 10)) @@ -61,13 +61,13 @@ var E = class { var o = { >o : Symbol(o, Decl(unusedLocalsAndParameters.ts, 35, 3)) - // Object literal method declaration paramter + // Object literal method declaration parameter method(a) { >method : Symbol(method, Decl(unusedLocalsAndParameters.ts, 35, 9)) >a : Symbol(a, Decl(unusedLocalsAndParameters.ts, 37, 11)) }, - // Accessor declaration paramter + // Accessor declaration parameter set x(v: number) { >x : Symbol(x, Decl(unusedLocalsAndParameters.ts, 38, 6)) >v : Symbol(v, Decl(unusedLocalsAndParameters.ts, 40, 10)) @@ -77,18 +77,18 @@ var o = { o; >o : Symbol(o, Decl(unusedLocalsAndParameters.ts, 35, 3)) -// in a for..in statment +// in a for..in statement for (let i in o) { >i : Symbol(i, Decl(unusedLocalsAndParameters.ts, 47, 8)) >o : Symbol(o, Decl(unusedLocalsAndParameters.ts, 35, 3)) } -// in a for..of statment +// in a for..of statement for (let i of [1, 2, 3]) { >i : Symbol(i, Decl(unusedLocalsAndParameters.ts, 51, 8)) } -// in a for. statment +// in a for. statement for (let i = 0, n; i < 10; i++) { >i : Symbol(i, Decl(unusedLocalsAndParameters.ts, 55, 8)) >n : Symbol(n, Decl(unusedLocalsAndParameters.ts, 55, 15)) diff --git a/tests/baselines/reference/unusedLocalsAndParameters.types b/tests/baselines/reference/unusedLocalsAndParameters.types index de02457127049..591a54318e947 100644 --- a/tests/baselines/reference/unusedLocalsAndParameters.types +++ b/tests/baselines/reference/unusedLocalsAndParameters.types @@ -3,7 +3,7 @@ === unusedLocalsAndParameters.ts === export { }; -// function declaration paramter +// function declaration parameter function f(a) { >f : (a: any) => void > : ^ ^^^^^^^^^^^^^^ @@ -18,7 +18,7 @@ f(0); >0 : 0 > : ^ -// function expression paramter +// function expression parameter var fexp = function (a) { >fexp : (a: any) => void > : ^ ^^^^^^^^^^^^^^ @@ -37,7 +37,7 @@ fexp(0); >0 : 0 > : ^ -// arrow function paramter +// arrow function parameter var farrow = (a) => { >farrow : (a: any) => void > : ^ ^^^^^^^^^^^^^^ @@ -52,14 +52,14 @@ class C { >C : C > : ^ - // Method declaration paramter + // Method declaration parameter method(a) { >method : (a: any) => void > : ^ ^^^^^^^^^^^^^^ >a : any > : ^^^ } - // Accessor declaration paramter + // Accessor declaration parameter set x(v: number) { >x : number > : ^^^^^^ @@ -71,17 +71,17 @@ class C { var E = class { >E : typeof E > : ^^^^^^^^ ->class { // Method declaration paramter method(a) { } // Accessor declaration paramter set x(v: number) { }} : typeof E +>class { // Method declaration parameter method(a) { } // Accessor declaration parameter set x(v: number) { }} : typeof E > : ^^^^^^^^ - // Method declaration paramter + // Method declaration parameter method(a) { >method : (a: any) => void > : ^ ^^^^^^^^^^^^^^ >a : any > : ^^^ } - // Accessor declaration paramter + // Accessor declaration parameter set x(v: number) { >x : number > : ^^^^^^ @@ -93,10 +93,10 @@ var E = class { var o = { >o : { method(a: any): void; x: number; } > : ^^^^^^^^^ ^^^^^^^^^^^^^^^^^ ^^^ ->{ // Object literal method declaration paramter method(a) { }, // Accessor declaration paramter set x(v: number) { }} : { method(a: any): void; x: number; } +>{ // Object literal method declaration parameter method(a) { }, // Accessor declaration parameter set x(v: number) { }} : { method(a: any): void; x: number; } > : ^^^^^^^^^ ^^^^^^^^^^^^^^^^^ ^^^ - // Object literal method declaration paramter + // Object literal method declaration parameter method(a) { >method : (a: any) => void > : ^ ^^^^^^^^^^^^^^ @@ -104,7 +104,7 @@ var o = { > : ^^^ }, - // Accessor declaration paramter + // Accessor declaration parameter set x(v: number) { >x : number > : ^^^^^^ @@ -117,7 +117,7 @@ o; >o : { method(a: any): void; x: number; } > : ^^^^^^^^^ ^^^^^^^^^^^^^^^^^ ^^^ -// in a for..in statment +// in a for..in statement for (let i in o) { >i : string > : ^^^^^^ @@ -125,7 +125,7 @@ for (let i in o) { > : ^^^^^^^^^ ^^^^^^^^^^^^^^^^^ ^^^ } -// in a for..of statment +// in a for..of statement for (let i of [1, 2, 3]) { >i : number > : ^^^^^^ @@ -139,7 +139,7 @@ for (let i of [1, 2, 3]) { > : ^ } -// in a for. statment +// in a for. statement for (let i = 0, n; i < 10; i++) { >i : number > : ^^^^^^ diff --git a/tests/baselines/reference/unusedLocalsAndParametersDeferred.js b/tests/baselines/reference/unusedLocalsAndParametersDeferred.js index 2a99e4b0f5522..a46832c40c1d2 100644 --- a/tests/baselines/reference/unusedLocalsAndParametersDeferred.js +++ b/tests/baselines/reference/unusedLocalsAndParametersDeferred.js @@ -3,29 +3,29 @@ //// [unusedLocalsAndParametersDeferred.ts] export { }; -function defered(a: () => T): T { +function deferred(a: () => T): T { return a(); } -// function declaration paramter +// function declaration parameter function f(a) { - defered(() => { + deferred(() => { a; }); } f(0); -// function expression paramter +// function expression parameter var fexp = function (a) { - defered(() => { + deferred(() => { a; }); }; fexp(1); -// arrow function paramter +// arrow function parameter var farrow = (a) => { - defered(() => { + deferred(() => { a; }); }; @@ -34,20 +34,20 @@ farrow(2); let prop1; class C { - // Method declaration paramter + // Method declaration parameter method(a) { - defered(() => { + deferred(() => { a; }); } - // Accessor declaration paramter + // Accessor declaration parameter set x(v: number) { - defered(() => { + deferred(() => { v; }); } - // in a property initalizer - p = defered(() => { + // in a property initializer + p = deferred(() => { prop1; }); } @@ -57,20 +57,20 @@ new C(); let prop2; var E = class { - // Method declaration paramter + // Method declaration parameter method(a) { - defered(() => { + deferred(() => { a; }); } - // Accessor declaration paramter + // Accessor declaration parameter set x(v: number) { - defered(() => { + deferred(() => { v; }); } - // in a property initalizer - p = defered(() => { + // in a property initializer + p = deferred(() => { prop2; }); } @@ -79,43 +79,43 @@ new E(); var o = { - // Object literal method declaration paramter + // Object literal method declaration parameter method(a) { - defered(() => { + deferred(() => { a; }); }, - // Accessor declaration paramter + // Accessor declaration parameter set x(v: number) { - defered(() => { + deferred(() => { v; }); }, - // in a property initalizer - p: defered(() => { + // in a property initializer + p: deferred(() => { prop1; }) }; o; -// in a for..in statment +// in a for..in statement for (let i in o) { - defered(() => { + deferred(() => { i; }); } -// in a for..of statment +// in a for..of statement for (let i of [1,2,3]) { - defered(() => { + deferred(() => { i; }); } -// in a for. statment +// in a for. statement for (let i = 0; i < 10; i++) { - defered(() => { + deferred(() => { i; }); } @@ -125,7 +125,7 @@ for (let i = 0; i < 10; i++) { const condition = false; if (condition) { const c = 0; - defered(() => { + deferred(() => { c; }); } @@ -133,19 +133,19 @@ if (condition) { // in try/catch/finally try { const a = 0; - defered(() => { + deferred(() => { a; }); } catch (e) { const c = 1; - defered(() => { + deferred(() => { c; }); } finally { const c = 0; - defered(() => { + deferred(() => { c; }); } @@ -154,7 +154,7 @@ finally { // in a namespace namespace N { var x; - defered(() => { + deferred(() => { x; }); } @@ -162,26 +162,26 @@ N; //// [unusedLocalsAndParametersDeferred.js] -function defered(a) { +function deferred(a) { return a(); } -// function declaration paramter +// function declaration parameter function f(a) { - defered(() => { + deferred(() => { a; }); } f(0); -// function expression paramter +// function expression parameter var fexp = function (a) { - defered(() => { + deferred(() => { a; }); }; fexp(1); -// arrow function paramter +// arrow function parameter var farrow = (a) => { - defered(() => { + deferred(() => { a; }); }; @@ -189,20 +189,20 @@ farrow(2); let prop1; class C { constructor() { - // in a property initalizer - this.p = defered(() => { + // in a property initializer + this.p = deferred(() => { prop1; }); } - // Method declaration paramter + // Method declaration parameter method(a) { - defered(() => { + deferred(() => { a; }); } - // Accessor declaration paramter + // Accessor declaration parameter set x(v) { - defered(() => { + deferred(() => { v; }); } @@ -211,59 +211,59 @@ new C(); let prop2; var E = class { constructor() { - // in a property initalizer - this.p = defered(() => { + // in a property initializer + this.p = deferred(() => { prop2; }); } - // Method declaration paramter + // Method declaration parameter method(a) { - defered(() => { + deferred(() => { a; }); } - // Accessor declaration paramter + // Accessor declaration parameter set x(v) { - defered(() => { + deferred(() => { v; }); } }; new E(); var o = { - // Object literal method declaration paramter + // Object literal method declaration parameter method(a) { - defered(() => { + deferred(() => { a; }); }, - // Accessor declaration paramter + // Accessor declaration parameter set x(v) { - defered(() => { + deferred(() => { v; }); }, - // in a property initalizer - p: defered(() => { + // in a property initializer + p: deferred(() => { prop1; }) }; o; -// in a for..in statment +// in a for..in statement for (let i in o) { - defered(() => { + deferred(() => { i; }); } -// in a for..of statment +// in a for..of statement for (let i of [1, 2, 3]) { - defered(() => { + deferred(() => { i; }); } -// in a for. statment +// in a for. statement for (let i = 0; i < 10; i++) { - defered(() => { + deferred(() => { i; }); } @@ -271,26 +271,26 @@ for (let i = 0; i < 10; i++) { const condition = false; if (condition) { const c = 0; - defered(() => { + deferred(() => { c; }); } // in try/catch/finally try { const a = 0; - defered(() => { + deferred(() => { a; }); } catch (e) { const c = 1; - defered(() => { + deferred(() => { c; }); } finally { const c = 0; - defered(() => { + deferred(() => { c; }); } @@ -298,7 +298,7 @@ finally { var N; (function (N) { var x; - defered(() => { + deferred(() => { x; }); })(N || (N = {})); diff --git a/tests/baselines/reference/unusedLocalsAndParametersDeferred.symbols b/tests/baselines/reference/unusedLocalsAndParametersDeferred.symbols index 1a209ad0ad89e..316d46ed22bba 100644 --- a/tests/baselines/reference/unusedLocalsAndParametersDeferred.symbols +++ b/tests/baselines/reference/unusedLocalsAndParametersDeferred.symbols @@ -3,8 +3,8 @@ === unusedLocalsAndParametersDeferred.ts === export { }; -function defered(a: () => T): T { ->defered : Symbol(defered, Decl(unusedLocalsAndParametersDeferred.ts, 0, 11)) +function deferred(a: () => T): T { +>deferred : Symbol(deferred, Decl(unusedLocalsAndParametersDeferred.ts, 0, 11)) >T : Symbol(T, Decl(unusedLocalsAndParametersDeferred.ts, 2, 17)) >a : Symbol(a, Decl(unusedLocalsAndParametersDeferred.ts, 2, 20)) >T : Symbol(T, Decl(unusedLocalsAndParametersDeferred.ts, 2, 17)) @@ -14,13 +14,13 @@ function defered(a: () => T): T { >a : Symbol(a, Decl(unusedLocalsAndParametersDeferred.ts, 2, 20)) } -// function declaration paramter +// function declaration parameter function f(a) { >f : Symbol(f, Decl(unusedLocalsAndParametersDeferred.ts, 4, 1)) >a : Symbol(a, Decl(unusedLocalsAndParametersDeferred.ts, 7, 11)) - defered(() => { ->defered : Symbol(defered, Decl(unusedLocalsAndParametersDeferred.ts, 0, 11)) + deferred(() => { +>deferred : Symbol(deferred, Decl(unusedLocalsAndParametersDeferred.ts, 0, 11)) a; >a : Symbol(a, Decl(unusedLocalsAndParametersDeferred.ts, 7, 11)) @@ -30,13 +30,13 @@ function f(a) { f(0); >f : Symbol(f, Decl(unusedLocalsAndParametersDeferred.ts, 4, 1)) -// function expression paramter +// function expression parameter var fexp = function (a) { >fexp : Symbol(fexp, Decl(unusedLocalsAndParametersDeferred.ts, 15, 3)) >a : Symbol(a, Decl(unusedLocalsAndParametersDeferred.ts, 15, 21)) - defered(() => { ->defered : Symbol(defered, Decl(unusedLocalsAndParametersDeferred.ts, 0, 11)) + deferred(() => { +>deferred : Symbol(deferred, Decl(unusedLocalsAndParametersDeferred.ts, 0, 11)) a; >a : Symbol(a, Decl(unusedLocalsAndParametersDeferred.ts, 15, 21)) @@ -46,13 +46,13 @@ var fexp = function (a) { fexp(1); >fexp : Symbol(fexp, Decl(unusedLocalsAndParametersDeferred.ts, 15, 3)) -// arrow function paramter +// arrow function parameter var farrow = (a) => { >farrow : Symbol(farrow, Decl(unusedLocalsAndParametersDeferred.ts, 23, 3)) >a : Symbol(a, Decl(unusedLocalsAndParametersDeferred.ts, 23, 14)) - defered(() => { ->defered : Symbol(defered, Decl(unusedLocalsAndParametersDeferred.ts, 0, 11)) + deferred(() => { +>deferred : Symbol(deferred, Decl(unusedLocalsAndParametersDeferred.ts, 0, 11)) a; >a : Symbol(a, Decl(unusedLocalsAndParametersDeferred.ts, 23, 14)) @@ -68,36 +68,36 @@ let prop1; class C { >C : Symbol(C, Decl(unusedLocalsAndParametersDeferred.ts, 30, 10)) - // Method declaration paramter + // Method declaration parameter method(a) { >method : Symbol(C.method, Decl(unusedLocalsAndParametersDeferred.ts, 32, 9)) >a : Symbol(a, Decl(unusedLocalsAndParametersDeferred.ts, 34, 11)) - defered(() => { ->defered : Symbol(defered, Decl(unusedLocalsAndParametersDeferred.ts, 0, 11)) + deferred(() => { +>deferred : Symbol(deferred, Decl(unusedLocalsAndParametersDeferred.ts, 0, 11)) a; >a : Symbol(a, Decl(unusedLocalsAndParametersDeferred.ts, 34, 11)) }); } - // Accessor declaration paramter + // Accessor declaration parameter set x(v: number) { >x : Symbol(C.x, Decl(unusedLocalsAndParametersDeferred.ts, 38, 5)) >v : Symbol(v, Decl(unusedLocalsAndParametersDeferred.ts, 40, 10)) - defered(() => { ->defered : Symbol(defered, Decl(unusedLocalsAndParametersDeferred.ts, 0, 11)) + deferred(() => { +>deferred : Symbol(deferred, Decl(unusedLocalsAndParametersDeferred.ts, 0, 11)) v; >v : Symbol(v, Decl(unusedLocalsAndParametersDeferred.ts, 40, 10)) }); } - // in a property initalizer - p = defered(() => { + // in a property initializer + p = deferred(() => { >p : Symbol(C.p, Decl(unusedLocalsAndParametersDeferred.ts, 44, 5)) ->defered : Symbol(defered, Decl(unusedLocalsAndParametersDeferred.ts, 0, 11)) +>deferred : Symbol(deferred, Decl(unusedLocalsAndParametersDeferred.ts, 0, 11)) prop1; >prop1 : Symbol(prop1, Decl(unusedLocalsAndParametersDeferred.ts, 30, 3)) @@ -114,36 +114,36 @@ let prop2; var E = class { >E : Symbol(E, Decl(unusedLocalsAndParametersDeferred.ts, 55, 3)) - // Method declaration paramter + // Method declaration parameter method(a) { >method : Symbol(E.method, Decl(unusedLocalsAndParametersDeferred.ts, 55, 15)) >a : Symbol(a, Decl(unusedLocalsAndParametersDeferred.ts, 57, 11)) - defered(() => { ->defered : Symbol(defered, Decl(unusedLocalsAndParametersDeferred.ts, 0, 11)) + deferred(() => { +>deferred : Symbol(deferred, Decl(unusedLocalsAndParametersDeferred.ts, 0, 11)) a; >a : Symbol(a, Decl(unusedLocalsAndParametersDeferred.ts, 57, 11)) }); } - // Accessor declaration paramter + // Accessor declaration parameter set x(v: number) { >x : Symbol(E.x, Decl(unusedLocalsAndParametersDeferred.ts, 61, 5)) >v : Symbol(v, Decl(unusedLocalsAndParametersDeferred.ts, 63, 10)) - defered(() => { ->defered : Symbol(defered, Decl(unusedLocalsAndParametersDeferred.ts, 0, 11)) + deferred(() => { +>deferred : Symbol(deferred, Decl(unusedLocalsAndParametersDeferred.ts, 0, 11)) v; >v : Symbol(v, Decl(unusedLocalsAndParametersDeferred.ts, 63, 10)) }); } - // in a property initalizer - p = defered(() => { + // in a property initializer + p = deferred(() => { >p : Symbol(E.p, Decl(unusedLocalsAndParametersDeferred.ts, 67, 5)) ->defered : Symbol(defered, Decl(unusedLocalsAndParametersDeferred.ts, 0, 11)) +>deferred : Symbol(deferred, Decl(unusedLocalsAndParametersDeferred.ts, 0, 11)) prop2; >prop2 : Symbol(prop2, Decl(unusedLocalsAndParametersDeferred.ts, 53, 3)) @@ -158,36 +158,36 @@ new E(); var o = { >o : Symbol(o, Decl(unusedLocalsAndParametersDeferred.ts, 77, 3)) - // Object literal method declaration paramter + // Object literal method declaration parameter method(a) { >method : Symbol(method, Decl(unusedLocalsAndParametersDeferred.ts, 77, 9)) >a : Symbol(a, Decl(unusedLocalsAndParametersDeferred.ts, 79, 11)) - defered(() => { ->defered : Symbol(defered, Decl(unusedLocalsAndParametersDeferred.ts, 0, 11)) + deferred(() => { +>deferred : Symbol(deferred, Decl(unusedLocalsAndParametersDeferred.ts, 0, 11)) a; >a : Symbol(a, Decl(unusedLocalsAndParametersDeferred.ts, 79, 11)) }); }, - // Accessor declaration paramter + // Accessor declaration parameter set x(v: number) { >x : Symbol(x, Decl(unusedLocalsAndParametersDeferred.ts, 83, 6)) >v : Symbol(v, Decl(unusedLocalsAndParametersDeferred.ts, 85, 10)) - defered(() => { ->defered : Symbol(defered, Decl(unusedLocalsAndParametersDeferred.ts, 0, 11)) + deferred(() => { +>deferred : Symbol(deferred, Decl(unusedLocalsAndParametersDeferred.ts, 0, 11)) v; >v : Symbol(v, Decl(unusedLocalsAndParametersDeferred.ts, 85, 10)) }); }, - // in a property initalizer - p: defered(() => { + // in a property initializer + p: deferred(() => { >p : Symbol(p, Decl(unusedLocalsAndParametersDeferred.ts, 89, 6)) ->defered : Symbol(defered, Decl(unusedLocalsAndParametersDeferred.ts, 0, 11)) +>deferred : Symbol(deferred, Decl(unusedLocalsAndParametersDeferred.ts, 0, 11)) prop1; >prop1 : Symbol(prop1, Decl(unusedLocalsAndParametersDeferred.ts, 30, 3)) @@ -198,13 +198,13 @@ var o = { o; >o : Symbol(o, Decl(unusedLocalsAndParametersDeferred.ts, 77, 3)) -// in a for..in statment +// in a for..in statement for (let i in o) { >i : Symbol(i, Decl(unusedLocalsAndParametersDeferred.ts, 99, 8)) >o : Symbol(o, Decl(unusedLocalsAndParametersDeferred.ts, 77, 3)) - defered(() => { ->defered : Symbol(defered, Decl(unusedLocalsAndParametersDeferred.ts, 0, 11)) + deferred(() => { +>deferred : Symbol(deferred, Decl(unusedLocalsAndParametersDeferred.ts, 0, 11)) i; >i : Symbol(i, Decl(unusedLocalsAndParametersDeferred.ts, 99, 8)) @@ -212,12 +212,12 @@ for (let i in o) { }); } -// in a for..of statment +// in a for..of statement for (let i of [1,2,3]) { >i : Symbol(i, Decl(unusedLocalsAndParametersDeferred.ts, 106, 8)) - defered(() => { ->defered : Symbol(defered, Decl(unusedLocalsAndParametersDeferred.ts, 0, 11)) + deferred(() => { +>deferred : Symbol(deferred, Decl(unusedLocalsAndParametersDeferred.ts, 0, 11)) i; >i : Symbol(i, Decl(unusedLocalsAndParametersDeferred.ts, 106, 8)) @@ -225,14 +225,14 @@ for (let i of [1,2,3]) { }); } -// in a for. statment +// in a for. statement for (let i = 0; i < 10; i++) { >i : Symbol(i, Decl(unusedLocalsAndParametersDeferred.ts, 113, 8)) >i : Symbol(i, Decl(unusedLocalsAndParametersDeferred.ts, 113, 8)) >i : Symbol(i, Decl(unusedLocalsAndParametersDeferred.ts, 113, 8)) - defered(() => { ->defered : Symbol(defered, Decl(unusedLocalsAndParametersDeferred.ts, 0, 11)) + deferred(() => { +>deferred : Symbol(deferred, Decl(unusedLocalsAndParametersDeferred.ts, 0, 11)) i; >i : Symbol(i, Decl(unusedLocalsAndParametersDeferred.ts, 113, 8)) @@ -251,8 +251,8 @@ if (condition) { const c = 0; >c : Symbol(c, Decl(unusedLocalsAndParametersDeferred.ts, 123, 9)) - defered(() => { ->defered : Symbol(defered, Decl(unusedLocalsAndParametersDeferred.ts, 0, 11)) + deferred(() => { +>deferred : Symbol(deferred, Decl(unusedLocalsAndParametersDeferred.ts, 0, 11)) c; >c : Symbol(c, Decl(unusedLocalsAndParametersDeferred.ts, 123, 9)) @@ -265,8 +265,8 @@ try { const a = 0; >a : Symbol(a, Decl(unusedLocalsAndParametersDeferred.ts, 131, 9)) - defered(() => { ->defered : Symbol(defered, Decl(unusedLocalsAndParametersDeferred.ts, 0, 11)) + deferred(() => { +>deferred : Symbol(deferred, Decl(unusedLocalsAndParametersDeferred.ts, 0, 11)) a; >a : Symbol(a, Decl(unusedLocalsAndParametersDeferred.ts, 131, 9)) @@ -279,8 +279,8 @@ catch (e) { const c = 1; >c : Symbol(c, Decl(unusedLocalsAndParametersDeferred.ts, 137, 9)) - defered(() => { ->defered : Symbol(defered, Decl(unusedLocalsAndParametersDeferred.ts, 0, 11)) + deferred(() => { +>deferred : Symbol(deferred, Decl(unusedLocalsAndParametersDeferred.ts, 0, 11)) c; >c : Symbol(c, Decl(unusedLocalsAndParametersDeferred.ts, 137, 9)) @@ -291,8 +291,8 @@ finally { const c = 0; >c : Symbol(c, Decl(unusedLocalsAndParametersDeferred.ts, 143, 9)) - defered(() => { ->defered : Symbol(defered, Decl(unusedLocalsAndParametersDeferred.ts, 0, 11)) + deferred(() => { +>deferred : Symbol(deferred, Decl(unusedLocalsAndParametersDeferred.ts, 0, 11)) c; >c : Symbol(c, Decl(unusedLocalsAndParametersDeferred.ts, 143, 9)) @@ -308,8 +308,8 @@ namespace N { var x; >x : Symbol(x, Decl(unusedLocalsAndParametersDeferred.ts, 152, 7)) - defered(() => { ->defered : Symbol(defered, Decl(unusedLocalsAndParametersDeferred.ts, 0, 11)) + deferred(() => { +>deferred : Symbol(deferred, Decl(unusedLocalsAndParametersDeferred.ts, 0, 11)) x; >x : Symbol(x, Decl(unusedLocalsAndParametersDeferred.ts, 152, 7)) diff --git a/tests/baselines/reference/unusedLocalsAndParametersDeferred.types b/tests/baselines/reference/unusedLocalsAndParametersDeferred.types index 2be46d39743a3..4b58724a22a02 100644 --- a/tests/baselines/reference/unusedLocalsAndParametersDeferred.types +++ b/tests/baselines/reference/unusedLocalsAndParametersDeferred.types @@ -3,8 +3,8 @@ === unusedLocalsAndParametersDeferred.ts === export { }; -function defered(a: () => T): T { ->defered : (a: () => T) => T +function deferred(a: () => T): T { +>deferred : (a: () => T) => T > : ^ ^^ ^^ ^^^^^ >a : () => T > : ^^^^^^ @@ -16,16 +16,16 @@ function defered(a: () => T): T { > : ^^^^^^ } -// function declaration paramter +// function declaration parameter function f(a) { >f : (a: any) => void > : ^ ^^^^^^^^^^^^^^ >a : any - defered(() => { ->defered(() => { a; }) : void + deferred(() => { +>deferred(() => { a; }) : void > : ^^^^ ->defered : (a: () => T) => T +>deferred : (a: () => T) => T > : ^ ^^ ^^ ^^^^^ >() => { a; } : () => void > : ^^^^^^^^^^ @@ -43,18 +43,18 @@ f(0); >0 : 0 > : ^ -// function expression paramter +// function expression parameter var fexp = function (a) { >fexp : (a: any) => void > : ^ ^^^^^^^^^^^^^^ ->function (a) { defered(() => { a; });} : (a: any) => void +>function (a) { deferred(() => { a; });} : (a: any) => void > : ^ ^^^^^^^^^^^^^^ >a : any - defered(() => { ->defered(() => { a; }) : void + deferred(() => { +>deferred(() => { a; }) : void > : ^^^^ ->defered : (a: () => T) => T +>deferred : (a: () => T) => T > : ^ ^^ ^^ ^^^^^ >() => { a; } : () => void > : ^^^^^^^^^^ @@ -72,18 +72,18 @@ fexp(1); >1 : 1 > : ^ -// arrow function paramter +// arrow function parameter var farrow = (a) => { >farrow : (a: any) => void > : ^ ^^^^^^^^^^^^^^ ->(a) => { defered(() => { a; });} : (a: any) => void +>(a) => { deferred(() => { a; });} : (a: any) => void > : ^ ^^^^^^^^^^^^^^ >a : any - defered(() => { ->defered(() => { a; }) : void + deferred(() => { +>deferred(() => { a; }) : void > : ^^^^ ->defered : (a: () => T) => T +>deferred : (a: () => T) => T > : ^ ^^ ^^ ^^^^^ >() => { a; } : () => void > : ^^^^^^^^^^ @@ -108,16 +108,16 @@ class C { >C : C > : ^ - // Method declaration paramter + // Method declaration parameter method(a) { >method : (a: any) => void > : ^ ^^^^^^^^^^^^^^ >a : any - defered(() => { ->defered(() => { a; }) : void + deferred(() => { +>deferred(() => { a; }) : void > : ^^^^ ->defered : (a: () => T) => T +>deferred : (a: () => T) => T > : ^ ^^ ^^ ^^^^^ >() => { a; } : () => void > : ^^^^^^^^^^ @@ -127,17 +127,17 @@ class C { }); } - // Accessor declaration paramter + // Accessor declaration parameter set x(v: number) { >x : number > : ^^^^^^ >v : number > : ^^^^^^ - defered(() => { ->defered(() => { v; }) : void + deferred(() => { +>deferred(() => { v; }) : void > : ^^^^ ->defered : (a: () => T) => T +>deferred : (a: () => T) => T > : ^ ^^ ^^ ^^^^^ >() => { v; } : () => void > : ^^^^^^^^^^ @@ -148,13 +148,13 @@ class C { }); } - // in a property initalizer - p = defered(() => { + // in a property initializer + p = deferred(() => { >p : void > : ^^^^ ->defered(() => { prop1; }) : void +>deferred(() => { prop1; }) : void > : ^^^^ ->defered : (a: () => T) => T +>deferred : (a: () => T) => T > : ^ ^^ ^^ ^^^^^ >() => { prop1; } : () => void > : ^^^^^^^^^^ @@ -177,19 +177,19 @@ let prop2; var E = class { >E : typeof E > : ^^^^^^^^ ->class { // Method declaration paramter method(a) { defered(() => { a; }); } // Accessor declaration paramter set x(v: number) { defered(() => { v; }); } // in a property initalizer p = defered(() => { prop2; });} : typeof E +>class { // Method declaration parameter method(a) { deferred(() => { a; }); } // Accessor declaration parameter set x(v: number) { deferred(() => { v; }); } // in a property initializer p = deferred(() => { prop2; });} : typeof E > : ^^^^^^^^ - // Method declaration paramter + // Method declaration parameter method(a) { >method : (a: any) => void > : ^ ^^^^^^^^^^^^^^ >a : any - defered(() => { ->defered(() => { a; }) : void + deferred(() => { +>deferred(() => { a; }) : void > : ^^^^ ->defered : (a: () => T) => T +>deferred : (a: () => T) => T > : ^ ^^ ^^ ^^^^^ >() => { a; } : () => void > : ^^^^^^^^^^ @@ -199,17 +199,17 @@ var E = class { }); } - // Accessor declaration paramter + // Accessor declaration parameter set x(v: number) { >x : number > : ^^^^^^ >v : number > : ^^^^^^ - defered(() => { ->defered(() => { v; }) : void + deferred(() => { +>deferred(() => { v; }) : void > : ^^^^ ->defered : (a: () => T) => T +>deferred : (a: () => T) => T > : ^ ^^ ^^ ^^^^^ >() => { v; } : () => void > : ^^^^^^^^^^ @@ -220,13 +220,13 @@ var E = class { }); } - // in a property initalizer - p = defered(() => { + // in a property initializer + p = deferred(() => { >p : void > : ^^^^ ->defered(() => { prop2; }) : void +>deferred(() => { prop2; }) : void > : ^^^^ ->defered : (a: () => T) => T +>deferred : (a: () => T) => T > : ^ ^^ ^^ ^^^^^ >() => { prop2; } : () => void > : ^^^^^^^^^^ @@ -247,19 +247,19 @@ new E(); var o = { >o : { method(a: any): void; x: number; p: void; } > : ^^^^^^^^^ ^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^ ->{ // Object literal method declaration paramter method(a) { defered(() => { a; }); }, // Accessor declaration paramter set x(v: number) { defered(() => { v; }); }, // in a property initalizer p: defered(() => { prop1; })} : { method(a: any): void; x: number; p: void; } +>{ // Object literal method declaration parameter method(a) { deferred(() => { a; }); }, // Accessor declaration parameter set x(v: number) { deferred(() => { v; }); }, // in a property initializer p: deferred(() => { prop1; })} : { method(a: any): void; x: number; p: void; } > : ^^^^^^^^^ ^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^ - // Object literal method declaration paramter + // Object literal method declaration parameter method(a) { >method : (a: any) => void > : ^ ^^^^^^^^^^^^^^ >a : any - defered(() => { ->defered(() => { a; }) : void + deferred(() => { +>deferred(() => { a; }) : void > : ^^^^ ->defered : (a: () => T) => T +>deferred : (a: () => T) => T > : ^ ^^ ^^ ^^^^^ >() => { a; } : () => void > : ^^^^^^^^^^ @@ -269,17 +269,17 @@ var o = { }); }, - // Accessor declaration paramter + // Accessor declaration parameter set x(v: number) { >x : number > : ^^^^^^ >v : number > : ^^^^^^ - defered(() => { ->defered(() => { v; }) : void + deferred(() => { +>deferred(() => { v; }) : void > : ^^^^ ->defered : (a: () => T) => T +>deferred : (a: () => T) => T > : ^ ^^ ^^ ^^^^^ >() => { v; } : () => void > : ^^^^^^^^^^ @@ -290,13 +290,13 @@ var o = { }); }, - // in a property initalizer - p: defered(() => { + // in a property initializer + p: deferred(() => { >p : void > : ^^^^ ->defered(() => { prop1; }) : void +>deferred(() => { prop1; }) : void > : ^^^^ ->defered : (a: () => T) => T +>deferred : (a: () => T) => T > : ^ ^^ ^^ ^^^^^ >() => { prop1; } : () => void > : ^^^^^^^^^^ @@ -311,17 +311,17 @@ o; >o : { method(a: any): void; x: number; p: void; } > : ^^^^^^^^^ ^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^ -// in a for..in statment +// in a for..in statement for (let i in o) { >i : string > : ^^^^^^ >o : { method(a: any): void; x: number; p: void; } > : ^^^^^^^^^ ^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^ - defered(() => { ->defered(() => { i; }) : void + deferred(() => { +>deferred(() => { i; }) : void > : ^^^^ ->defered : (a: () => T) => T +>deferred : (a: () => T) => T > : ^ ^^ ^^ ^^^^^ >() => { i; } : () => void > : ^^^^^^^^^^ @@ -333,7 +333,7 @@ for (let i in o) { }); } -// in a for..of statment +// in a for..of statement for (let i of [1,2,3]) { >i : number > : ^^^^^^ @@ -346,10 +346,10 @@ for (let i of [1,2,3]) { >3 : 3 > : ^ - defered(() => { ->defered(() => { i; }) : void + deferred(() => { +>deferred(() => { i; }) : void > : ^^^^ ->defered : (a: () => T) => T +>deferred : (a: () => T) => T > : ^ ^^ ^^ ^^^^^ >() => { i; } : () => void > : ^^^^^^^^^^ @@ -361,7 +361,7 @@ for (let i of [1,2,3]) { }); } -// in a for. statment +// in a for. statement for (let i = 0; i < 10; i++) { >i : number > : ^^^^^^ @@ -378,10 +378,10 @@ for (let i = 0; i < 10; i++) { >i : number > : ^^^^^^ - defered(() => { ->defered(() => { i; }) : void + deferred(() => { +>deferred(() => { i; }) : void > : ^^^^ ->defered : (a: () => T) => T +>deferred : (a: () => T) => T > : ^ ^^ ^^ ^^^^^ >() => { i; } : () => void > : ^^^^^^^^^^ @@ -411,10 +411,10 @@ if (condition) { >0 : 0 > : ^ - defered(() => { ->defered(() => { c; }) : void + deferred(() => { +>deferred(() => { c; }) : void > : ^^^^ ->defered : (a: () => T) => T +>deferred : (a: () => T) => T > : ^ ^^ ^^ ^^^^^ >() => { c; } : () => void > : ^^^^^^^^^^ @@ -434,10 +434,10 @@ try { >0 : 0 > : ^ - defered(() => { ->defered(() => { a; }) : void + deferred(() => { +>deferred(() => { a; }) : void > : ^^^^ ->defered : (a: () => T) => T +>deferred : (a: () => T) => T > : ^ ^^ ^^ ^^^^^ >() => { a; } : () => void > : ^^^^^^^^^^ @@ -457,10 +457,10 @@ catch (e) { >1 : 1 > : ^ - defered(() => { ->defered(() => { c; }) : void + deferred(() => { +>deferred(() => { c; }) : void > : ^^^^ ->defered : (a: () => T) => T +>deferred : (a: () => T) => T > : ^ ^^ ^^ ^^^^^ >() => { c; } : () => void > : ^^^^^^^^^^ @@ -478,10 +478,10 @@ finally { >0 : 0 > : ^ - defered(() => { ->defered(() => { c; }) : void + deferred(() => { +>deferred(() => { c; }) : void > : ^^^^ ->defered : (a: () => T) => T +>deferred : (a: () => T) => T > : ^ ^^ ^^ ^^^^^ >() => { c; } : () => void > : ^^^^^^^^^^ @@ -502,10 +502,10 @@ namespace N { var x; >x : any - defered(() => { ->defered(() => { x; }) : void + deferred(() => { +>deferred(() => { x; }) : void > : ^^^^ ->defered : (a: () => T) => T +>deferred : (a: () => T) => T > : ^ ^^ ^^ ^^^^^ >() => { x; } : () => void > : ^^^^^^^^^^ diff --git a/tests/baselines/reference/usingDeclarations.1(target=es5).js b/tests/baselines/reference/usingDeclarations.1(target=es5).js index 239c9b584e83a..77ac9c3ae5d3f 100644 --- a/tests/baselines/reference/usingDeclarations.1(target=es5).js +++ b/tests/baselines/reference/usingDeclarations.1(target=es5).js @@ -190,7 +190,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge }); }; var __generator = (this && this.__generator) || function (thisArg, body) { - var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); + var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, tries: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; function verb(n) { return function (v) { return step([n, v]); }; } function step(op) { @@ -202,14 +202,14 @@ var __generator = (this && this.__generator) || function (thisArg, body) { case 0: case 1: t = op; break; case 4: _.label++; return { value: op[1], done: false }; case 5: _.label++; y = op[1]; op = [0]; continue; - case 7: op = _.ops.pop(); _.trys.pop(); continue; + case 7: op = _.ops.pop(); _.tries.pop(); continue; default: - if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } + if (!(t = _.tries, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } if (t[2]) _.ops.pop(); - _.trys.pop(); continue; + _.tries.pop(); continue; } op = body.call(thisArg, _); } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } @@ -307,7 +307,7 @@ function af() { env_19 = { stack: [], error: void 0, hasError: false }; _b.label = 1; case 1: - _b.trys.push([1, 3, 4, 5]); + _b.tries.push([1, 3, 4, 5]); d3 = __addDisposableResource(env_19, (_a = {}, _a[Symbol.dispose] = function () { }, _a), false); return [4 /*yield*/, null]; case 2: @@ -335,7 +335,7 @@ function g() { env_20 = { stack: [], error: void 0, hasError: false }; _b.label = 1; case 1: - _b.trys.push([1, 3, 4, 5]); + _b.tries.push([1, 3, 4, 5]); d4 = __addDisposableResource(env_20, (_a = {}, _a[Symbol.dispose] = function () { }, _a), false); return [4 /*yield*/]; case 2: @@ -363,7 +363,7 @@ function ag() { env_21 = { stack: [], error: void 0, hasError: false }; _b.label = 1; case 1: - _b.trys.push([1, 5, 6, 7]); + _b.tries.push([1, 5, 6, 7]); d5 = __addDisposableResource(env_21, (_a = {}, _a[Symbol.dispose] = function () { }, _a), false); return [4 /*yield*/, __await(void 0)]; case 2: return [4 /*yield*/, _b.sent()]; @@ -490,7 +490,7 @@ try { env_28 = { stack: [], error: void 0, hasError: false }; _b.label = 1; case 1: - _b.trys.push([1, 3, 4, 5]); + _b.tries.push([1, 3, 4, 5]); d13 = __addDisposableResource(env_28, (_a = {}, _a[Symbol.dispose] = function () { }, _a), false); return [4 /*yield*/, null]; case 2: @@ -518,7 +518,7 @@ try { env_29 = { stack: [], error: void 0, hasError: false }; _b.label = 1; case 1: - _b.trys.push([1, 3, 4, 5]); + _b.tries.push([1, 3, 4, 5]); d14 = __addDisposableResource(env_29, (_a = {}, _a[Symbol.dispose] = function () { }, _a), false); return [4 /*yield*/]; case 2: @@ -546,7 +546,7 @@ try { env_30 = { stack: [], error: void 0, hasError: false }; _b.label = 1; case 1: - _b.trys.push([1, 5, 6, 7]); + _b.tries.push([1, 5, 6, 7]); d15 = __addDisposableResource(env_30, (_a = {}, _a[Symbol.dispose] = function () { }, _a), false); return [4 /*yield*/, __await(void 0)]; case 2: return [4 /*yield*/, _b.sent()]; diff --git a/tests/baselines/reference/usingDeclarationsInForAwaitOf(target=es5).js b/tests/baselines/reference/usingDeclarationsInForAwaitOf(target=es5).js index 9c8152374d6a8..9ab5a54477c66 100644 --- a/tests/baselines/reference/usingDeclarationsInForAwaitOf(target=es5).js +++ b/tests/baselines/reference/usingDeclarationsInForAwaitOf(target=es5).js @@ -19,7 +19,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge }); }; var __generator = (this && this.__generator) || function (thisArg, body) { - var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); + var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, tries: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; function verb(n) { return function (v) { return step([n, v]); }; } function step(op) { @@ -31,14 +31,14 @@ var __generator = (this && this.__generator) || function (thisArg, body) { case 0: case 1: t = op; break; case 4: _.label++; return { value: op[1], done: false }; case 5: _.label++; y = op[1]; op = [0]; continue; - case 7: op = _.ops.pop(); _.trys.pop(); continue; + case 7: op = _.ops.pop(); _.tries.pop(); continue; default: - if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } + if (!(t = _.tries, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } if (t[2]) _.ops.pop(); - _.trys.pop(); continue; + _.tries.pop(); continue; } op = body.call(thisArg, _); } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } @@ -112,7 +112,7 @@ function main() { return __generator(this, function (_h) { switch (_h.label) { case 0: - _h.trys.push([0, 5, 6, 11]); + _h.tries.push([0, 5, 6, 11]); _a = true, _b = __asyncValues([(_d = {}, _d[Symbol.dispose] = function () { }, _d), null, undefined]); _h.label = 1; case 1: return [4 /*yield*/, _b.next()]; @@ -142,7 +142,7 @@ function main() { e_1 = { error: e_1_1 }; return [3 /*break*/, 11]; case 6: - _h.trys.push([6, , 9, 10]); + _h.tries.push([6, , 9, 10]); if (!(!_a && !_e && (_f = _b.return))) return [3 /*break*/, 8]; return [4 /*yield*/, _f.call(_b)]; case 7: diff --git a/tests/baselines/reference/verbatimModuleSyntaxNoElisionCJS.errors.txt b/tests/baselines/reference/verbatimModuleSyntaxNoElisionCJS.errors.txt index 65c8813196309..42a7c3063096f 100644 --- a/tests/baselines/reference/verbatimModuleSyntaxNoElisionCJS.errors.txt +++ b/tests/baselines/reference/verbatimModuleSyntaxNoElisionCJS.errors.txt @@ -38,4 +38,4 @@ export = I; ==== /z.ts (0 errors) ==== - // test harness is weird if the last file includs a require >:( \ No newline at end of file + // test harness is weird if the last file includes a require >:( \ No newline at end of file diff --git a/tests/baselines/reference/verbatimModuleSyntaxNoElisionCJS.js b/tests/baselines/reference/verbatimModuleSyntaxNoElisionCJS.js index bb6435fd22314..52ee0b23bb6ca 100644 --- a/tests/baselines/reference/verbatimModuleSyntaxNoElisionCJS.js +++ b/tests/baselines/reference/verbatimModuleSyntaxNoElisionCJS.js @@ -29,7 +29,7 @@ const I = {}; export = I; //// [z.ts] -// test harness is weird if the last file includs a require >:( +// test harness is weird if the last file includes a require >:( //// [a.js] "use strict"; @@ -55,4 +55,4 @@ const I = {}; module.exports = I; //// [z.js] "use strict"; -// test harness is weird if the last file includs a require >:( +// test harness is weird if the last file includes a require >:( diff --git a/tests/baselines/reference/verbatimModuleSyntaxNoElisionCJS.symbols b/tests/baselines/reference/verbatimModuleSyntaxNoElisionCJS.symbols index da4926c487198..88bf5c0ee7024 100644 --- a/tests/baselines/reference/verbatimModuleSyntaxNoElisionCJS.symbols +++ b/tests/baselines/reference/verbatimModuleSyntaxNoElisionCJS.symbols @@ -53,4 +53,4 @@ export = I; === /z.ts === -// test harness is weird if the last file includs a require >:( +// test harness is weird if the last file includes a require >:( diff --git a/tests/baselines/reference/verbatimModuleSyntaxNoElisionCJS.types b/tests/baselines/reference/verbatimModuleSyntaxNoElisionCJS.types index b27b1af5f76df..c4ce1b7ae50f8 100644 --- a/tests/baselines/reference/verbatimModuleSyntaxNoElisionCJS.types +++ b/tests/baselines/reference/verbatimModuleSyntaxNoElisionCJS.types @@ -63,4 +63,4 @@ export = I; === /z.ts === -// test harness is weird if the last file includs a require >:( +// test harness is weird if the last file includes a require >:( diff --git a/tests/baselines/reference/verbatimModuleSyntaxRestrictionsCJS.errors.txt b/tests/baselines/reference/verbatimModuleSyntaxRestrictionsCJS.errors.txt index 59913037165d0..ce104c3f818e7 100644 --- a/tests/baselines/reference/verbatimModuleSyntaxRestrictionsCJS.errors.txt +++ b/tests/baselines/reference/verbatimModuleSyntaxRestrictionsCJS.errors.txt @@ -14,7 +14,7 @@ ==== /decl.d.ts (0 errors) ==== declare function esmy(): void; export default esmy; - export declare function funciton(): void; + export declare function function(): void; ==== /ambient.d.ts (0 errors) ==== declare module "ambient" { @@ -29,10 +29,10 @@ import * as esmy2 from "./decl"; // error ~~~~~ !!! error TS1295: ECMAScript imports and exports cannot be written in a CommonJS file under 'verbatimModuleSyntax'. Adjust the 'type' field in the nearest 'package.json' to make this file an ECMAScript module, or adjust your 'verbatimModuleSyntax', 'module', and 'moduleResolution' settings in TypeScript. - import { funciton } from "./decl"; // error + import { function } from "./decl"; // error ~~~~~~~~ !!! error TS1295: ECMAScript imports and exports cannot be written in a CommonJS file under 'verbatimModuleSyntax'. Adjust the 'type' field in the nearest 'package.json' to make this file an ECMAScript module, or adjust your 'verbatimModuleSyntax', 'module', and 'moduleResolution' settings in TypeScript. - import type { funciton as funciton2 } from "./decl"; // ok I guess? + import type { function as funciton2 } from "./decl"; // ok I guess? import("./decl"); // error ~~~~~~~~~~~~~~~~ !!! error TS1295: ECMAScript imports and exports cannot be written in a CommonJS file under 'verbatimModuleSyntax'. Adjust the 'type' field in the nearest 'package.json' to make this file an ECMAScript module, or adjust your 'verbatimModuleSyntax', 'module', and 'moduleResolution' settings in TypeScript. diff --git a/tests/baselines/reference/verbatimModuleSyntaxRestrictionsCJS.js b/tests/baselines/reference/verbatimModuleSyntaxRestrictionsCJS.js index b3e3508feb16b..e95cf239859b6 100644 --- a/tests/baselines/reference/verbatimModuleSyntaxRestrictionsCJS.js +++ b/tests/baselines/reference/verbatimModuleSyntaxRestrictionsCJS.js @@ -3,7 +3,7 @@ //// [decl.d.ts] declare function esmy(): void; export default esmy; -export declare function funciton(): void; +export declare function function(): void; //// [ambient.d.ts] declare module "ambient" { @@ -14,8 +14,8 @@ declare module "ambient" { //// [main.ts] import esmy from "./decl"; // error import * as esmy2 from "./decl"; // error -import { funciton } from "./decl"; // error -import type { funciton as funciton2 } from "./decl"; // ok I guess? +import { function } from "./decl"; // error +import type { function as funciton2 } from "./decl"; // ok I guess? import("./decl"); // error type T = typeof import("./decl"); // ok export {}; // error diff --git a/tests/baselines/reference/verbatimModuleSyntaxRestrictionsCJS.symbols b/tests/baselines/reference/verbatimModuleSyntaxRestrictionsCJS.symbols index 68de5d9801572..6959e1c0d3730 100644 --- a/tests/baselines/reference/verbatimModuleSyntaxRestrictionsCJS.symbols +++ b/tests/baselines/reference/verbatimModuleSyntaxRestrictionsCJS.symbols @@ -7,8 +7,8 @@ declare function esmy(): void; export default esmy; >esmy : Symbol(esmy, Decl(decl.d.ts, 0, 0)) -export declare function funciton(): void; ->funciton : Symbol(funciton, Decl(decl.d.ts, 1, 20)) +export declare function function(): void; +>function : Symbol(function, Decl(decl.d.ts, 1, 20)) === /ambient.d.ts === declare module "ambient" { @@ -28,11 +28,11 @@ import esmy from "./decl"; // error import * as esmy2 from "./decl"; // error >esmy2 : Symbol(esmy2, Decl(main.ts, 1, 6)) -import { funciton } from "./decl"; // error ->funciton : Symbol(funciton, Decl(main.ts, 2, 8)) +import { function } from "./decl"; // error +>function : Symbol(function, Decl(main.ts, 2, 8)) -import type { funciton as funciton2 } from "./decl"; // ok I guess? ->funciton : Symbol(esmy2.funciton, Decl(decl.d.ts, 1, 20)) +import type { function as funciton2 } from "./decl"; // ok I guess? +>function : Symbol(esmy2.function, Decl(decl.d.ts, 1, 20)) >funciton2 : Symbol(funciton2, Decl(main.ts, 3, 13)) import("./decl"); // error diff --git a/tests/baselines/reference/verbatimModuleSyntaxRestrictionsCJS.types b/tests/baselines/reference/verbatimModuleSyntaxRestrictionsCJS.types index d5444edfb4fc9..58e2ff9f95408 100644 --- a/tests/baselines/reference/verbatimModuleSyntaxRestrictionsCJS.types +++ b/tests/baselines/reference/verbatimModuleSyntaxRestrictionsCJS.types @@ -9,8 +9,8 @@ export default esmy; >esmy : () => void > : ^^^^^^ -export declare function funciton(): void; ->funciton : () => void +export declare function function(): void; +>function : () => void > : ^^^^^^ === /ambient.d.ts === @@ -36,12 +36,12 @@ import * as esmy2 from "./decl"; // error >esmy2 : typeof esmy2 > : ^^^^^^^^^^^^ -import { funciton } from "./decl"; // error ->funciton : () => void +import { function } from "./decl"; // error +>function : () => void > : ^^^^^^ -import type { funciton as funciton2 } from "./decl"; // ok I guess? ->funciton : () => void +import type { function as funciton2 } from "./decl"; // ok I guess? +>function : () => void > : ^^^^^^ >funciton2 : any > : ^^^ diff --git a/tests/baselines/reference/yieldInForInInDownlevelGenerator(target=es5).js b/tests/baselines/reference/yieldInForInInDownlevelGenerator(target=es5).js index 308d76619e703..46b33d87023d2 100644 --- a/tests/baselines/reference/yieldInForInInDownlevelGenerator(target=es5).js +++ b/tests/baselines/reference/yieldInForInInDownlevelGenerator(target=es5).js @@ -13,7 +13,7 @@ function* gen() { //// [yieldInForInInDownlevelGenerator.js] "use strict"; var __generator = (this && this.__generator) || function (thisArg, body) { - var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); + var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, tries: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; function verb(n) { return function (v) { return step([n, v]); }; } function step(op) { @@ -25,14 +25,14 @@ var __generator = (this && this.__generator) || function (thisArg, body) { case 0: case 1: t = op; break; case 4: _.label++; return { value: op[1], done: false }; case 5: _.label++; y = op[1]; op = [0]; continue; - case 7: op = _.ops.pop(); _.trys.pop(); continue; + case 7: op = _.ops.pop(); _.tries.pop(); continue; default: - if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } + if (!(t = _.tries, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } if (t[2]) _.ops.pop(); - _.trys.pop(); continue; + _.tries.pop(); continue; } op = body.call(thisArg, _); } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } diff --git a/tests/baselines/reference/yieldStatementNoAsiAfterTransform(target=es5).js b/tests/baselines/reference/yieldStatementNoAsiAfterTransform(target=es5).js index 7ebcf9f815c6f..fbc55afc2305f 100644 --- a/tests/baselines/reference/yieldStatementNoAsiAfterTransform(target=es5).js +++ b/tests/baselines/reference/yieldStatementNoAsiAfterTransform(target=es5).js @@ -72,7 +72,7 @@ var __makeTemplateObject = (this && this.__makeTemplateObject) || function (cook return cooked; }; var __generator = (this && this.__generator) || function (thisArg, body) { - var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); + var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, tries: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype); return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; function verb(n) { return function (v) { return step([n, v]); }; } function step(op) { @@ -84,14 +84,14 @@ var __generator = (this && this.__generator) || function (thisArg, body) { case 0: case 1: t = op; break; case 4: _.label++; return { value: op[1], done: false }; case 5: _.label++; y = op[1]; op = [0]; continue; - case 7: op = _.ops.pop(); _.trys.pop(); continue; + case 7: op = _.ops.pop(); _.tries.pop(); continue; default: - if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } + if (!(t = _.tries, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } if (t[2]) _.ops.pop(); - _.trys.pop(); continue; + _.tries.pop(); continue; } op = body.call(thisArg, _); } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } diff --git a/tests/cases/compiler/argumentsBindsToFunctionScopeArgumentList.ts b/tests/cases/compiler/argumentsBindsToFunctionScopeArgumentList.ts index bc1845675c51b..24f53fd3fbbbc 100644 --- a/tests/cases/compiler/argumentsBindsToFunctionScopeArgumentList.ts +++ b/tests/cases/compiler/argumentsBindsToFunctionScopeArgumentList.ts @@ -4,5 +4,5 @@ // @alwaysStrict: true, false var arguments = 10; function foo(a) { - arguments = 10; /// This shouldnt be of type number and result in error. + arguments = 10; /// This shouldn't be of type number and result in error. } \ No newline at end of file diff --git a/tests/cases/compiler/arrayAssignmentTest4.ts b/tests/cases/compiler/arrayAssignmentTest4.ts index 8af07df1afcde..ded13b0b045ea 100644 --- a/tests/cases/compiler/arrayAssignmentTest4.ts +++ b/tests/cases/compiler/arrayAssignmentTest4.ts @@ -9,7 +9,7 @@ class C3 { /* -This behaves unexpectedly with teh following types: +This behaves unexpectedly with the following types: Type 1 of any[]: diff --git a/tests/cases/compiler/arrayIterationLibES5TargetDifferent.ts b/tests/cases/compiler/arrayIterationLibES5TargetDifferent.ts index ee25dced9afd6..e6127d524fff3 100644 --- a/tests/cases/compiler/arrayIterationLibES5TargetDifferent.ts +++ b/tests/cases/compiler/arrayIterationLibES5TargetDifferent.ts @@ -15,9 +15,9 @@ for (const x of aString) { log(x); } -declare const aNumber: number; +declare const a number: number; -for (const x of aNumber) { +for (const x of a number) { log(x); } diff --git a/tests/cases/compiler/assignmentRestElementWithErrorSourceType.ts b/tests/cases/compiler/assignmentRestElementWithErrorSourceType.ts index b4f9cbcac1bba..ccd8eb12c8dec 100644 --- a/tests/cases/compiler/assignmentRestElementWithErrorSourceType.ts +++ b/tests/cases/compiler/assignmentRestElementWithErrorSourceType.ts @@ -1,3 +1,3 @@ // @target: es2015 var tuple: [string, number]; -[...c] = tupel; // intentionally misspelled \ No newline at end of file +[...c] = tuple; // intentionally misspelled \ No newline at end of file diff --git a/tests/cases/compiler/baseIndexSignatureResolution.ts b/tests/cases/compiler/baseIndexSignatureResolution.ts index e465d157ece20..a6658eb473053 100644 --- a/tests/cases/compiler/baseIndexSignatureResolution.ts +++ b/tests/cases/compiler/baseIndexSignatureResolution.ts @@ -2,7 +2,7 @@ class Base { private a: string; } class Derived extends Base { private b: string; } -// Note - commmenting "extends Foo" prevents the error +// Note - commenting "extends Foo" prevents the error interface Foo { [i: number]: Base; } diff --git a/tests/cases/compiler/bestCommonTypeWithContextualTyping.ts b/tests/cases/compiler/bestCommonTypeWithContextualTyping.ts index 1bf9174d49212..b7ee806038fc4 100644 --- a/tests/cases/compiler/bestCommonTypeWithContextualTyping.ts +++ b/tests/cases/compiler/bestCommonTypeWithContextualTyping.ts @@ -5,18 +5,18 @@ interface Contextual { p?: number; } -interface Ellement { +interface Element { dummy; p: any; } -declare var e: Ellement; +declare var e: Element; // All of these should pass. Neither type is a supertype of the other, but the RHS should -// always use Ellement in these examples (not Contextual). Because Ellement is assignable +// always use Element in these examples (not Contextual). Because Element is assignable // to Contextual, no errors. -var arr: Contextual[] = [e]; // Ellement[] -var obj: { [s: string]: Contextual } = { s: e }; // { s: Ellement; [s: string]: Ellement } +var arr: Contextual[] = [e]; // Element[] +var obj: { [s: string]: Contextual } = { s: e }; // { s: Element; [s: string]: Element } -var conditional: Contextual = null ? e : e; // Ellement -var contextualOr: Contextual = e || e; // Ellement \ No newline at end of file +var conditional: Contextual = null ? e : e; // Element +var contextualOr: Contextual = e || e; // Element \ No newline at end of file diff --git a/tests/cases/compiler/binderBinaryExpressionStress.ts b/tests/cases/compiler/binderBinaryExpressionStress.ts index 0ae9552966b99..f3e4a42a2e2c9 100644 --- a/tests/cases/compiler/binderBinaryExpressionStress.ts +++ b/tests/cases/compiler/binderBinaryExpressionStress.ts @@ -2,7 +2,7 @@ // @removeComments: true // @noTypesAndSymbols: true // regression test for https://github.com/microsoft/TypeScript/issues/35633 -// If we need to emit comments or subsitutions for a node, we have to skip the trampoline +// If we need to emit comments or substitutions for a node, we have to skip the trampoline // that allows us to handle emitting arbitrarily complex binary expressions // so we simplify the emit as much as possible to allow us to emit. In addition, // we disable the type & symbol baselines just because they're _way too big_ diff --git a/tests/cases/compiler/binderBinaryExpressionStressJs.ts b/tests/cases/compiler/binderBinaryExpressionStressJs.ts index f6af2b9fbc6a1..c86333c2313f8 100644 --- a/tests/cases/compiler/binderBinaryExpressionStressJs.ts +++ b/tests/cases/compiler/binderBinaryExpressionStressJs.ts @@ -4,7 +4,7 @@ // @noEmit: true // @filename: file.js // regression test for https://github.com/microsoft/TypeScript/issues/35633 -// If we need to emit comments or subsitutions for a node, we have to skip the trampoline +// If we need to emit comments or substitutions for a node, we have to skip the trampoline // that allows us to handle emitting arbitrarily complex binary expressions // so we simplify the emit as much as possible to allow us to emit. In addition, // we disable the type & symbol baselines just because they're _way too big_ diff --git a/tests/cases/compiler/bindingPatternCannotBeOnlyInferenceSource.ts b/tests/cases/compiler/bindingPatternCannotBeOnlyInferenceSource.ts index d4d5fc35599e3..e688841208f0c 100644 --- a/tests/cases/compiler/bindingPatternCannotBeOnlyInferenceSource.ts +++ b/tests/cases/compiler/bindingPatternCannotBeOnlyInferenceSource.ts @@ -21,7 +21,7 @@ type TFuncs1 = typeof funcs1; declare function useReduxDispatch1>(destructuring: Destructuring): T; const {} = useReduxDispatch1( (d, f) => ({ - funcA: (...p) => d(f.funcA(...p)), // p should be inferrable + funcA: (...p) => d(f.funcA(...p)), // p should be inferable funcB: (...p) => d(f.funcB(...p)), funcC: (...p) => d(f.funcC(...p)), }) diff --git a/tests/cases/compiler/callOfConditionalTypeWithConcreteBranches.ts b/tests/cases/compiler/callOfConditionalTypeWithConcreteBranches.ts index 050b1d3dad26c..27e10dc2badb9 100644 --- a/tests/cases/compiler/callOfConditionalTypeWithConcreteBranches.ts +++ b/tests/cases/compiler/callOfConditionalTypeWithConcreteBranches.ts @@ -29,7 +29,7 @@ function fn2(arg: Q2) { fn2(m => m(42)); fn2(m => m(42)); -// webidl-conversions example where substituion must occur, despite contravariance of the position +// webidl-conversions example where substitution must occur, despite contravariance of the position // due to the invariant usage in `Parameters` type X = V extends (...args: any[]) => any ? (...args: Parameters) => void : Function; diff --git a/tests/cases/compiler/castExpressionParentheses.ts b/tests/cases/compiler/castExpressionParentheses.ts index 8abad6e39260a..2a3b65f335677 100644 --- a/tests/cases/compiler/castExpressionParentheses.ts +++ b/tests/cases/compiler/castExpressionParentheses.ts @@ -43,9 +43,9 @@ new (A()); (function foo() { })(); (-A).x; -// nested cast, should keep one pair of parenthese +// nested cast, should keep one pair of parentheses ((-A)).x; -// nested parenthesized expression, should keep one pair of parenthese +// nested parenthesized expression, should keep one pair of parentheses ((A)) diff --git a/tests/cases/compiler/circularlySimplifyingConditionalTypesNoCrash.ts b/tests/cases/compiler/circularlySimplifyingConditionalTypesNoCrash.ts index 2e5c70d52b958..1f40c7b8475e2 100644 --- a/tests/cases/compiler/circularlySimplifyingConditionalTypesNoCrash.ts +++ b/tests/cases/compiler/circularlySimplifyingConditionalTypesNoCrash.ts @@ -2,7 +2,7 @@ // @strict: true type Omit = Pick>; -type Shared< // Circularly self constraining type, defered thanks to mapping +type Shared< // Circularly self constraining type, deferred thanks to mapping InjectedProps, DecorationTargetProps extends Shared > = { diff --git a/tests/cases/compiler/classExtendingAny.ts b/tests/cases/compiler/classExtendingAny.ts index c2279ea6f7b2f..58d1247edec09 100644 --- a/tests/cases/compiler/classExtendingAny.ts +++ b/tests/cases/compiler/classExtendingAny.ts @@ -30,7 +30,7 @@ class B extends Err { } f() { this.wat - this.wit + this.with this['wot'] super.alsoBad } diff --git a/tests/cases/compiler/classMemberInitializerScoping.ts b/tests/cases/compiler/classMemberInitializerScoping.ts index 319fde45718d1..843cfdf0d8119 100644 --- a/tests/cases/compiler/classMemberInitializerScoping.ts +++ b/tests/cases/compiler/classMemberInitializerScoping.ts @@ -3,7 +3,7 @@ var aaa = 1; class CCC { y: number = aaa; - static staticY: number = aaa; // This shouldnt be error + static staticY: number = aaa; // This shouldn't be error constructor(aaa) { this.y = ''; // was: error, cannot assign string to number } diff --git a/tests/cases/compiler/classMemberInitializerWithLamdaScoping.ts b/tests/cases/compiler/classMemberInitializerWithLamdaScoping.ts index 89298ae6e50bb..fca1d98a331e2 100644 --- a/tests/cases/compiler/classMemberInitializerWithLamdaScoping.ts +++ b/tests/cases/compiler/classMemberInitializerWithLamdaScoping.ts @@ -8,12 +8,12 @@ class Test { } messageHandler = () => { var field = this.field; - console.log(field); // Using field here shouldnt be error + console.log(field); // Using field here shouldn't be error }; static field: number; static staticMessageHandler = () => { var field = Test.field; - console.log(field); // Using field here shouldnt be error + console.log(field); // Using field here shouldn't be error }; } @@ -24,9 +24,9 @@ class Test1 { messageHandler = () => { console.log(field1); // But this should be error as the field1 will resolve to var field1 // but since this code would be generated inside constructor, in generated js - // it would resolve to private field1 and thats not what user intended here. + // it would resolve to private field1 and that's not what user intended here. }; static staticMessageHandler = () => { - console.log(field1); // This shouldnt be error as its a static property + console.log(field1); // This shouldn't be error as its a static property }; } \ No newline at end of file diff --git a/tests/cases/compiler/classMemberInitializerWithLamdaScoping2.ts b/tests/cases/compiler/classMemberInitializerWithLamdaScoping2.ts index 4df1e16a61cb3..d01689292770e 100644 --- a/tests/cases/compiler/classMemberInitializerWithLamdaScoping2.ts +++ b/tests/cases/compiler/classMemberInitializerWithLamdaScoping2.ts @@ -13,6 +13,6 @@ class Test1 { messageHandler = () => { console.log(field1); // But this should be error as the field1 will resolve to var field1 // but since this code would be generated inside constructor, in generated js - // it would resolve to private field1 and thats not what user intended here. + // it would resolve to private field1 and that's not what user intended here. }; } \ No newline at end of file diff --git a/tests/cases/compiler/classMemberInitializerWithLamdaScoping3.ts b/tests/cases/compiler/classMemberInitializerWithLamdaScoping3.ts index a97e543bdf34d..de7803991342d 100644 --- a/tests/cases/compiler/classMemberInitializerWithLamdaScoping3.ts +++ b/tests/cases/compiler/classMemberInitializerWithLamdaScoping3.ts @@ -12,6 +12,6 @@ export class Test1 { messageHandler = () => { console.log(field1); // But this should be error as the field1 will resolve to var field1 // but since this code would be generated inside constructor, in generated js - // it would resolve to private field1 and thats not what user intended here. + // it would resolve to private field1 and that's not what user intended here. }; } \ No newline at end of file diff --git a/tests/cases/compiler/classMemberInitializerWithLamdaScoping4.ts b/tests/cases/compiler/classMemberInitializerWithLamdaScoping4.ts index c61b816b269b8..cb478b7d5f4a2 100644 --- a/tests/cases/compiler/classMemberInitializerWithLamdaScoping4.ts +++ b/tests/cases/compiler/classMemberInitializerWithLamdaScoping4.ts @@ -11,6 +11,6 @@ export class Test1 { constructor(private field1: string) { } messageHandler = () => { - console.log(field1); // Should be error that couldnt find symbol field1 + console.log(field1); // Should be error that couldn't find symbol field1 }; } \ No newline at end of file diff --git a/tests/cases/compiler/classMemberInitializerWithLamdaScoping5.ts b/tests/cases/compiler/classMemberInitializerWithLamdaScoping5.ts index 243d1c3617cba..575ee6915694c 100644 --- a/tests/cases/compiler/classMemberInitializerWithLamdaScoping5.ts +++ b/tests/cases/compiler/classMemberInitializerWithLamdaScoping5.ts @@ -8,6 +8,6 @@ class Greeter { } messageHandler = (message: string) => { - console.log(message); // This shouldnt be error + console.log(message); // This shouldn't be error } } \ No newline at end of file diff --git a/tests/cases/compiler/collisionCodeGenModuleWithAccessorChildren.ts b/tests/cases/compiler/collisionCodeGenModuleWithAccessorChildren.ts index 5f972d5c2422b..2ea042bae9c1b 100644 --- a/tests/cases/compiler/collisionCodeGenModuleWithAccessorChildren.ts +++ b/tests/cases/compiler/collisionCodeGenModuleWithAccessorChildren.ts @@ -20,7 +20,7 @@ namespace M { } } -namespace M { // Shouldnt be _M +namespace M { // Shouldn't be _M class e { private y; set M(p) { @@ -38,7 +38,7 @@ namespace M { } } -namespace M { // Shouldnt be _M +namespace M { // Shouldn't be _M class e { get M() { return x; diff --git a/tests/cases/compiler/collisionCodeGenModuleWithMethodChildren.ts b/tests/cases/compiler/collisionCodeGenModuleWithMethodChildren.ts index e923af553cf71..db0a59acb6328 100644 --- a/tests/cases/compiler/collisionCodeGenModuleWithMethodChildren.ts +++ b/tests/cases/compiler/collisionCodeGenModuleWithMethodChildren.ts @@ -26,7 +26,7 @@ namespace M { } } -namespace M { // Shouldnt bn _M +namespace M { // Shouldn't bn _M class f { M() { } diff --git a/tests/cases/compiler/collisionCodeGenModuleWithModuleChildren.ts b/tests/cases/compiler/collisionCodeGenModuleWithModuleChildren.ts index 63278f83ee3b4..b04d6ee6012fd 100644 --- a/tests/cases/compiler/collisionCodeGenModuleWithModuleChildren.ts +++ b/tests/cases/compiler/collisionCodeGenModuleWithModuleChildren.ts @@ -25,7 +25,7 @@ namespace M { } } -namespace M { // shouldnt be _M +namespace M { // shouldn't be _M namespace m3 { interface M { } diff --git a/tests/cases/compiler/collisionSuperAndParameter.ts b/tests/cases/compiler/collisionSuperAndParameter.ts index 0820a5807b9f6..529fe69b2d4c8 100644 --- a/tests/cases/compiler/collisionSuperAndParameter.ts +++ b/tests/cases/compiler/collisionSuperAndParameter.ts @@ -2,7 +2,7 @@ // @target: es5, es2015 class Foo { a() { - var lamda = (_super: number) => { // No Error + var lambda = (_super: number) => { // No Error return x => this; // New scope. So should inject new _this capture } } @@ -16,7 +16,7 @@ class Foo { } class Foo2 extends Foo { x() { - var lamda = (_super: number) => { // Error + var lambda = (_super: number) => { // Error return x => this; // New scope. So should inject new _this capture } } diff --git a/tests/cases/compiler/collisionThisExpressionAndParameter.ts b/tests/cases/compiler/collisionThisExpressionAndParameter.ts index b114118e13851..deceb1a29e4a3 100644 --- a/tests/cases/compiler/collisionThisExpressionAndParameter.ts +++ b/tests/cases/compiler/collisionThisExpressionAndParameter.ts @@ -9,7 +9,7 @@ class Foo { } } y() { - var lamda = (_this: number) => { // Error + var lambda = (_this: number) => { // Error return x => this; // New scope. So should inject new _this capture } } @@ -25,7 +25,7 @@ class Foo { } } y1() { - var lamda = (_this: number) => { // No Error + var lambda = (_this: number) => { // No Error } } z1(_this: number) { // No Error diff --git a/tests/cases/compiler/commentInMethodCall.ts b/tests/cases/compiler/commentInMethodCall.ts index 245606420ca90..f3906e0ad6889 100644 --- a/tests/cases/compiler/commentInMethodCall.ts +++ b/tests/cases/compiler/commentInMethodCall.ts @@ -1,5 +1,5 @@ // @target: es2015 -//commment here +//comment here var s: string[]; s.map(// do something function () { }); diff --git a/tests/cases/compiler/commentsClass.ts b/tests/cases/compiler/commentsClass.ts index 705d605a15824..3cdbb30b49d1a 100644 --- a/tests/cases/compiler/commentsClass.ts +++ b/tests/cases/compiler/commentsClass.ts @@ -2,7 +2,7 @@ // @declaration: true // @removeComments: false -/** This is class c2 without constuctor*/ +/** This is class c2 without constructor*/ class c2 { } // trailing comment1 var i2 = new c2(); @@ -22,15 +22,15 @@ class c4 { } var i4 = new c4(); var i4_c = c4; -/** Class with statics*/ +/** Class with statistics*/ class c5 { static s1: number; } var i5 = new c5(); var i5_c = c5; -/// class with statics and constructor -class c6 { /// class with statics and constructor2 +/// class with statistics and constructor +class c6 { /// class with statistics and constructor2 /// s1 comment static s1: number; /// s1 comment2 /// constructor comment @@ -40,7 +40,7 @@ class c6 { /// class with statics and constructor2 var i6 = new c6(); var i6_c = c6; -// class with statics and constructor +// class with statistics and constructor class c7 { // s1 comment static s1: number; @@ -51,7 +51,7 @@ class c7 { var i7 = new c7(); var i7_c = c7; -/** class with statics and constructor +/** class with statistics and constructor */ class c8 { /** s1 comment */ diff --git a/tests/cases/compiler/commentsCommentParsing.ts b/tests/cases/compiler/commentsCommentParsing.ts index 84d3bbd7b550c..d3de42f7b9439 100644 --- a/tests/cases/compiler/commentsCommentParsing.ts +++ b/tests/cases/compiler/commentsCommentParsing.ts @@ -32,7 +32,7 @@ jsDocMultiLine(); /** this is multiple line jsdoc stule comment *New line1 *New Line2*/ -/** Shoul mege this line as well +/** Shoul merge this line as well * and this too*/ /** Another this one too*/ function jsDocMultiLineMerge() { } diff --git a/tests/cases/compiler/commentsInterface.ts b/tests/cases/compiler/commentsInterface.ts index b660837e45481..7656018e72324 100644 --- a/tests/cases/compiler/commentsInterface.ts +++ b/tests/cases/compiler/commentsInterface.ts @@ -9,7 +9,7 @@ var i1_i: i1; interface nc_i1 { } var nc_i1_i: nc_i1; -/** this is interface 2 with memebers*/ +/** this is interface 2 with members*/ interface i2 { /** this is x*/ x: number; diff --git a/tests/cases/compiler/commentsOverloads.ts b/tests/cases/compiler/commentsOverloads.ts index c0f13fad87942..15ddf8c436dc2 100644 --- a/tests/cases/compiler/commentsOverloads.ts +++ b/tests/cases/compiler/commentsOverloads.ts @@ -119,7 +119,7 @@ class c { public prop5(a: number): number; /** prop5 2*/ public prop5(b: string): number; - /** Prop5 implementaion*/ + /** Prop5 implementation*/ public prop5(aorb: any) { return 10; } diff --git a/tests/cases/compiler/commentsVarDecl.ts b/tests/cases/compiler/commentsVarDecl.ts index b147326bda045..2d46f6003401b 100644 --- a/tests/cases/compiler/commentsVarDecl.ts +++ b/tests/cases/compiler/commentsVarDecl.ts @@ -20,7 +20,7 @@ var anotherAnotherVariable = 70; /* these are multiple trailing comments */ /* m /** comment line 2*/ var x = 70; /* multiline trailing comment this is multiline trailing comment */ -/** Triple slash comment on the assignment shouldnt be in .d.ts file*/ +/** Triple slash comment on the assignment shouldn't be in .d.ts file*/ x = myVariable; /** triple slash comment1*/ diff --git a/tests/cases/compiler/complicatedIndexedAccessKeyofReliesOnKeyofNeverUpperBound.ts b/tests/cases/compiler/complicatedIndexedAccessKeyofReliesOnKeyofNeverUpperBound.ts index dd03d822a88ea..f75a64d6134c9 100644 --- a/tests/cases/compiler/complicatedIndexedAccessKeyofReliesOnKeyofNeverUpperBound.ts +++ b/tests/cases/compiler/complicatedIndexedAccessKeyofReliesOnKeyofNeverUpperBound.ts @@ -8,7 +8,7 @@ interface TextChannel { interface EmailChannel { id: string; type: 'email'; - addres: string; + address: string; } type Channel = TextChannel | EmailChannel; diff --git a/tests/cases/compiler/conditionalTypesSimplifyWhenTrivial.ts b/tests/cases/compiler/conditionalTypesSimplifyWhenTrivial.ts index cd73554827630..82b168f652975 100644 --- a/tests/cases/compiler/conditionalTypesSimplifyWhenTrivial.ts +++ b/tests/cases/compiler/conditionalTypesSimplifyWhenTrivial.ts @@ -18,7 +18,7 @@ function fn4(x: Extract) { x = y; } -declare var x: Extract; // Should be `numebr | string` and not `any` +declare var x: Extract; // Should be `number | string` and not `any` type ExtractWithDefault = T extends U ? T : D; diff --git a/tests/cases/compiler/constDeclarations-ambient-errors.ts b/tests/cases/compiler/constDeclarations-ambient-errors.ts index d37e90b2d576e..ca71c1e47a397 100644 --- a/tests/cases/compiler/constDeclarations-ambient-errors.ts +++ b/tests/cases/compiler/constDeclarations-ambient-errors.ts @@ -1,7 +1,7 @@ // @strict: false // @target: ES6 -// error: no intialization expected in ambient declarations +// error: no initialization expected in ambient declarations declare const c1: boolean = true; declare const c2: number = 0; declare const c3 = null, c4 :string = "", c5: any = 0; diff --git a/tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts b/tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts index 79e35ea8964a4..469a879723d6d 100644 --- a/tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts +++ b/tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts @@ -115,7 +115,7 @@ namespace TypeScriptAllInOne { } /// - /// Test different statements. Including if-else,swith,foreach,(un)checked,lock,using,try-catch-finally + /// Test different statements. Including if-else,switch,foreach,(un)checked,lock,using,try-catch-finally /// /// /// diff --git a/tests/cases/compiler/contextuallyTypedByDiscriminableUnion2.ts b/tests/cases/compiler/contextuallyTypedByDiscriminableUnion2.ts index d36123e3e1e8a..dafa26fc435d2 100644 --- a/tests/cases/compiler/contextuallyTypedByDiscriminableUnion2.ts +++ b/tests/cases/compiler/contextuallyTypedByDiscriminableUnion2.ts @@ -9,7 +9,7 @@ type Identifiable = { id: string }; interface EnableA { readonly enableA: true; // this introduces a conflicting property with some of the other members of MyComponentProps - // making relevant final union members reduced nevers + // making relevant final union members reduced never readonly enableB: true; } diff --git a/tests/cases/compiler/declFileWithErrorsInInputDeclarationFile.ts b/tests/cases/compiler/declFileWithErrorsInInputDeclarationFile.ts index a79e1896c3b32..0c644ab849175 100644 --- a/tests/cases/compiler/declFileWithErrorsInInputDeclarationFile.ts +++ b/tests/cases/compiler/declFileWithErrorsInInputDeclarationFile.ts @@ -14,4 +14,4 @@ declare namespace M { // @Filename: client.ts /// -var x = new M.C(); // Declaration file wont get emitted because there are errors in declaration file +var x = new M.C(); // Declaration file won't get emitted because there are errors in declaration file diff --git a/tests/cases/compiler/declFileWithErrorsInInputDeclarationFileWithOut.ts b/tests/cases/compiler/declFileWithErrorsInInputDeclarationFileWithOut.ts index c885bef370a49..0b3c9120eb002 100644 --- a/tests/cases/compiler/declFileWithErrorsInInputDeclarationFileWithOut.ts +++ b/tests/cases/compiler/declFileWithErrorsInInputDeclarationFileWithOut.ts @@ -15,4 +15,4 @@ declare namespace M { // @Filename: client.ts /// -var x = new M.C(); // Declaration file wont get emitted because there are errors in declaration file +var x = new M.C(); // Declaration file won't get emitted because there are errors in declaration file diff --git a/tests/cases/compiler/declarationEmitBindingPatternsFunctionExpr.ts b/tests/cases/compiler/declarationEmitBindingPatternsFunctionExpr.ts index e4246a2c0814a..930baad46da40 100644 --- a/tests/cases/compiler/declarationEmitBindingPatternsFunctionExpr.ts +++ b/tests/cases/compiler/declarationEmitBindingPatternsFunctionExpr.ts @@ -7,7 +7,7 @@ type Named = { name: string } // Tempting to remove alias if unused let notReferenced = ({ name: alias }: Named) => { } -// Resons we can't remove aliases that are not used in the function signature: +// Reasons we can't remove aliases that are not used in the function signature: // 1.Causes duplicate identifier if we remove alias const duplicateIndetifiers = ({ name: alias, name: alias2 }: Named) => { } diff --git a/tests/cases/compiler/declarationEmitBindingPatternsUnused.ts b/tests/cases/compiler/declarationEmitBindingPatternsUnused.ts index ea28769dbbdea..46ec8110b58c3 100644 --- a/tests/cases/compiler/declarationEmitBindingPatternsUnused.ts +++ b/tests/cases/compiler/declarationEmitBindingPatternsUnused.ts @@ -5,7 +5,7 @@ type Named = { name: string } -// Resons we can't remove aliases that are not used in the function signature: +// Reasons we can't remove aliases that are not used in the function signature: // 1.Causes duplicate identifier if we remove alias function duplicateIndetifiers({ name: alias, name: alias2 }: Named) { } diff --git a/tests/cases/compiler/declarationEmitObjectAssignedDefaultExport.ts b/tests/cases/compiler/declarationEmitObjectAssignedDefaultExport.ts index e83dffc3b21d2..2a4e19cf10ebd 100644 --- a/tests/cases/compiler/declarationEmitObjectAssignedDefaultExport.ts +++ b/tests/cases/compiler/declarationEmitObjectAssignedDefaultExport.ts @@ -2,11 +2,11 @@ // @module: commonjs // @declaration: true // @filename: node_modules/styled-components/node_modules/hoist-non-react-statics/index.d.ts -interface Statics { +interface Statistics { "$$whatever": string; } declare namespace hoistNonReactStatics { - type NonReactStatics = {[X in Exclude]: T[X]} + type NonReactStatics = {[X in Exclude]: T[X]} } export = hoistNonReactStatics; // @filename: node_modules/styled-components/index.d.ts diff --git a/tests/cases/compiler/declarationEmitSimpleComputedNames1.ts b/tests/cases/compiler/declarationEmitSimpleComputedNames1.ts index a0c53eb92b0f7..cd50b1489e153 100644 --- a/tests/cases/compiler/declarationEmitSimpleComputedNames1.ts +++ b/tests/cases/compiler/declarationEmitSimpleComputedNames1.ts @@ -3,7 +3,7 @@ // @declaration: true export const fieldName = Math.random() > 0.5 ? "f1" : "f2"; -export const conatainer = { +export const container = { [fieldName]() { return "result"; } diff --git a/tests/cases/compiler/declareDottedModuleName.ts b/tests/cases/compiler/declareDottedModuleName.ts index fdbb310242174..f65116305d5d3 100644 --- a/tests/cases/compiler/declareDottedModuleName.ts +++ b/tests/cases/compiler/declareDottedModuleName.ts @@ -1,7 +1,7 @@ // @target: es2015 // @declaration: true namespace M { - namespace P.Q { } // This shouldnt be emitted + namespace P.Q { } // This shouldn't be emitted } namespace M { diff --git a/tests/cases/compiler/deeplyDependentLargeArrayMutation2.ts b/tests/cases/compiler/deeplyDependentLargeArrayMutation2.ts index 11ee48246bcf8..b3484ffe21067 100644 --- a/tests/cases/compiler/deeplyDependentLargeArrayMutation2.ts +++ b/tests/cases/compiler/deeplyDependentLargeArrayMutation2.ts @@ -7,7 +7,7 @@ // Looking at this test and thinking "that's silly, nobody would write code like that" and thinking it's OK to break this test? // You'd be wrong - https://raw.githubusercontent.com/archilogic-com/3dio-js/master/build/3dio.js and plenty of other codebases // have js code exactly like this! This pattern (even at this size!) with a few more embellishments is a common way to encode -// polygons or verticies into a buffer from a formulaic object definition! So while this is a lot more regular than a real piece +// polygons or vertices into a buffer from a formulaic object definition! So while this is a lot more regular than a real piece // of code, this is still representative of a common pattern. function build() { let i = 0; diff --git a/tests/cases/compiler/destructuringTypeGuardFlow.ts b/tests/cases/compiler/destructuringTypeGuardFlow.ts index 4f7c38e53f99a..11b6b5dd5e2bf 100644 --- a/tests/cases/compiler/destructuringTypeGuardFlow.ts +++ b/tests/cases/compiler/destructuringTypeGuardFlow.ts @@ -16,7 +16,7 @@ if (aFoo.bar && aFoo.nested.b) { const right: number = aFoo.bar; const wrong: number = bar; const another: string = baz; - const aAgain: number = a; + const again: number = a; const bAgain: string = text; } @@ -32,6 +32,6 @@ if (bBar.elem2 && bBar.elem2.bar && bBar.elem2.nested.b) { const right: number = bBar.elem2.bar; const wrong: number = bar; const another: string = baz; - const aAgain: number = a; + const again: number = a; const bAgain: string = text; } diff --git a/tests/cases/compiler/enumMemberNameNonIdentifier.ts b/tests/cases/compiler/enumMemberNameNonIdentifier.ts index 8e09aa9f8d0ba..3a64d8300e892 100644 --- a/tests/cases/compiler/enumMemberNameNonIdentifier.ts +++ b/tests/cases/compiler/enumMemberNameNonIdentifier.ts @@ -5,7 +5,7 @@ export const enum E { "hyphen-member" = 1, "123startsWithNumber" = 2, "has space" = 3, - // Greek Capital Yot (U+037F) - valid identifier in ES2015+ but NOT in ES5 + // Greek Capital Yacht (U+037F) - valid identifier in ES2015+ but NOT in ES5 Ϳ = 4, } diff --git a/tests/cases/compiler/erasableSyntaxOnly.ts b/tests/cases/compiler/erasableSyntaxOnly.ts index bb847009f2f2f..8d635df226bdd 100644 --- a/tests/cases/compiler/erasableSyntaxOnly.ts +++ b/tests/cases/compiler/erasableSyntaxOnly.ts @@ -40,7 +40,7 @@ class MyClassOk { constructor(foo: string) { } } -// Note for implementors: This should not be an error +// Note for implementers: This should not be an error // as this entire namespace block is fully erased namespace NotInstantiated { export interface JustAType { } diff --git a/tests/cases/compiler/errorsInGenericTypeReference.ts b/tests/cases/compiler/errorsInGenericTypeReference.ts index dc5a13bf7951a..7f0ae2e64a265 100644 --- a/tests/cases/compiler/errorsInGenericTypeReference.ts +++ b/tests/cases/compiler/errorsInGenericTypeReference.ts @@ -33,7 +33,7 @@ class testClass3 { function testFunction1(): Foo<{ x: V }> { return null; } // error: could not find symbol V -// in paramter types +// in parameter types function testFunction2(p: Foo<{ x: V }>) { }// error: could not find symbol V diff --git a/tests/cases/compiler/es6ClassTest2.ts b/tests/cases/compiler/es6ClassTest2.ts index a64d7271e8fff..c57675c722e01 100644 --- a/tests/cases/compiler/es6ClassTest2.ts +++ b/tests/cases/compiler/es6ClassTest2.ts @@ -110,7 +110,7 @@ class SuperChild extends SuperParent { } } -class Statics { +class Statistics { static foo = 1; static bar: string; @@ -119,7 +119,7 @@ class Statics { } } -var stat = new Statics(); +var stat = new Statistics(); interface IFoo { x: number; diff --git a/tests/cases/compiler/es6ImportNamedImportMergeErrors.ts b/tests/cases/compiler/es6ImportNamedImportMergeErrors.ts index 3c8b0cc49b4f6..5229fd5cf04a4 100644 --- a/tests/cases/compiler/es6ImportNamedImportMergeErrors.ts +++ b/tests/cases/compiler/es6ImportNamedImportMergeErrors.ts @@ -9,9 +9,9 @@ export var z1 = a; // @filename: es6ImportNamedImportMergeErrors_1.ts import { a } from "./es6ImportNamedImportMergeErrors_0"; -interface a { } // shouldnt be error +interface a { } // shouldn't be error import { x as x1 } from "./es6ImportNamedImportMergeErrors_0"; -interface x1 { } // shouldnt be error +interface x1 { } // shouldn't be error import { x } from "./es6ImportNamedImportMergeErrors_0"; // should be error var x = 10; import { x as x44 } from "./es6ImportNamedImportMergeErrors_0"; // should be error diff --git a/tests/cases/compiler/es6ImportNamedImportWithTypesAndValues.ts b/tests/cases/compiler/es6ImportNamedImportWithTypesAndValues.ts index ca8a0e9003a47..86651d422ef51 100644 --- a/tests/cases/compiler/es6ImportNamedImportWithTypesAndValues.ts +++ b/tests/cases/compiler/es6ImportNamedImportWithTypesAndValues.ts @@ -17,6 +17,6 @@ export class C2 implements I2 { } // @filename: client.ts -import { C, I, C2 } from "./server"; // Shouldnt emit I and C2 into the js file and emit C and I in .d.ts file +import { C, I, C2 } from "./server"; // Shouldn't emit I and C2 into the js file and emit C and I in .d.ts file export type cValInterface = I; export var cVal = new C(); \ No newline at end of file diff --git a/tests/cases/compiler/escapedIdentifiers.ts b/tests/cases/compiler/escapedIdentifiers.ts index daf9d2c1ffe2e..a28d2f6764576 100644 --- a/tests/cases/compiler/escapedIdentifiers.ts +++ b/tests/cases/compiler/escapedIdentifiers.ts @@ -92,7 +92,7 @@ constructorTestObject.arg2 = 'string'; constructorTestObject.arg\u0033 = true; constructorTestObject.arg4 = 2; -// Lables +// Labels l\u0061bel1: while (false) diff --git a/tests/cases/compiler/expandoFunctionNestedAssigments.ts b/tests/cases/compiler/expandoFunctionNestedAssigments.ts index fcdd7ecf3f82c..b9f2f565ae735 100644 --- a/tests/cases/compiler/expandoFunctionNestedAssigments.ts +++ b/tests/cases/compiler/expandoFunctionNestedAssigments.ts @@ -48,7 +48,7 @@ for(let f of (Foo.forOf = []) ){ } -for(let f in (Foo.forIn = []) ){ +for(let f in (Foo.foreign = []) ){ Foo.fromForInBody = 1; { Foo.fromForInBodyNested = 1; diff --git a/tests/cases/compiler/expandoFunctionNestedAssigmentsDeclared.ts b/tests/cases/compiler/expandoFunctionNestedAssigmentsDeclared.ts index 325d0f4d1a298..eb99c0aa15670 100644 --- a/tests/cases/compiler/expandoFunctionNestedAssigmentsDeclared.ts +++ b/tests/cases/compiler/expandoFunctionNestedAssigmentsDeclared.ts @@ -28,7 +28,7 @@ declare namespace Foo { var forOf: any[]; var fromForOfBody: number; var fromForOfBodyNested: number; - var forIn: any[]; + var foreign: any[]; var fromForInBody: number; var fromForInBodyNested: number; } @@ -68,7 +68,7 @@ for(let f of (Foo.forOf = []) ){ } -for(let f in (Foo.forIn = []) ){ +for(let f in (Foo.foreign = []) ){ Foo.fromForInBody = 1; { Foo.fromForInBodyNested = 1; diff --git a/tests/cases/compiler/exportImportCanSubstituteConstEnumForValue.ts b/tests/cases/compiler/exportImportCanSubstituteConstEnumForValue.ts index c2a76604102fd..5f2265cc8bb8f 100644 --- a/tests/cases/compiler/exportImportCanSubstituteConstEnumForValue.ts +++ b/tests/cases/compiler/exportImportCanSubstituteConstEnumForValue.ts @@ -39,12 +39,12 @@ namespace MsPortalFx.ViewModels { export import ReExportedEnum = Dialogs.DialogResult; /** - * Not exported to show difference. No javascript is emmitted (as expected) + * Not exported to show difference. No javascript is emitted (as expected) */ import DialogButtons = Dialogs.MessageBoxButtons; /** - * Re-exporting a function type to show difference. No javascript is emmitted (as expected) + * Re-exporting a function type to show difference. No javascript is emitted (as expected) */ export import Callback = Dialogs.DialogResultCallback; diff --git a/tests/cases/compiler/exportImportMultipleFiles.ts b/tests/cases/compiler/exportImportMultipleFiles.ts index 6d9cd24a5413e..4d01e75bfac6d 100644 --- a/tests/cases/compiler/exportImportMultipleFiles.ts +++ b/tests/cases/compiler/exportImportMultipleFiles.ts @@ -10,4 +10,4 @@ math.add(3, 4); // OK // @Filename: exportImportMultipleFiles_userCode.ts import lib = require('./exportImportMultipleFiles_library'); -lib.math.add(3, 4); // Shouldnt be error +lib.math.add(3, 4); // Shouldn't be error diff --git a/tests/cases/compiler/extendGlobalThis.ts b/tests/cases/compiler/extendGlobalThis.ts index 11d931c47905c..88de320723d38 100644 --- a/tests/cases/compiler/extendGlobalThis.ts +++ b/tests/cases/compiler/extendGlobalThis.ts @@ -11,7 +11,7 @@ declare global { export {} // @filename: index.ts -import "./extention"; +import "./extension"; globalThis.tests = "a-b"; console.log(globalThis.test.split("-")); diff --git a/tests/cases/compiler/fatarrowfunctionsOptionalArgs.ts b/tests/cases/compiler/fatarrowfunctionsOptionalArgs.ts index 06cfe6bfb137a..31c6af8a901dd 100644 --- a/tests/cases/compiler/fatarrowfunctionsOptionalArgs.ts +++ b/tests/cases/compiler/fatarrowfunctionsOptionalArgs.ts @@ -51,7 +51,7 @@ arg => 2; // in multiple paren (((((arg) => { return 32; })))); -// in ternary exression +// in ternary expression false ? () => 41 : null; false ? (arg) => 42 : null; false ? (arg = 1) => 43 : null; @@ -61,7 +61,7 @@ false ? (arg?: number) => 46 : null; false ? (arg?: number = 0) => 47 : null; false ? (...arg: number[]) => 48 : null; -// in ternary exression within paren +// in ternary expression within paren false ? (() => 51) : null; false ? ((arg) => 52) : null; false ? ((arg = 1) => 53) : null; diff --git a/tests/cases/compiler/genericDefaults.ts b/tests/cases/compiler/genericDefaults.ts index dd4cc4f6bab18..11ec0674c354b 100644 --- a/tests/cases/compiler/genericDefaults.ts +++ b/tests/cases/compiler/genericDefaults.ts @@ -30,7 +30,7 @@ f01(a); f01(); f01(a); -// function with a type paramter with a default +// function with a type parameter with a default declare function f02(a?: T): T; // inference f02(); @@ -54,7 +54,7 @@ f03(a); f03(); f03(b); -// function with a type paramter without a default and a type parameter with a default +// function with a type parameter without a default and a type parameter with a default declare function f04(a?: T, b?: U): [T, U]; // inference f04(); diff --git a/tests/cases/compiler/genericFunctionInference2.ts b/tests/cases/compiler/genericFunctionInference2.ts index 725778087f158..fbf957790d070 100644 --- a/tests/cases/compiler/genericFunctionInference2.ts +++ b/tests/cases/compiler/genericFunctionInference2.ts @@ -17,13 +17,13 @@ const myReducer2 = combineReducers({ // Repro from #30942 -declare function withH(handlerCreators: HandleCreatorsFactory): U; +declare function with(handlerCreators: HandleCreatorsFactory): U; type Props = { out: number } type HandleCreatorsFactory = (initialProps: T) => { [P in keyof U]: (props: T) => U[P] }; -const enhancer4 = withH((props: Props) => ({ +const enhancer4 = with((props: Props) => ({ onChange: (props) => (e: any) => {}, onSubmit: (props) => (e: any) => {}, })); diff --git a/tests/cases/compiler/genericSpecializations1.ts b/tests/cases/compiler/genericSpecializations1.ts index 142f8dee711e8..4d7467daa079d 100644 --- a/tests/cases/compiler/genericSpecializations1.ts +++ b/tests/cases/compiler/genericSpecializations1.ts @@ -1,6 +1,6 @@ // @target: es2015 interface IFoo { - foo(x: T): T; // no error on implementors because IFoo's T is different from foo's T + foo(x: T): T; // no error on implementers because IFoo's T is different from foo's T } class IntFooBad implements IFoo { diff --git a/tests/cases/compiler/genericSpecializations2.ts b/tests/cases/compiler/genericSpecializations2.ts index 6c5267284d000..3d7f5018746c5 100644 --- a/tests/cases/compiler/genericSpecializations2.ts +++ b/tests/cases/compiler/genericSpecializations2.ts @@ -1,6 +1,6 @@ // @target: es2015 class IFoo { - foo(x: T): T { // no error on implementors because IFoo's T is different from foo's T + foo(x: T): T { // no error on implementers because IFoo's T is different from foo's T return null; } } diff --git a/tests/cases/compiler/implicitAnyInAmbientDeclaration2.d.ts b/tests/cases/compiler/implicitAnyInAmbientDeclaration2.d.ts index 858e171ff98e8..1d1bfd8c20be1 100644 --- a/tests/cases/compiler/implicitAnyInAmbientDeclaration2.d.ts +++ b/tests/cases/compiler/implicitAnyInAmbientDeclaration2.d.ts @@ -1,7 +1,7 @@ // @target: es2015 //@noimplicitany: true declare function foo(x); // this should be an error -declare var bar; // this should be be an erro +declare var bar; // this should be be an error declare class C { public publicMember; // this should be an error private privateMember; // this should not be an error diff --git a/tests/cases/compiler/importExportInternalComments.ts b/tests/cases/compiler/importExportInternalComments.ts index 64119078f3d29..968a77b5abcd9 100644 --- a/tests/cases/compiler/importExportInternalComments.ts +++ b/tests/cases/compiler/importExportInternalComments.ts @@ -9,7 +9,7 @@ declare module "foo"; /*1*/ import /*2*/ D /*3*/, /*4*/ { /*5*/ A /*6*/, /*7*/ B /*8*/ as /*9*/ C /*10*/ } /*11*/ from /*12*/ "foo"; /*1*/ import /*2*/ * /*3*/ as /*4*/ foo /*5*/ from /*6*/ "foo"; -void D, A, C, foo; // Use the variables to prevent ellision +void D, A, C, foo; // Use the variables to prevent elision /*1*/ export /*2*/ { /*3*/ A /*4*/, /*5*/ B /*6*/ as /*7*/ C /*8*/ } /*9*/ from /*10*/ "foo"; /*1*/ export /*2*/ * /*3*/ from /*4*/ "foo" \ No newline at end of file diff --git a/tests/cases/compiler/inDoesNotOperateOnPrimitiveTypes.ts b/tests/cases/compiler/inDoesNotOperateOnPrimitiveTypes.ts index 293c1796c23f5..3bc64a4dd663d 100644 --- a/tests/cases/compiler/inDoesNotOperateOnPrimitiveTypes.ts +++ b/tests/cases/compiler/inDoesNotOperateOnPrimitiveTypes.ts @@ -48,7 +48,7 @@ function union5(p: T | U) // and it adds a lot of complexity to distinguish between a `T | U` where // one constraint is non-primitive and the other is primitive and a `T | U` // like this where both constraints have primitive and non-primitive - // constitutents. Also, the strictly sound behavior would be to error + // constituents. Also, the strictly sound behavior would be to error // here, which is what's happening, so "fixing" this by suppressing the // error seems very low-value. "key" in p; @@ -62,5 +62,5 @@ function intersection1(thing: T & U) { } function intersection2(thing: T & (0 | 1 | 2)) { - "key" in thing; // Error (because all possible instantations are errors) + "key" in thing; // Error (because all possible instantiations are errors) } diff --git a/tests/cases/compiler/inferSetterParamType.ts b/tests/cases/compiler/inferSetterParamType.ts index f8e338fd7109d..264cfa9d8f30c 100644 --- a/tests/cases/compiler/inferSetterParamType.ts +++ b/tests/cases/compiler/inferSetterParamType.ts @@ -11,7 +11,7 @@ class Foo { class Foo2 { get bar() { - return 0; // should be an error - can't coerce infered return type to match setter annotated type + return 0; // should be an error - can't coerce inferred return type to match setter annotated type } set bar(n:string) { } diff --git a/tests/cases/compiler/infinitelyExpandingOverloads.ts b/tests/cases/compiler/infinitelyExpandingOverloads.ts index 873ecacedd568..6584d09fadd44 100644 --- a/tests/cases/compiler/infinitelyExpandingOverloads.ts +++ b/tests/cases/compiler/infinitelyExpandingOverloads.ts @@ -18,7 +18,7 @@ class ViewModel { public validationPlacements: Array> = new Array>(); } class Widget { - constructor(viewModelType: new () => ViewModel); // Shouldnt error on this overload + constructor(viewModelType: new () => ViewModel); // Shouldn't error on this overload constructor(viewModelType: new () => ViewModel) { } public get options(): ViewModel { diff --git a/tests/cases/compiler/interfaceMergedUnconstrainedNoErrorIrrespectiveOfOrder.ts b/tests/cases/compiler/interfaceMergedUnconstrainedNoErrorIrrespectiveOfOrder.ts index 013987c21cdcb..70a0f5594beb2 100644 --- a/tests/cases/compiler/interfaceMergedUnconstrainedNoErrorIrrespectiveOfOrder.ts +++ b/tests/cases/compiler/interfaceMergedUnconstrainedNoErrorIrrespectiveOfOrder.ts @@ -1,6 +1,6 @@ // @target: es2015 // @filename: working.ts -// minmal samples from #33395 +// minimal samples from #33395 export namespace ns { interface Function any> { throttle(): Function; diff --git a/tests/cases/compiler/jsEmitIntersectionProperty.ts b/tests/cases/compiler/jsEmitIntersectionProperty.ts index 00ad9dda6b5cb..a02cde0b04d33 100644 --- a/tests/cases/compiler/jsEmitIntersectionProperty.ts +++ b/tests/cases/compiler/jsEmitIntersectionProperty.ts @@ -13,14 +13,14 @@ declare class CoreObject { static extend< - Statics, + Statistics, Instance extends B1, T1, B1 >( - this: Statics & { new(): Instance }, + this: Statistics & { new(): Instance }, arg1: T1 - ): Readonly & { new(): T1 & Instance }; + ): Readonly & { new(): T1 & Instance }; toString(): string; } diff --git a/tests/cases/compiler/jsdocPropertyTagInvalid.ts b/tests/cases/compiler/jsdocPropertyTagInvalid.ts index 6711497c764ff..4f0e0641fb9f0 100644 --- a/tests/cases/compiler/jsdocPropertyTagInvalid.ts +++ b/tests/cases/compiler/jsdocPropertyTagInvalid.ts @@ -6,7 +6,7 @@ // @Filename: /a.js /** * @typedef MyType - * @property {sting} [x] + * @property {string} [x] */ /** @param {MyType} p */ diff --git a/tests/cases/compiler/jsxIntrinsicElementsTypeArgumentErrors.tsx b/tests/cases/compiler/jsxIntrinsicElementsTypeArgumentErrors.tsx index 35ac2cef68a42..127d55b61527c 100644 --- a/tests/cases/compiler/jsxIntrinsicElementsTypeArgumentErrors.tsx +++ b/tests/cases/compiler/jsxIntrinsicElementsTypeArgumentErrors.tsx @@ -8,7 +8,7 @@ const a = >; // empty type args const b = >; // trailing comma type args -const c = >; // nonexistant type args +const c = >; // nonexistent type args const d = >>; // nested missing type args @@ -21,7 +21,7 @@ const g = />; // empty type args const h = />; // trailing comma type args -const i = />; // nonexistant type args +const i = />; // nonexistent type args const j = >/>; // nested missing type args diff --git a/tests/cases/compiler/jsxNamespacePrefixInName.tsx b/tests/cases/compiler/jsxNamespacePrefixInName.tsx index 890a2b991f59c..01790fed667c5 100644 --- a/tests/cases/compiler/jsxNamespacePrefixInName.tsx +++ b/tests/cases/compiler/jsxNamespacePrefixInName.tsx @@ -7,11 +7,11 @@ var justElement3 = ; var justElement4 = {"text"}; var justElement5 = {"text"}; -var tooManySeparators1 = ; -var tooManySeparators2 = ; -var tooManySeparators3 = ; -var tooManySeparators4 = {"text"}; -var tooManySeparators5 = {"text"}; +var tooManySeparators1 = ; +var tooManySeparators2 = ; +var tooManySeparators3 = ; +var tooManySeparators4 = {"text"}; +var tooManySeparators5 = {"text"}; var justAttribute1 = ; var justAttribute2 = ; @@ -28,4 +28,4 @@ var beginOfIdent1 = <:a attr={"value"} />; var beginOfIdent2 = ; var upcaseComponent1 = ; // Parsed as intrinsic -var upcaseComponent2 = ; // Parsed as instrinsic +var upcaseComponent2 = ; // Parsed as intrinsic diff --git a/tests/cases/compiler/jsxNamespacePrefixInNameReact.tsx b/tests/cases/compiler/jsxNamespacePrefixInNameReact.tsx index 0cca3fca146ff..7235dfe65142d 100644 --- a/tests/cases/compiler/jsxNamespacePrefixInNameReact.tsx +++ b/tests/cases/compiler/jsxNamespacePrefixInNameReact.tsx @@ -8,11 +8,11 @@ var justElement3 = ; var justElement4 = {"text"}; var justElement5 = {"text"}; -var tooManySeparators1 = ; -var tooManySeparators2 = ; -var tooManySeparators3 = ; -var tooManySeparators4 = {"text"}; -var tooManySeparators5 = {"text"}; +var tooManySeparators1 = ; +var tooManySeparators2 = ; +var tooManySeparators3 = ; +var tooManySeparators4 = {"text"}; +var tooManySeparators5 = {"text"}; var justAttribute1 = ; var justAttribute2 = ; @@ -29,4 +29,4 @@ var beginOfIdent1 = <:a attr={"value"} />; var beginOfIdent2 = ; var upcaseComponent1 = ; // Parsed as intrinsic -var upcaseComponent2 = ; // Parsed as instrinsic +var upcaseComponent2 = ; // Parsed as intrinsic diff --git a/tests/cases/compiler/missingFunctionImplementation.ts b/tests/cases/compiler/missingFunctionImplementation.ts index 4d923efcd3682..fbafc22b37232 100644 --- a/tests/cases/compiler/missingFunctionImplementation.ts +++ b/tests/cases/compiler/missingFunctionImplementation.ts @@ -70,7 +70,7 @@ namespace N10 { export function m(a): void { } } -// merged namespaces, duplicate defintions +// merged namespaces, duplicate definitions namespace N12 { export function m(a): void; export function m(): void; diff --git a/tests/cases/compiler/mixinPrivateAndProtected.ts b/tests/cases/compiler/mixinPrivateAndProtected.ts index 59fe53960c349..cfefb893c5fc8 100644 --- a/tests/cases/compiler/mixinPrivateAndProtected.ts +++ b/tests/cases/compiler/mixinPrivateAndProtected.ts @@ -5,20 +5,20 @@ type Constructor = new(...args: any[]) => T; class A { public pb: number = 2; - protected ptd: number = 1; + protected pdf: number = 1; private pvt: number = 0; } function mixB>(Cls: T) { return class extends Cls { - protected ptd: number = 10; + protected pdf: number = 10; private pvt: number = 0; }; } function mixB2>(Cls: T) { return class extends Cls { - protected ptd: number = 10; + protected pdf: number = 10; }; } @@ -28,7 +28,7 @@ const function mixC>(Cls: T) { return class extends Cls { - protected ptd: number = 100; + protected pdf: number = 100; private pvt: number = 0; }; } @@ -44,19 +44,19 @@ const ab2c = new AB2C(); a.pb.toFixed(); -a.ptd.toFixed(); // Error +a.pdf.toFixed(); // Error a.pvt.toFixed(); // Error ab.pb.toFixed(); -ab.ptd.toFixed(); // Error +ab.pdf.toFixed(); // Error ab.pvt.toFixed(); // Error abc.pb.toFixed(); -abc.ptd.toFixed(); // Error +abc.pdf.toFixed(); // Error abc.pvt.toFixed(); // Error ab2c.pb.toFixed(); -ab2c.ptd.toFixed(); // Error +ab2c.pdf.toFixed(); // Error ab2c.pvt.toFixed(); // Error // Repro from #13924 diff --git a/tests/cases/compiler/nestedCallbackErrorNotFlattened.ts b/tests/cases/compiler/nestedCallbackErrorNotFlattened.ts index e23a4e3fb329b..1052a2362307f 100644 --- a/tests/cases/compiler/nestedCallbackErrorNotFlattened.ts +++ b/tests/cases/compiler/nestedCallbackErrorNotFlattened.ts @@ -3,6 +3,6 @@ type Cb = {noAlias: () => T}["noAlias"]; // `"noAlias"` here prevents an alias symbol from being made // which means the comparison will definitely be structural, rather than by variance -declare const x: Cb>>>; // one more layer of `Cb` adn we'd get a `true` from the deeply-nested symbol check +declare const x: Cb>>>; // one more layer of `Cb` and we'd get a `true` from the deeply-nested symbol check declare let y: Cb>>>; y = x; \ No newline at end of file diff --git a/tests/cases/compiler/noImplicitReturnsInAsync2.ts b/tests/cases/compiler/noImplicitReturnsInAsync2.ts index 25ac1fefc3d29..ca04f8aa6b11d 100644 --- a/tests/cases/compiler/noImplicitReturnsInAsync2.ts +++ b/tests/cases/compiler/noImplicitReturnsInAsync2.ts @@ -31,7 +31,7 @@ async function test6(isError: boolean = true): Promise { } } -// infered to be Promise, should not be an error, currently reported correctly +// inferred to be Promise, should not be an error, currently reported correctly async function test7(isError: boolean = true) { if (isError === true) { return; diff --git a/tests/cases/compiler/nodeNextPackageSelfNameWithOutDirDeclDirCompositeNestedDirs.ts b/tests/cases/compiler/nodeNextPackageSelfNameWithOutDirDeclDirCompositeNestedDirs.ts index a104a86023cc6..b0db40fadf02c 100644 --- a/tests/cases/compiler/nodeNextPackageSelfNameWithOutDirDeclDirCompositeNestedDirs.ts +++ b/tests/cases/compiler/nodeNextPackageSelfNameWithOutDirDeclDirCompositeNestedDirs.ts @@ -26,7 +26,7 @@ export {srcthing as thing} from "./src/thing.js"; // The following import should cause `index.ts` // to be included in the build, which will, // in turn, cause the common src directory to not be `src` -// (the harness is wierd here in that noImplicitReferences makes only +// (the harness is weird here in that noImplicitReferences makes only // this file get loaded as an entrypoint and emitted, while on the // real command-line we'll crawl the imports for that set - a limitation // of the harness, I suppose) diff --git a/tests/cases/compiler/nodeNextPackageSelfNameWithOutDirDeclDirNestedDirs.ts b/tests/cases/compiler/nodeNextPackageSelfNameWithOutDirDeclDirNestedDirs.ts index 68948b08471f3..9bd960dbf543c 100644 --- a/tests/cases/compiler/nodeNextPackageSelfNameWithOutDirDeclDirNestedDirs.ts +++ b/tests/cases/compiler/nodeNextPackageSelfNameWithOutDirDeclDirNestedDirs.ts @@ -26,7 +26,7 @@ export {srcthing as thing} from "./src/thing.js"; // The following import should cause `index.ts` // to be included in the build, which will, // in turn, cause the common src directory to not be `src` -// (the harness is wierd here in that noImplicitReferences makes only +// (the harness is weird here in that noImplicitReferences makes only // this file get loaded as an entrypoint and emitted, while on the // real command-line we'll crawl the imports for that set - a limitation // of the harness, I suppose) diff --git a/tests/cases/compiler/nonContextuallyTypedLogicalOr.ts b/tests/cases/compiler/nonContextuallyTypedLogicalOr.ts index 5e376bc1ef167..87965ce2103ac 100644 --- a/tests/cases/compiler/nonContextuallyTypedLogicalOr.ts +++ b/tests/cases/compiler/nonContextuallyTypedLogicalOr.ts @@ -5,12 +5,12 @@ interface Contextual { p?: number; } -interface Ellement { +interface Element { dummy; p: any; } var c: Contextual; -var e: Ellement; +var e: Element; (c || e).dummy; \ No newline at end of file diff --git a/tests/cases/compiler/quickinfoTypeAtReturnPositionsInaccurate.ts b/tests/cases/compiler/quickinfoTypeAtReturnPositionsInaccurate.ts index d1ae5a7e6026f..49bbc0ced93bf 100644 --- a/tests/cases/compiler/quickinfoTypeAtReturnPositionsInaccurate.ts +++ b/tests/cases/compiler/quickinfoTypeAtReturnPositionsInaccurate.ts @@ -81,7 +81,7 @@ class ComplexStore { if (isNumClass(item)) { return item; } - // it seems like the compiler asumes the above condition is always + // it seems like the compiler assumes the above condition is always // truthy item.get(); diff --git a/tests/cases/compiler/reassignStaticProp.ts b/tests/cases/compiler/reassignStaticProp.ts index d50798a1de679..aae762d642251 100644 --- a/tests/cases/compiler/reassignStaticProp.ts +++ b/tests/cases/compiler/reassignStaticProp.ts @@ -3,7 +3,7 @@ class foo { static bar = 1; - static bar:string; // errror - duplicate id + static bar:string; // error - duplicate id } diff --git a/tests/cases/compiler/recursiveConditionalCrash3.ts b/tests/cases/compiler/recursiveConditionalCrash3.ts index 8299e20e7c771..4b2084fdf4f52 100644 --- a/tests/cases/compiler/recursiveConditionalCrash3.ts +++ b/tests/cases/compiler/recursiveConditionalCrash3.ts @@ -54,7 +54,7 @@ type SplitWithAllPossibleCombinations = /** - * This function will return all possibile keys that can be expanded on T, only to the N deep level + * This function will return all possible keys that can be expanded on T, only to the N deep level */ type KeysCanBeExpanded_ = N extends Depth['length'] ? never : T extends CanBeExpanded ? diff --git a/tests/cases/compiler/resolvingClassDeclarationWhenInBaseTypeResolution.ts b/tests/cases/compiler/resolvingClassDeclarationWhenInBaseTypeResolution.ts index f53fbe19eb411..55470e5dfda93 100644 --- a/tests/cases/compiler/resolvingClassDeclarationWhenInBaseTypeResolution.ts +++ b/tests/cases/compiler/resolvingClassDeclarationWhenInBaseTypeResolution.ts @@ -5,7 +5,7 @@ namespace rionegrensis { export class caniventer extends Lanthanum.nitidus { salomonseni() : caniventer { var x : caniventer; () => { var y = this; }; return x; } uchidai() : lavali.xanthognathus { var x : lavali.xanthognathus; () => { var y = this; }; return x; } - raffrayana() : lavali.otion { var x : lavali.otion; () => { var y = this; }; return x; } + raffrayana() : lavali.option { var x : lavali.option; () => { var y = this; }; return x; } Uranium() : minutus.inez, trivirgatus.falconeri> { var x : minutus.inez, trivirgatus.falconeri>; () => { var y = this; }; return x; } nayaur() : gabriellae.amicus { var x : gabriellae.amicus; () => { var y = this; }; return x; } } @@ -29,7 +29,7 @@ namespace julianae { } export class galapagoensis { isabellae() : panglima.amphibius { var x : panglima.amphibius; () => { var y = this; }; return x; } - rueppellii() : ruatanica.americanus { var x : ruatanica.americanus; () => { var y = this; }; return x; } + rueppellii() : ruatanica.americans { var x : ruatanica.americans; () => { var y = this; }; return x; } peregusna() : dogramacii.kaiseri { var x : dogramacii.kaiseri; () => { var y = this; }; return x; } gliroides() : howi.coludo { var x : howi.coludo; () => { var y = this; }; return x; } banakrisi() : macrorhinos.daphaenodon { var x : macrorhinos.daphaenodon; () => { var y = this; }; return x; } @@ -43,7 +43,7 @@ namespace julianae { hirta() : Lanthanum.jugularis { var x : Lanthanum.jugularis; () => { var y = this; }; return x; } virginianus() : durangae { var x : durangae; () => { var y = this; }; return x; } macrophyllum() : howi.marcanoi { var x : howi.marcanoi; () => { var y = this; }; return x; } - porcellus() : ruatanica.americanus { var x : ruatanica.americanus; () => { var y = this; }; return x; } + porcellus() : ruatanica.americans { var x : ruatanica.americans; () => { var y = this; }; return x; } } export class oralis extends caurinus.psilurus { cepapi() : caurinus.psilurus { var x : caurinus.psilurus; () => { var y = this; }; return x; } @@ -56,7 +56,7 @@ namespace julianae { monax() : imperfecta.subspinosus { var x : imperfecta.subspinosus; () => { var y = this; }; return x; } unalascensis() : minutus.inez, gabriellae.echinatus>, dogramacii.aurata> { var x : minutus.inez, gabriellae.echinatus>, dogramacii.aurata>; () => { var y = this; }; return x; } wuchihensis() : howi.angulatus, petrophilus.minutilla> { var x : howi.angulatus, petrophilus.minutilla>; () => { var y = this; }; return x; } - leucippe() : lavali.otion { var x : lavali.otion; () => { var y = this; }; return x; } + leucippe() : lavali.option { var x : lavali.option; () => { var y = this; }; return x; } ordii() : daubentonii.arboreus { var x : daubentonii.arboreus; () => { var y = this; }; return x; } eisentrauti() : rendalli.zuluensis { var x : rendalli.zuluensis; () => { var y = this; }; return x; } } @@ -84,9 +84,9 @@ namespace julianae { } export class acariensis { levicula() : lavali.lepturus { var x : lavali.lepturus; () => { var y = this; }; return x; } - minous() : argurus.dauricus { var x : argurus.dauricus; () => { var y = this; }; return x; } - cinereiventer() : panamensis.setulosus { var x : panamensis.setulosus; () => { var y = this; }; return x; } - longicaudatus() : macrorhinos.marmosurus> { var x : macrorhinos.marmosurus>; () => { var y = this; }; return x; } + minous() : argurus.dauricus { var x : argurus.dauricus; () => { var y = this; }; return x; } + cinereiventer() : panamensis.setulosus { var x : panamensis.setulosus; () => { var y = this; }; return x; } + longicaudatus() : macrorhinos.marmosurus> { var x : macrorhinos.marmosurus>; () => { var y = this; }; return x; } baeodon() : argurus.netscheri, argurus.luctuosa> { var x : argurus.netscheri, argurus.luctuosa>; () => { var y = this; }; return x; } soricoides() : argurus.luctuosa { var x : argurus.luctuosa; () => { var y = this; }; return x; } datae() : daubentonii.arboreus> { var x : daubentonii.arboreus>; () => { var y = this; }; return x; } @@ -122,7 +122,7 @@ namespace Lanthanum { dominicensis() : dammermani.melanops { var x : dammermani.melanops; () => { var y = this; }; return x; } taurus() : macrorhinos.konganensis { var x : macrorhinos.konganensis; () => { var y = this; }; return x; } tonganus() : argurus.netscheri { var x : argurus.netscheri; () => { var y = this; }; return x; } - silvatica() : rendalli.moojeni { var x : rendalli.moojeni; () => { var y = this; }; return x; } + silvatica() : rendalli.moojeni { var x : rendalli.moojeni; () => { var y = this; }; return x; } midas() : lavali.xanthognathus { var x : lavali.xanthognathus; () => { var y = this; }; return x; } bicornis() : dogramacii.kaiseri { var x : dogramacii.kaiseri; () => { var y = this; }; return x; } } @@ -141,7 +141,7 @@ namespace Lanthanum { revoili() : lavali.wilsoni { var x : lavali.wilsoni; () => { var y = this; }; return x; } macrobullatus() : macrorhinos.daphaenodon { var x : macrorhinos.daphaenodon; () => { var y = this; }; return x; } compactus() : sagitta.stolzmanni { var x : sagitta.stolzmanni; () => { var y = this; }; return x; } - talpinus() : nitidus { var x : nitidus; () => { var y = this; }; return x; } + talpinus() : nitidus { var x : nitidus; () => { var y = this; }; return x; } stramineus() : gabriellae.amicus { var x : gabriellae.amicus; () => { var y = this; }; return x; } dartmouthi() : trivirgatus.mixtus { var x : trivirgatus.mixtus; () => { var y = this; }; return x; } ogilbyi() : argurus.dauricus { var x : argurus.dauricus; () => { var y = this; }; return x; } @@ -160,18 +160,18 @@ namespace rendalli { occasius() : argurus.gilbertii { var x : argurus.gilbertii; () => { var y = this; }; return x; } damarensis() : julianae.galapagoensis { var x : julianae.galapagoensis; () => { var y = this; }; return x; } Neptunium() : panglima.abidi { var x : panglima.abidi; () => { var y = this; }; return x; } - griseoflavus() : ruatanica.americanus { var x : ruatanica.americanus; () => { var y = this; }; return x; } + griseoflavus() : ruatanica.americans { var x : ruatanica.americans; () => { var y = this; }; return x; } thar() : argurus.oreas { var x : argurus.oreas; () => { var y = this; }; return x; } alborufus() : panamensis.linulus { var x : panamensis.linulus; () => { var y = this; }; return x; } fusicaudus() : sagitta.stolzmanni { var x : sagitta.stolzmanni; () => { var y = this; }; return x; } - gordonorum() : howi.angulatus { var x : howi.angulatus; () => { var y = this; }; return x; } + gordonorum() : howi.angulatus { var x : howi.angulatus; () => { var y = this; }; return x; } ruber() : dammermani.siberu { var x : dammermani.siberu; () => { var y = this; }; return x; } desmarestianus() : julianae.steerii { var x : julianae.steerii; () => { var y = this; }; return x; } lutillus() : nigra.dolichurus { var x : nigra.dolichurus; () => { var y = this; }; return x; } salocco() : argurus.peninsulae { var x : argurus.peninsulae; () => { var y = this; }; return x; } } export class moojeni { - floweri() : lavali.otion { var x : lavali.otion; () => { var y = this; }; return x; } + floweri() : lavali.option { var x : lavali.option; () => { var y = this; }; return x; } montosa() : imperfecta.ciliolabrum { var x : imperfecta.ciliolabrum; () => { var y = this; }; return x; } miletus() : julianae.sumatrana { var x : julianae.sumatrana; () => { var y = this; }; return x; } heaneyi() : zuluensis { var x : zuluensis; () => { var y = this; }; return x; } @@ -184,7 +184,7 @@ namespace rendalli { } export class crenulata extends trivirgatus.falconeri { salvanius() : howi.coludo { var x : howi.coludo; () => { var y = this; }; return x; } - maritimus() : ruatanica.americanus { var x : ruatanica.americanus; () => { var y = this; }; return x; } + maritimus() : ruatanica.americans { var x : ruatanica.americans; () => { var y = this; }; return x; } edax() : lutreolus.cor>, rionegrensis.caniventer> { var x : lutreolus.cor>, rionegrensis.caniventer>; () => { var y = this; }; return x; } } } @@ -215,8 +215,8 @@ namespace trivirgatus { export class falconeri { cabrali() : rendalli.moojeni>, daubentonii.arboreus> { var x : rendalli.moojeni>, daubentonii.arboreus>; () => { var y = this; }; return x; } gouldi() : nigra.dolichurus>, patas.uralensis> { var x : nigra.dolichurus>, patas.uralensis>; () => { var y = this; }; return x; } - fuscicollis() : samarensis.pelurus> { var x : samarensis.pelurus>; () => { var y = this; }; return x; } - martiensseni() : sagitta.cinereus>, dogramacii.koepckeae> { var x : sagitta.cinereus>, dogramacii.koepckeae>; () => { var y = this; }; return x; } + fuscicollis() : samarensis.pelurus> { var x : samarensis.pelurus>; () => { var y = this; }; return x; } + martiensseni() : sagitta.cinereus>, dogramacii.koepckeae> { var x : sagitta.cinereus>, dogramacii.koepckeae>; () => { var y = this; }; return x; } gaoligongensis() : dogramacii.koepckeae { var x : dogramacii.koepckeae; () => { var y = this; }; return x; } shawi() : minutus.inez> { var x : minutus.inez>; () => { var y = this; }; return x; } gmelini() : rionegrensis.caniventer { var x : rionegrensis.caniventer; () => { var y = this; }; return x; } @@ -247,7 +247,7 @@ namespace quasiater { } } namespace ruatanica { - export class americanus extends imperfecta.ciliolabrum { + export class americans extends imperfecta.ciliolabrum { nasoloi() : macrorhinos.konganensis { var x : macrorhinos.konganensis; () => { var y = this; }; return x; } mystacalis() : howi.angulatus { var x : howi.angulatus; () => { var y = this; }; return x; } fardoulisi() : trivirgatus.oconnelli { var x : trivirgatus.oconnelli; () => { var y = this; }; return x; } @@ -272,7 +272,7 @@ namespace lavali { } export class beisa { } - export class otion extends howi.coludo { + export class option extends howi.coludo { bonaerensis() : provocax.melanoleuca { var x : provocax.melanoleuca; () => { var y = this; }; return x; } dussumieri() : nigra.gracilis { var x : nigra.gracilis; () => { var y = this; }; return x; } osvaldoreigi() : julianae.albidens { var x : julianae.albidens; () => { var y = this; }; return x; } @@ -297,7 +297,7 @@ namespace lavali { goudotii() : trivirgatus.falconeri { var x : trivirgatus.falconeri; () => { var y = this; }; return x; } pohlei() : Lanthanum.megalonyx { var x : Lanthanum.megalonyx; () => { var y = this; }; return x; } ineptus() : panamensis.setulosus { var x : panamensis.setulosus; () => { var y = this; }; return x; } - euryotis() : rendalli.moojeni> { var x : rendalli.moojeni>; () => { var y = this; }; return x; } + euryotis() : rendalli.moojeni> { var x : rendalli.moojeni>; () => { var y = this; }; return x; } maurisca() : Lanthanum.suillus { var x : Lanthanum.suillus; () => { var y = this; }; return x; } coyhaiquensis() : caurinus.mahaganus, panglima.abidi>, lutreolus.punicus> { var x : caurinus.mahaganus, panglima.abidi>, lutreolus.punicus>; () => { var y = this; }; return x; } } @@ -309,7 +309,7 @@ namespace lavali { roosmalenorum() : dogramacii.koepckeae { var x : dogramacii.koepckeae; () => { var y = this; }; return x; } rubicola() : rendalli.moojeni, gabriellae.echinatus>> { var x : rendalli.moojeni, gabriellae.echinatus>>; () => { var y = this; }; return x; } ikonnikovi() : argurus.luctuosa { var x : argurus.luctuosa; () => { var y = this; }; return x; } - paramicrus() : imperfecta.ciliolabrum> { var x : imperfecta.ciliolabrum>; () => { var y = this; }; return x; } + paramicrus() : imperfecta.ciliolabrum> { var x : imperfecta.ciliolabrum>; () => { var y = this; }; return x; } } export class lepturus extends Lanthanum.suillus { ferrumequinum() : argurus.netscheri { var x : argurus.netscheri; () => { var y = this; }; return x; } @@ -344,15 +344,15 @@ namespace dogramacii { Thulium() : julianae.durangae { var x : julianae.durangae; () => { var y = this; }; return x; } patrius() : Lanthanum.jugularis { var x : Lanthanum.jugularis; () => { var y = this; }; return x; } quadraticauda() : julianae.nudicaudus { var x : julianae.nudicaudus; () => { var y = this; }; return x; } - ater() : ruatanica.americanus { var x : ruatanica.americanus; () => { var y = this; }; return x; } + ater() : ruatanica.americans { var x : ruatanica.americans; () => { var y = this; }; return x; } } export class aurata { - grunniens() : nigra.gracilis, julianae.sumatrana>, ruatanica.americanus> { var x : nigra.gracilis, julianae.sumatrana>, ruatanica.americanus>; () => { var y = this; }; return x; } - howensis() : ruatanica.americanus { var x : ruatanica.americanus; () => { var y = this; }; return x; } + grunniens() : nigra.gracilis, julianae.sumatrana>, ruatanica.americans> { var x : nigra.gracilis, julianae.sumatrana>, ruatanica.americans>; () => { var y = this; }; return x; } + howensis() : ruatanica.americans { var x : ruatanica.americans; () => { var y = this; }; return x; } karlkoopmani() : caurinus.psilurus { var x : caurinus.psilurus; () => { var y = this; }; return x; } mirapitanga() : julianae.albidens { var x : julianae.albidens; () => { var y = this; }; return x; } ophiodon() : aurata { var x : aurata; () => { var y = this; }; return x; } - landeri() : samarensis.pelurus { var x : samarensis.pelurus; () => { var y = this; }; return x; } + landeri() : samarensis.pelurus { var x : samarensis.pelurus; () => { var y = this; }; return x; } sonomae() : trivirgatus.lotor, koepckeae> { var x : trivirgatus.lotor, koepckeae>; () => { var y = this; }; return x; } erythromos() : caurinus.johorensis, nigra.dolichurus> { var x : caurinus.johorensis, nigra.dolichurus>; () => { var y = this; }; return x; } } @@ -361,7 +361,7 @@ namespace lutreolus { export class schlegeli extends lavali.beisa { mittendorfi() : rionegrensis.caniventer { var x : rionegrensis.caniventer; () => { var y = this; }; return x; } blicki() : dogramacii.robustulus { var x : dogramacii.robustulus; () => { var y = this; }; return x; } - culionensis() : argurus.dauricus { var x : argurus.dauricus; () => { var y = this; }; return x; } + culionensis() : argurus.dauricus { var x : argurus.dauricus; () => { var y = this; }; return x; } scrofa() : petrophilus.sodyi { var x : petrophilus.sodyi; () => { var y = this; }; return x; } fernandoni() : quasiater.carolinensis { var x : quasiater.carolinensis; () => { var y = this; }; return x; } Tin() : sagitta.leptoceros> { var x : sagitta.leptoceros>; () => { var y = this; }; return x; } @@ -371,7 +371,7 @@ namespace lutreolus { frontalis() : macrorhinos.marmosurus>, samarensis.pallidus> { var x : macrorhinos.marmosurus>, samarensis.pallidus>; () => { var y = this; }; return x; } cuniculus() : patas.uralensis { var x : patas.uralensis; () => { var y = this; }; return x; } magdalenae() : julianae.gerbillus> { var x : julianae.gerbillus>; () => { var y = this; }; return x; } - andamanensis() : julianae.oralis { var x : julianae.oralis; () => { var y = this; }; return x; } + andamanensis() : julianae.oralis { var x : julianae.oralis; () => { var y = this; }; return x; } dispar() : panamensis.linulus { var x : panamensis.linulus; () => { var y = this; }; return x; } } } @@ -453,7 +453,7 @@ namespace minutus { } namespace caurinus { export class mahaganus extends panglima.fundatus { - martiniquensis(): ruatanica.hector>> { var x: ruatanica.hector>>; () => { var y = this; }; return x; } + martiniquensis(): ruatanica.hector>> { var x: ruatanica.hector>>; () => { var y = this; }; return x; } devius(): samarensis.pelurus, trivirgatus.falconeri>> { var x: samarensis.pelurus, trivirgatus.falconeri>>; () => { var y = this; }; return x; } masalai(): argurus.oreas { var x: argurus.oreas; () => { var y = this; }; return x; } kathleenae(): nigra.dolichurus { var x: nigra.dolichurus; () => { var y = this; }; return x; } @@ -486,12 +486,12 @@ namespace nigra { tristriatus(): rionegrensis.veraecrucis> { var x: rionegrensis.veraecrucis>; () => { var y = this; }; return x; } lasiura(): panglima.abidi>, Lanthanum.nitidus> { var x: panglima.abidi>, Lanthanum.nitidus>; () => { var y = this; }; return x; } gangetica(): argurus.luctuosa { var x: argurus.luctuosa; () => { var y = this; }; return x; } - brucei(): chrysaeolus.sarasinorum { var x: chrysaeolus.sarasinorum; () => { var y = this; }; return x; } + brucei(): chrysaeolus.sarasinorum { var x: chrysaeolus.sarasinorum; () => { var y = this; }; return x; } } } namespace sagitta { export class walkeri extends minutus.portoricensis { - maracajuensis(): samarensis.cahirinus { var x: samarensis.cahirinus; () => { var y = this; }; return x; } + maracajuensis(): samarensis.cahirinus { var x: samarensis.cahirinus; () => { var y = this; }; return x; } } } namespace minutus { @@ -561,7 +561,7 @@ namespace samarensis { suricatta(): daubentonii.nigricans { var x: daubentonii.nigricans; () => { var y = this; }; return x; } jagorii(): julianae.galapagoensis { var x: julianae.galapagoensis; () => { var y = this; }; return x; } beecrofti(): sagitta.stolzmanni { var x: sagitta.stolzmanni; () => { var y = this; }; return x; } - imaizumii(): minutus.inez, gabriellae.echinatus>, dogramacii.aurata>, lavali.otion>, macrorhinos.konganensis> { var x: minutus.inez, gabriellae.echinatus>, dogramacii.aurata>, lavali.otion>, macrorhinos.konganensis>; () => { var y = this; }; return x; } + imaizumii(): minutus.inez, gabriellae.echinatus>, dogramacii.aurata>, lavali.option>, macrorhinos.konganensis> { var x: minutus.inez, gabriellae.echinatus>, dogramacii.aurata>, lavali.option>, macrorhinos.konganensis>; () => { var y = this; }; return x; } colocolo(): quasiater.bobrinskoi { var x: quasiater.bobrinskoi; () => { var y = this; }; return x; } wolfi(): petrophilus.rosalia> { var x: petrophilus.rosalia>; () => { var y = this; }; return x; } } @@ -572,7 +572,7 @@ namespace samarensis { viaria(): chrysaeolus.sarasinorum { var x: chrysaeolus.sarasinorum; () => { var y = this; }; return x; } } export class cahirinus { - alashanicus(): nigra.caucasica { var x: nigra.caucasica; () => { var y = this; }; return x; } + alashanicus(): nigra.caucasica { var x: nigra.caucasica; () => { var y = this; }; return x; } flaviventer(): trivirgatus.tumidifrons> { var x: trivirgatus.tumidifrons>; () => { var y = this; }; return x; } bottai(): lutreolus.schlegeli { var x: lutreolus.schlegeli; () => { var y = this; }; return x; } pinetis(): argurus.oreas { var x: argurus.oreas; () => { var y = this; }; return x; } @@ -585,7 +585,7 @@ namespace sagitta { hoplomyoides(): panglima.fundatus, nigra.gracilis> { var x: panglima.fundatus, nigra.gracilis>; () => { var y = this; }; return x; } gratiosus(): lavali.lepturus { var x: lavali.lepturus; () => { var y = this; }; return x; } rex(): lavali.wilsoni { var x: lavali.wilsoni; () => { var y = this; }; return x; } - bolami(): trivirgatus.tumidifrons { var x: trivirgatus.tumidifrons; () => { var y = this; }; return x; } + bolami(): trivirgatus.tumidifrons { var x: trivirgatus.tumidifrons; () => { var y = this; }; return x; } } } namespace daubentonii { @@ -640,7 +640,7 @@ namespace argurus { } namespace daubentonii { export class arboreus { - capreolus(): rendalli.crenulata, lavali.wilsoni> { var x: rendalli.crenulata, lavali.wilsoni>; () => { var y = this; }; return x; } + capreolus(): rendalli.crenulata, lavali.wilsoni> { var x: rendalli.crenulata, lavali.wilsoni>; () => { var y = this; }; return x; } moreni(): panglima.abidi { var x: panglima.abidi; () => { var y = this; }; return x; } hypoleucos(): nigra.gracilis { var x: nigra.gracilis; () => { var y = this; }; return x; } paedulcus(): minutus.portoricensis { var x: minutus.portoricensis; () => { var y = this; }; return x; } @@ -663,7 +663,7 @@ namespace patas { muricauda(): panglima.fundatus> { var x: panglima.fundatus>; () => { var y = this; }; return x; } albicaudus(): sagitta.stolzmanni { var x: sagitta.stolzmanni; () => { var y = this; }; return x; } fallax(): ruatanica.hector { var x: ruatanica.hector; () => { var y = this; }; return x; } - attenuata(): macrorhinos.marmosurus> { var x: macrorhinos.marmosurus>; () => { var y = this; }; return x; } + attenuata(): macrorhinos.marmosurus> { var x: macrorhinos.marmosurus>; () => { var y = this; }; return x; } megalura(): howi.marcanoi { var x: howi.marcanoi; () => { var y = this; }; return x; } neblina(): samarensis.pelurus { var x: samarensis.pelurus; () => { var y = this; }; return x; } citellus(): daubentonii.arboreus { var x: daubentonii.arboreus; () => { var y = this; }; return x; } @@ -674,7 +674,7 @@ namespace patas { namespace provocax { export class melanoleuca extends lavali.wilsoni { Neodymium(): macrorhinos.marmosurus, lutreolus.foina> { var x: macrorhinos.marmosurus, lutreolus.foina>; () => { var y = this; }; return x; } - baeri(): imperfecta.lasiurus { var x: imperfecta.lasiurus; () => { var y = this; }; return x; } + baeri(): imperfecta.lasiurus { var x: imperfecta.lasiurus; () => { var y = this; }; return x; } } } namespace sagitta { @@ -714,7 +714,7 @@ namespace argurus { dubosti(): nigra.thalia { var x: nigra.thalia; () => { var y = this; }; return x; } opossum(): nigra.dolichurus { var x: nigra.dolichurus; () => { var y = this; }; return x; } oreopolus(): minutus.portoricensis { var x: minutus.portoricensis; () => { var y = this; }; return x; } - amurensis(): daubentonii.arboreus { var x: daubentonii.arboreus; () => { var y = this; }; return x; } + amurensis(): daubentonii.arboreus { var x: daubentonii.arboreus; () => { var y = this; }; return x; } } } namespace petrophilus { @@ -724,7 +724,7 @@ namespace petrophilus { namespace lutreolus { export class punicus { strandi(): gabriellae.klossii { var x: gabriellae.klossii; () => { var y = this; }; return x; } - lar(): caurinus.mahaganus { var x: caurinus.mahaganus; () => { var y = this; }; return x; } + lar(): caurinus.mahaganus { var x: caurinus.mahaganus; () => { var y = this; }; return x; } erica(): dogramacii.koepckeae { var x: dogramacii.koepckeae; () => { var y = this; }; return x; } trichura(): macrorhinos.konganensis { var x: macrorhinos.konganensis; () => { var y = this; }; return x; } lemniscatus(): panglima.fundatus { var x: panglima.fundatus; () => { var y = this; }; return x; } @@ -742,7 +742,7 @@ namespace macrorhinos { export class daphaenodon { bredanensis(): julianae.sumatrana { var x: julianae.sumatrana; () => { var y = this; }; return x; } othus(): howi.coludo { var x: howi.coludo; () => { var y = this; }; return x; } - hammondi(): julianae.gerbillus, gabriellae.echinatus>, dogramacii.aurata>, lavali.otion> { var x: julianae.gerbillus, gabriellae.echinatus>, dogramacii.aurata>, lavali.otion>; () => { var y = this; }; return x; } + hammondi(): julianae.gerbillus, gabriellae.echinatus>, dogramacii.aurata>, lavali.option> { var x: julianae.gerbillus, gabriellae.echinatus>, dogramacii.aurata>, lavali.option>; () => { var y = this; }; return x; } aureocollaris(): quasiater.carolinensis { var x: quasiater.carolinensis; () => { var y = this; }; return x; } flavipes(): petrophilus.minutilla { var x: petrophilus.minutilla; () => { var y = this; }; return x; } callosus(): trivirgatus.lotor { var x: trivirgatus.lotor; () => { var y = this; }; return x; } @@ -793,7 +793,7 @@ namespace imperfecta { fulvus(): argurus.germaini { var x: argurus.germaini; () => { var y = this; }; return x; } paranaensis(): dogramacii.koepckeae { var x: dogramacii.koepckeae; () => { var y = this; }; return x; } didactylus(): panglima.abidi> { var x: panglima.abidi>; () => { var y = this; }; return x; } - schreibersii(): nigra.gracilis { var x: nigra.gracilis; () => { var y = this; }; return x; } + schreibersii(): nigra.gracilis { var x: nigra.gracilis; () => { var y = this; }; return x; } orii(): dogramacii.kaiseri { var x: dogramacii.kaiseri; () => { var y = this; }; return x; } } export class subspinosus { @@ -963,7 +963,7 @@ namespace argurus { } namespace ruatanica { export class Praseodymium extends ruatanica.hector { - clara(): panglima.amphibius, argurus.dauricus> { var x: panglima.amphibius, argurus.dauricus>; () => { var y = this; }; return x; } + clara(): panglima.amphibius, argurus.dauricus> { var x: panglima.amphibius, argurus.dauricus>; () => { var y = this; }; return x; } spectabilis(): petrophilus.sodyi { var x: petrophilus.sodyi; () => { var y = this; }; return x; } kamensis(): trivirgatus.lotor, lavali.lepturus> { var x: trivirgatus.lotor, lavali.lepturus>; () => { var y = this; }; return x; } ruddi(): lutreolus.foina { var x: lutreolus.foina; () => { var y = this; }; return x; } diff --git a/tests/cases/compiler/restInvalidArgumentType.ts b/tests/cases/compiler/restInvalidArgumentType.ts index 7e75ddb5d430f..324bb3102183e 100644 --- a/tests/cases/compiler/restInvalidArgumentType.ts +++ b/tests/cases/compiler/restInvalidArgumentType.ts @@ -27,7 +27,7 @@ function f(p1: T, p2: T[]) { var {...r1} = p1; // Error, generic type paramterre var {...r2} = p2; // OK - var {...r3} = t; // Error, generic type paramter + var {...r3} = t; // Error, generic type parameter var {...r4} = i; // Error, index access var {...r5} = k; // Error, index diff --git a/tests/cases/compiler/reverseMappedTypeAssignableToIndex.ts b/tests/cases/compiler/reverseMappedTypeAssignableToIndex.ts index 0961b82c42d25..8e7f11c34a1ae 100644 --- a/tests/cases/compiler/reverseMappedTypeAssignableToIndex.ts +++ b/tests/cases/compiler/reverseMappedTypeAssignableToIndex.ts @@ -1,5 +1,5 @@ // @target: es2015 -// Simple mapped type and inferrence +// Simple mapped type and inference type Mapped = { [K in keyof T]: { name: T[K] } }; type InferFromMapped = T extends Mapped ? R : never; diff --git a/tests/cases/compiler/sigantureIsSubTypeIfTheyAreIdentical.ts b/tests/cases/compiler/sigantureIsSubTypeIfTheyAreIdentical.ts index 590047bcb9feb..654f3847122d9 100644 --- a/tests/cases/compiler/sigantureIsSubTypeIfTheyAreIdentical.ts +++ b/tests/cases/compiler/sigantureIsSubTypeIfTheyAreIdentical.ts @@ -2,7 +2,7 @@ interface ICache { get(key: string): T; } -class CacheService implements ICache { // Should not error that property type of get are incomaptible +class CacheService implements ICache { // Should not error that property type of get are incompatible get(key: string): T { return undefined; } diff --git a/tests/cases/compiler/spreadInvalidArgumentType.ts b/tests/cases/compiler/spreadInvalidArgumentType.ts index 8fd9ac67cf765..045e45004ccb8 100644 --- a/tests/cases/compiler/spreadInvalidArgumentType.ts +++ b/tests/cases/compiler/spreadInvalidArgumentType.ts @@ -29,7 +29,7 @@ function f(p1: T, p2: T[]) { var o1 = { ...p1 }; // OK, generic type paramterre var o2 = { ...p2 }; // OK - var o3 = { ...t }; // OK, generic type paramter + var o3 = { ...t }; // OK, generic type parameter var o4 = { ...i }; // Error, index access var o5 = { ...k }; // Error, index var o6 = { ...mapped_generic }; // OK, generic mapped object type diff --git a/tests/cases/compiler/strictModeReservedWord.ts b/tests/cases/compiler/strictModeReservedWord.ts index 4551fb9e4e2e4..f0a9c0ef42afd 100644 --- a/tests/cases/compiler/strictModeReservedWord.ts +++ b/tests/cases/compiler/strictModeReservedWord.ts @@ -21,7 +21,7 @@ function foo() { function foo1(x: private.package.x) { } function foo2(x: private.package.protected) { } let b: interface.package.implements.B; - ublic(); + public(); static(); } diff --git a/tests/cases/compiler/strictModeReservedWord2.ts b/tests/cases/compiler/strictModeReservedWord2.ts index a4736b6f1af50..abb4cd658aa94 100644 --- a/tests/cases/compiler/strictModeReservedWord2.ts +++ b/tests/cases/compiler/strictModeReservedWord2.ts @@ -8,17 +8,17 @@ enum package { } enum foo { public, private, - pacakge + package } const enum private { public, private, - pacakge + package } const enum bar { public, private, - pacakge + package } diff --git a/tests/cases/compiler/strictSubtypeAndNarrowing.ts b/tests/cases/compiler/strictSubtypeAndNarrowing.ts index 19a63bbb8f484..3407dac266b63 100644 --- a/tests/cases/compiler/strictSubtypeAndNarrowing.ts +++ b/tests/cases/compiler/strictSubtypeAndNarrowing.ts @@ -110,7 +110,7 @@ function checkC(f: FnTypes) { f; // FnTypes } -function checkD(f: FnTypes) { +function checked(f: FnTypes) { if (isFunction(f)) { f; // FnTypes } diff --git a/tests/cases/compiler/stringLiteralsErrors.ts b/tests/cases/compiler/stringLiteralsErrors.ts index e6afc4c229e9f..11fa3730fe682 100644 --- a/tests/cases/compiler/stringLiteralsErrors.ts +++ b/tests/cases/compiler/stringLiteralsErrors.ts @@ -1,5 +1,5 @@ // @target: es2015 -// Srtings missing line terminator +// Strings missing line terminator var es1 = "line 1 "; var es2 = 'line 1 diff --git a/tests/cases/compiler/templateLiteralIntersection4.ts b/tests/cases/compiler/templateLiteralIntersection4.ts index 5c4e756263c2e..6e6086bd4c5fa 100644 --- a/tests/cases/compiler/templateLiteralIntersection4.ts +++ b/tests/cases/compiler/templateLiteralIntersection4.ts @@ -12,7 +12,7 @@ type StoreUtils = Omit<{ declare function createStore(store: Store): StoreUtils; -const { Provider, useUsername, useAge, useStore } = createStore({ +const { Provider, useUsername, usage, useStore } = createStore({ username: "Aral", age: 31 }); diff --git a/tests/cases/compiler/temporal.ts b/tests/cases/compiler/temporal.ts index e4c4d9472fd2b..73efab6ddbe73 100644 --- a/tests/cases/compiler/temporal.ts +++ b/tests/cases/compiler/temporal.ts @@ -594,7 +594,7 @@ zdt.toLocaleString(); // example output: 12/1/2019, 12:00:00 PM zdt.toLocaleString("de-DE"); // => '1.12.2019, 12:00:00 MEZ' const options = { weekday: "long", year: "numeric", month: "long", day: "numeric" } as const; - zdt.toLocaleString("de-DE", options); // => 'Sonntag, 1. Dezember 2019' + zdt.toLocaleString("de-DE", options); // => 'Sonntag, 1. December 2019' /* WRONG */ zdt.toLocaleString("de-DE", { timeZone: "Pacific/Auckland" }); // => RangeError: Time zone option Pacific/Auckland does not match actual time zone Europe/Berlin zdt.withTimeZone("Pacific/Auckland").toLocaleString("de-DE"); // => '2.12.2019, 0:00:00 GMT+13' diff --git a/tests/cases/compiler/typeAliasDoesntMakeModuleInstantiated.ts b/tests/cases/compiler/typeAliasDoesntMakeModuleInstantiated.ts index 2184dd59b78de..e577a2fef6047 100644 --- a/tests/cases/compiler/typeAliasDoesntMakeModuleInstantiated.ts +++ b/tests/cases/compiler/typeAliasDoesntMakeModuleInstantiated.ts @@ -1,6 +1,6 @@ // @target: es2015 declare namespace m { - // type alias declaration here shouldnt make the module declaration instantiated + // type alias declaration here shouldn't make the module declaration instantiated type Selector = string| string[] |Function; export interface IStatic { diff --git a/tests/cases/compiler/typeOfEnumAndVarRedeclarations.ts b/tests/cases/compiler/typeOfEnumAndVarRedeclarations.ts index 759777e6de89d..caed481aaf6d5 100644 --- a/tests/cases/compiler/typeOfEnumAndVarRedeclarations.ts +++ b/tests/cases/compiler/typeOfEnumAndVarRedeclarations.ts @@ -6,6 +6,6 @@ enum E { b = 1 } var x = E; -var x: { readonly a: E; readonly b: E; readonly [x: number]: string; }; // Shouldnt error +var x: { readonly a: E; readonly b: E; readonly [x: number]: string; }; // Shouldn't error var y = E; var y: { readonly a: E; readonly b: E; readonly [x: number]: string; readonly [x: number]: string } // two errors: the types are not identical and duplicate signatures \ No newline at end of file diff --git a/tests/cases/compiler/undefinedInferentialTyping.ts b/tests/cases/compiler/undefinedInferentialTyping.ts index 0c4455d6df28d..d383e4d5ccc4f 100644 --- a/tests/cases/compiler/undefinedInferentialTyping.ts +++ b/tests/cases/compiler/undefinedInferentialTyping.ts @@ -1,5 +1,5 @@ // @target: es2015 -function f(arr: T[], elemnt: T): T { +function f(arr: T[], element: T): T { return null; } diff --git a/tests/cases/compiler/unusedInvalidTypeArguments.ts b/tests/cases/compiler/unusedInvalidTypeArguments.ts index fddf662f84c35..f88994b9110c5 100644 --- a/tests/cases/compiler/unusedInvalidTypeArguments.ts +++ b/tests/cases/compiler/unusedInvalidTypeArguments.ts @@ -24,7 +24,7 @@ type T = number; foo(); // @Filename: /new.ts -import { Foo } from "unkown"; +import { Foo } from "unknown"; type T = number; new Foo(); diff --git a/tests/cases/compiler/unusedLocalsAndParameters.ts b/tests/cases/compiler/unusedLocalsAndParameters.ts index cd812120b58b9..618d0c870d687 100644 --- a/tests/cases/compiler/unusedLocalsAndParameters.ts +++ b/tests/cases/compiler/unusedLocalsAndParameters.ts @@ -5,59 +5,59 @@ export { }; -// function declaration paramter +// function declaration parameter function f(a) { } f(0); -// function expression paramter +// function expression parameter var fexp = function (a) { }; fexp(0); -// arrow function paramter +// arrow function parameter var farrow = (a) => { }; class C { - // Method declaration paramter + // Method declaration parameter method(a) { } - // Accessor declaration paramter + // Accessor declaration parameter set x(v: number) { } } var E = class { - // Method declaration paramter + // Method declaration parameter method(a) { } - // Accessor declaration paramter + // Accessor declaration parameter set x(v: number) { } } var o = { - // Object literal method declaration paramter + // Object literal method declaration parameter method(a) { }, - // Accessor declaration paramter + // Accessor declaration parameter set x(v: number) { } }; o; -// in a for..in statment +// in a for..in statement for (let i in o) { } -// in a for..of statment +// in a for..of statement for (let i of [1, 2, 3]) { } -// in a for. statment +// in a for. statement for (let i = 0, n; i < 10; i++) { } diff --git a/tests/cases/compiler/unusedLocalsAndParametersDeferred.ts b/tests/cases/compiler/unusedLocalsAndParametersDeferred.ts index 5d66f6b1ce43c..473011a1e9351 100644 --- a/tests/cases/compiler/unusedLocalsAndParametersDeferred.ts +++ b/tests/cases/compiler/unusedLocalsAndParametersDeferred.ts @@ -5,29 +5,29 @@ export { }; -function defered(a: () => T): T { +function deferred(a: () => T): T { return a(); } -// function declaration paramter +// function declaration parameter function f(a) { - defered(() => { + deferred(() => { a; }); } f(0); -// function expression paramter +// function expression parameter var fexp = function (a) { - defered(() => { + deferred(() => { a; }); }; fexp(1); -// arrow function paramter +// arrow function parameter var farrow = (a) => { - defered(() => { + deferred(() => { a; }); }; @@ -36,20 +36,20 @@ farrow(2); let prop1; class C { - // Method declaration paramter + // Method declaration parameter method(a) { - defered(() => { + deferred(() => { a; }); } - // Accessor declaration paramter + // Accessor declaration parameter set x(v: number) { - defered(() => { + deferred(() => { v; }); } - // in a property initalizer - p = defered(() => { + // in a property initializer + p = deferred(() => { prop1; }); } @@ -59,20 +59,20 @@ new C(); let prop2; var E = class { - // Method declaration paramter + // Method declaration parameter method(a) { - defered(() => { + deferred(() => { a; }); } - // Accessor declaration paramter + // Accessor declaration parameter set x(v: number) { - defered(() => { + deferred(() => { v; }); } - // in a property initalizer - p = defered(() => { + // in a property initializer + p = deferred(() => { prop2; }); } @@ -81,43 +81,43 @@ new E(); var o = { - // Object literal method declaration paramter + // Object literal method declaration parameter method(a) { - defered(() => { + deferred(() => { a; }); }, - // Accessor declaration paramter + // Accessor declaration parameter set x(v: number) { - defered(() => { + deferred(() => { v; }); }, - // in a property initalizer - p: defered(() => { + // in a property initializer + p: deferred(() => { prop1; }) }; o; -// in a for..in statment +// in a for..in statement for (let i in o) { - defered(() => { + deferred(() => { i; }); } -// in a for..of statment +// in a for..of statement for (let i of [1,2,3]) { - defered(() => { + deferred(() => { i; }); } -// in a for. statment +// in a for. statement for (let i = 0; i < 10; i++) { - defered(() => { + deferred(() => { i; }); } @@ -127,7 +127,7 @@ for (let i = 0; i < 10; i++) { const condition = false; if (condition) { const c = 0; - defered(() => { + deferred(() => { c; }); } @@ -135,19 +135,19 @@ if (condition) { // in try/catch/finally try { const a = 0; - defered(() => { + deferred(() => { a; }); } catch (e) { const c = 1; - defered(() => { + deferred(() => { c; }); } finally { const c = 0; - defered(() => { + deferred(() => { c; }); } @@ -156,7 +156,7 @@ finally { // in a namespace namespace N { var x; - defered(() => { + deferred(() => { x; }); } diff --git a/tests/cases/conformance/classes/members/privateNames/privateNameAndObjectRestSpread.ts b/tests/cases/conformance/classes/members/privateNames/privateNameAndObjectRestSpread.ts index 20185b3185c45..7ee1c3786ebcf 100644 --- a/tests/cases/conformance/classes/members/privateNames/privateNameAndObjectRestSpread.ts +++ b/tests/cases/conformance/classes/members/privateNames/privateNameAndObjectRestSpread.ts @@ -11,8 +11,8 @@ class C { const { ...rest } = other; rest.#prop; - const statics = { ... C}; - statics.#propStatic + const statistics = { ... C}; + statistics.#propStatic const { ...sRest } = C; sRest.#propStatic; } diff --git a/tests/cases/conformance/enums/enumBasics.ts b/tests/cases/conformance/enums/enumBasics.ts index 3cd2ebcfdf44d..78871efefb4d5 100644 --- a/tests/cases/conformance/enums/enumBasics.ts +++ b/tests/cases/conformance/enums/enumBasics.ts @@ -63,7 +63,7 @@ enum E8 { B = 'foo'['foo'] } -//Enum with computed member intializer of same enum type +//Enum with computed member initializer of same enum type enum E9 { A, B = A diff --git a/tests/cases/conformance/enums/enumClassification.ts b/tests/cases/conformance/enums/enumClassification.ts index 937679a147e99..f4d76cdf54f30 100644 --- a/tests/cases/conformance/enums/enumClassification.ts +++ b/tests/cases/conformance/enums/enumClassification.ts @@ -1,7 +1,7 @@ // @target: es2015 // @declaration: true -// An enum type where each member has no initializer or an initializer that specififes +// An enum type where each member has no initializer or an initializer that specifies // a numeric literal, a string literal, or a single identifier naming another member in // the enum type is classified as a literal enum type. An enum type that doesn't adhere // to this pattern is classified as a numeric enum type. diff --git a/tests/cases/conformance/enums/enumErrors.ts b/tests/cases/conformance/enums/enumErrors.ts index c0bdd204de5fb..6357b720b65a8 100644 --- a/tests/cases/conformance/enums/enumErrors.ts +++ b/tests/cases/conformance/enums/enumErrors.ts @@ -15,14 +15,14 @@ enum E9 { B = A } -//Enum with computed member intializer of different enum type +//Enum with computed member initializer of different enum type // Bug 707850: This should be allowed enum E10 { A = E9.A, B = E9.B } -// Enum with computed member intializer of other types +// Enum with computed member initializer of other types enum E11 { A = true, B = new Date(), diff --git a/tests/cases/conformance/es6/destructuring/destructuringControlFlow.ts b/tests/cases/conformance/es6/destructuring/destructuringControlFlow.ts index ea34ba57d1794..baf2fe0e50004 100644 --- a/tests/cases/conformance/es6/destructuring/destructuringControlFlow.ts +++ b/tests/cases/conformance/es6/destructuring/destructuringControlFlow.ts @@ -33,7 +33,7 @@ function f4() { let x: boolean; ({ x } = 0); // Error ({ ["x"]: x } = 0); // Error - ({ ["x" + ""]: x } = 0); // Errpr + ({ ["x" + ""]: x } = 0); // Error } // Repro from #31770 diff --git a/tests/cases/conformance/es6/spread/arraySpreadInCall.ts b/tests/cases/conformance/es6/spread/arraySpreadInCall.ts index d3d0456350b09..704643bad3a27 100644 --- a/tests/cases/conformance/es6/spread/arraySpreadInCall.ts +++ b/tests/cases/conformance/es6/spread/arraySpreadInCall.ts @@ -28,7 +28,7 @@ const x42 = f4(true, ...[1, 'foo']) const x43 = f4(...([1, 'foo'])) const x44 = f4(true, ...([1, 'foo'])) -// dicovered in #52845#issuecomment-1459132562 +// discovered in #52845#issuecomment-1459132562 interface IAction { run(event?: unknown): unknown; } diff --git a/tests/cases/conformance/es7/exponentiationOperator/compoundExponentiationAssignmentLHSIsValue.ts b/tests/cases/conformance/es7/exponentiationOperator/compoundExponentiationAssignmentLHSIsValue.ts index be0119e7a8039..2edc4b284d94a 100644 --- a/tests/cases/conformance/es7/exponentiationOperator/compoundExponentiationAssignmentLHSIsValue.ts +++ b/tests/cases/conformance/es7/exponentiationOperator/compoundExponentiationAssignmentLHSIsValue.ts @@ -71,7 +71,7 @@ function bar1() { } **= value; // function calls foo() **= value; -// parentheses, the containted expression is value +// parentheses, the contained expression is value (this) **= value; (M) **= value; (C) **= value; diff --git a/tests/cases/conformance/expressions/assignmentOperator/assignmentLHSIsValue.ts b/tests/cases/conformance/expressions/assignmentOperator/assignmentLHSIsValue.ts index ec5599ba131c0..4b1a661f159af 100644 --- a/tests/cases/conformance/expressions/assignmentOperator/assignmentLHSIsValue.ts +++ b/tests/cases/conformance/expressions/assignmentOperator/assignmentLHSIsValue.ts @@ -55,7 +55,7 @@ function bar() { } = value; // function calls foo() = value; -// parentheses, the containted expression is value +// parentheses, the contained expression is value (this) = value; (M) = value; (C) = value; diff --git a/tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts b/tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts index 80109d2252606..4fbe084135de3 100644 --- a/tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts +++ b/tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts @@ -95,7 +95,7 @@ function bar2() { } += value; foo() *= value; foo() += value; -// parentheses, the containted expression is value +// parentheses, the contained expression is value (this) *= value; (this) += value; (M) *= value; diff --git a/tests/cases/conformance/expressions/conditonalOperator/conditionalOperatorConditionIsBooleanType.ts b/tests/cases/conformance/expressions/conditonalOperator/conditionalOperatorConditionIsBooleanType.ts index 4b634918c8ddc..1bfba1470d77c 100644 --- a/tests/cases/conformance/expressions/conditonalOperator/conditionalOperatorConditionIsBooleanType.ts +++ b/tests/cases/conformance/expressions/conditonalOperator/conditionalOperatorConditionIsBooleanType.ts @@ -38,7 +38,7 @@ null === undefined ? exprString1 : exprString2; true || false ? exprIsObject1 : exprIsObject2; null === undefined ? exprString1 : exprBoolean1; // union -//Results shoud be same as Expr1 and Expr2 +//Results should be same as Expr1 and Expr2 var resultIsAny1 = condBoolean ? exprAny1 : exprAny2; var resultIsBoolean1 = condBoolean ? exprBoolean1 : exprBoolean2; var resultIsNumber1 = condBoolean ? exprNumber1 : exprNumber2; diff --git a/tests/cases/conformance/expressions/conditonalOperator/conditionalOperatorConditionIsNumberType.ts b/tests/cases/conformance/expressions/conditonalOperator/conditionalOperatorConditionIsNumberType.ts index ca2e746c4c5c2..32f194461e26a 100644 --- a/tests/cases/conformance/expressions/conditonalOperator/conditionalOperatorConditionIsNumberType.ts +++ b/tests/cases/conformance/expressions/conditonalOperator/conditionalOperatorConditionIsNumberType.ts @@ -41,7 +41,7 @@ foo() ? exprString1 : exprString2; foo() / array[1] ? exprIsObject1 : exprIsObject2; foo() ? exprString1 : exprBoolean1; // Union -//Results shoud be same as Expr1 and Expr2 +//Results should be same as Expr1 and Expr2 var resultIsAny1 = condNumber ? exprAny1 : exprAny2; var resultIsBoolean1 = condNumber ? exprBoolean1 : exprBoolean2; var resultIsNumber1 = condNumber ? exprNumber1 : exprNumber2; diff --git a/tests/cases/conformance/expressions/conditonalOperator/conditionalOperatorConditionIsObjectType.ts b/tests/cases/conformance/expressions/conditonalOperator/conditionalOperatorConditionIsObjectType.ts index 9cb4b00f7e62c..756aa17fbb18c 100644 --- a/tests/cases/conformance/expressions/conditonalOperator/conditionalOperatorConditionIsObjectType.ts +++ b/tests/cases/conformance/expressions/conditonalOperator/conditionalOperatorConditionIsObjectType.ts @@ -41,7 +41,7 @@ C.doIt() ? exprString1 : exprString2; condObject.valueOf() ? exprIsObject1 : exprIsObject2; new Date() ? exprString1 : exprBoolean1; // union -//Results shoud be same as Expr1 and Expr2 +//Results should be same as Expr1 and Expr2 var resultIsAny1 = condObject ? exprAny1 : exprAny2; var resultIsBoolean1 = condObject ? exprBoolean1 : exprBoolean2; var resultIsNumber1 = condObject ? exprNumber1 : exprNumber2; diff --git a/tests/cases/conformance/expressions/conditonalOperator/conditionalOperatorConditoinIsAnyType.ts b/tests/cases/conformance/expressions/conditonalOperator/conditionalOperatorConditoinIsAnyType.ts index fd311e7b59e4a..b53bcc495bafa 100644 --- a/tests/cases/conformance/expressions/conditonalOperator/conditionalOperatorConditoinIsAnyType.ts +++ b/tests/cases/conformance/expressions/conditonalOperator/conditionalOperatorConditoinIsAnyType.ts @@ -39,7 +39,7 @@ x("x") ? exprString1 : exprString2; x.doSomeThing() ? exprIsObject1 : exprIsObject2; x.doSomeThing() ? exprString1 : exprBoolean1; // union -//Results shoud be same as Expr1 and Expr2 +//Results should be same as Expr1 and Expr2 var resultIsAny1 = condAny ? exprAny1 : exprAny2; var resultIsBoolean1 = condAny ? exprBoolean1 : exprBoolean2; var resultIsNumber1 = condAny ? exprNumber1 : exprNumber2; diff --git a/tests/cases/conformance/expressions/conditonalOperator/conditionalOperatorConditoinIsStringType.ts b/tests/cases/conformance/expressions/conditonalOperator/conditionalOperatorConditoinIsStringType.ts index e2ad13a6a8bd8..67f4ebbbd9610 100644 --- a/tests/cases/conformance/expressions/conditonalOperator/conditionalOperatorConditoinIsStringType.ts +++ b/tests/cases/conformance/expressions/conditonalOperator/conditionalOperatorConditoinIsStringType.ts @@ -41,7 +41,7 @@ foo() ? exprString1 : exprString2; array[1] ? exprIsObject1 : exprIsObject2; foo() ? exprString1 : exprBoolean1; // union -//Results shoud be same as Expr1 and Expr2 +//Results should be same as Expr1 and Expr2 var resultIsAny1 = condString ? exprAny1 : exprAny2; var resultIsBoolean1 = condString ? exprBoolean1 : exprBoolean2; var resultIsNumber1 = condString ? exprNumber1 : exprNumber2; diff --git a/tests/cases/conformance/expressions/contextualTyping/generatedContextualTyping.ts b/tests/cases/conformance/expressions/contextualTyping/generatedContextualTyping.ts index 33aa023c502d0..de79a8f0555ff 100644 --- a/tests/cases/conformance/expressions/contextualTyping/generatedContextualTyping.ts +++ b/tests/cases/conformance/expressions/contextualTyping/generatedContextualTyping.ts @@ -5,7 +5,7 @@ class Base { private p; } class Derived1 extends Base { private m; } class Derived2 extends Base { private n; } -interface Genric { func(n: T[]); } +interface Generic { func(n: T[]); } var b = new Base(), d1 = new Derived1(), d2 = new Derived2(); var x1: () => Base[] = () => [d1, d2]; var x2: () => Base[] = function() { return [d1, d2] }; @@ -18,7 +18,7 @@ var x8: Array = [d1, d2]; var x9: { [n: number]: Base; } = [d1, d2]; var x10: {n: Base[]; } = { n: [d1, d2] }; var x11: (s: Base[]) => any = n => { var n: Base[]; return null; }; -var x12: Genric = { func: n => { return [d1, d2]; } }; +var x12: Generic = { func: n => { return [d1, d2]; } }; class x13 { member: () => Base[] = () => [d1, d2] } class x14 { member: () => Base[] = function() { return [d1, d2] } } class x15 { member: () => Base[] = function named() { return [d1, d2] } } @@ -30,7 +30,7 @@ class x20 { member: Array = [d1, d2] } class x21 { member: { [n: number]: Base; } = [d1, d2] } class x22 { member: {n: Base[]; } = { n: [d1, d2] } } class x23 { member: (s: Base[]) => any = n => { var n: Base[]; return null; } } -class x24 { member: Genric = { func: n => { return [d1, d2]; } } } +class x24 { member: Generic = { func: n => { return [d1, d2]; } } } class x25 { private member: () => Base[] = () => [d1, d2] } class x26 { private member: () => Base[] = function() { return [d1, d2] } } class x27 { private member: () => Base[] = function named() { return [d1, d2] } } @@ -42,7 +42,7 @@ class x32 { private member: Array = [d1, d2] } class x33 { private member: { [n: number]: Base; } = [d1, d2] } class x34 { private member: {n: Base[]; } = { n: [d1, d2] } } class x35 { private member: (s: Base[]) => any = n => { var n: Base[]; return null; } } -class x36 { private member: Genric = { func: n => { return [d1, d2]; } } } +class x36 { private member: Generic = { func: n => { return [d1, d2]; } } } class x37 { public member: () => Base[] = () => [d1, d2] } class x38 { public member: () => Base[] = function() { return [d1, d2] } } class x39 { public member: () => Base[] = function named() { return [d1, d2] } } @@ -54,7 +54,7 @@ class x44 { public member: Array = [d1, d2] } class x45 { public member: { [n: number]: Base; } = [d1, d2] } class x46 { public member: {n: Base[]; } = { n: [d1, d2] } } class x47 { public member: (s: Base[]) => any = n => { var n: Base[]; return null; } } -class x48 { public member: Genric = { func: n => { return [d1, d2]; } } } +class x48 { public member: Generic = { func: n => { return [d1, d2]; } } } class x49 { static member: () => Base[] = () => [d1, d2] } class x50 { static member: () => Base[] = function() { return [d1, d2] } } class x51 { static member: () => Base[] = function named() { return [d1, d2] } } @@ -66,7 +66,7 @@ class x56 { static member: Array = [d1, d2] } class x57 { static member: { [n: number]: Base; } = [d1, d2] } class x58 { static member: {n: Base[]; } = { n: [d1, d2] } } class x59 { static member: (s: Base[]) => any = n => { var n: Base[]; return null; } } -class x60 { static member: Genric = { func: n => { return [d1, d2]; } } } +class x60 { static member: Generic = { func: n => { return [d1, d2]; } } } class x61 { private static member: () => Base[] = () => [d1, d2] } class x62 { private static member: () => Base[] = function() { return [d1, d2] } } class x63 { private static member: () => Base[] = function named() { return [d1, d2] } } @@ -78,7 +78,7 @@ class x68 { private static member: Array = [d1, d2] } class x69 { private static member: { [n: number]: Base; } = [d1, d2] } class x70 { private static member: {n: Base[]; } = { n: [d1, d2] } } class x71 { private static member: (s: Base[]) => any = n => { var n: Base[]; return null; } } -class x72 { private static member: Genric = { func: n => { return [d1, d2]; } } } +class x72 { private static member: Generic = { func: n => { return [d1, d2]; } } } class x73 { public static member: () => Base[] = () => [d1, d2] } class x74 { public static member: () => Base[] = function() { return [d1, d2] } } class x75 { public static member: () => Base[] = function named() { return [d1, d2] } } @@ -90,7 +90,7 @@ class x80 { public static member: Array = [d1, d2] } class x81 { public static member: { [n: number]: Base; } = [d1, d2] } class x82 { public static member: {n: Base[]; } = { n: [d1, d2] } } class x83 { public static member: (s: Base[]) => any = n => { var n: Base[]; return null; } } -class x84 { public static member: Genric = { func: n => { return [d1, d2]; } } } +class x84 { public static member: Generic = { func: n => { return [d1, d2]; } } } class x85 { constructor(parm: () => Base[] = () => [d1, d2]) { } } class x86 { constructor(parm: () => Base[] = function() { return [d1, d2] }) { } } class x87 { constructor(parm: () => Base[] = function named() { return [d1, d2] }) { } } @@ -102,7 +102,7 @@ class x92 { constructor(parm: Array = [d1, d2]) { } } class x93 { constructor(parm: { [n: number]: Base; } = [d1, d2]) { } } class x94 { constructor(parm: {n: Base[]; } = { n: [d1, d2] }) { } } class x95 { constructor(parm: (s: Base[]) => any = n => { var n: Base[]; return null; }) { } } -class x96 { constructor(parm: Genric = { func: n => { return [d1, d2]; } }) { } } +class x96 { constructor(parm: Generic = { func: n => { return [d1, d2]; } }) { } } class x97 { constructor(public parm: () => Base[] = () => [d1, d2]) { } } class x98 { constructor(public parm: () => Base[] = function() { return [d1, d2] }) { } } class x99 { constructor(public parm: () => Base[] = function named() { return [d1, d2] }) { } } @@ -114,7 +114,7 @@ class x104 { constructor(public parm: Array = [d1, d2]) { } } class x105 { constructor(public parm: { [n: number]: Base; } = [d1, d2]) { } } class x106 { constructor(public parm: {n: Base[]; } = { n: [d1, d2] }) { } } class x107 { constructor(public parm: (s: Base[]) => any = n => { var n: Base[]; return null; }) { } } -class x108 { constructor(public parm: Genric = { func: n => { return [d1, d2]; } }) { } } +class x108 { constructor(public parm: Generic = { func: n => { return [d1, d2]; } }) { } } class x109 { constructor(private parm: () => Base[] = () => [d1, d2]) { } } class x110 { constructor(private parm: () => Base[] = function() { return [d1, d2] }) { } } class x111 { constructor(private parm: () => Base[] = function named() { return [d1, d2] }) { } } @@ -126,7 +126,7 @@ class x116 { constructor(private parm: Array = [d1, d2]) { } } class x117 { constructor(private parm: { [n: number]: Base; } = [d1, d2]) { } } class x118 { constructor(private parm: {n: Base[]; } = { n: [d1, d2] }) { } } class x119 { constructor(private parm: (s: Base[]) => any = n => { var n: Base[]; return null; }) { } } -class x120 { constructor(private parm: Genric = { func: n => { return [d1, d2]; } }) { } } +class x120 { constructor(private parm: Generic = { func: n => { return [d1, d2]; } }) { } } function x121(parm: () => Base[] = () => [d1, d2]) { } function x122(parm: () => Base[] = function() { return [d1, d2] }) { } function x123(parm: () => Base[] = function named() { return [d1, d2] }) { } @@ -138,7 +138,7 @@ function x128(parm: Array = [d1, d2]) { } function x129(parm: { [n: number]: Base; } = [d1, d2]) { } function x130(parm: {n: Base[]; } = { n: [d1, d2] }) { } function x131(parm: (s: Base[]) => any = n => { var n: Base[]; return null; }) { } -function x132(parm: Genric = { func: n => { return [d1, d2]; } }) { } +function x132(parm: Generic = { func: n => { return [d1, d2]; } }) { } function x133(): () => Base[] { return () => [d1, d2]; } function x134(): () => Base[] { return function() { return [d1, d2] }; } function x135(): () => Base[] { return function named() { return [d1, d2] }; } @@ -150,7 +150,7 @@ function x140(): Array { return [d1, d2]; } function x141(): { [n: number]: Base; } { return [d1, d2]; } function x142(): {n: Base[]; } { return { n: [d1, d2] }; } function x143(): (s: Base[]) => any { return n => { var n: Base[]; return null; }; } -function x144(): Genric { return { func: n => { return [d1, d2]; } }; } +function x144(): Generic { return { func: n => { return [d1, d2]; } }; } function x145(): () => Base[] { return () => [d1, d2]; return () => [d1, d2]; } function x146(): () => Base[] { return function() { return [d1, d2] }; return function() { return [d1, d2] }; } function x147(): () => Base[] { return function named() { return [d1, d2] }; return function named() { return [d1, d2] }; } @@ -162,7 +162,7 @@ function x152(): Array { return [d1, d2]; return [d1, d2]; } function x153(): { [n: number]: Base; } { return [d1, d2]; return [d1, d2]; } function x154(): {n: Base[]; } { return { n: [d1, d2] }; return { n: [d1, d2] }; } function x155(): (s: Base[]) => any { return n => { var n: Base[]; return null; }; return n => { var n: Base[]; return null; }; } -function x156(): Genric { return { func: n => { return [d1, d2]; } }; return { func: n => { return [d1, d2]; } }; } +function x156(): Generic { return { func: n => { return [d1, d2]; } }; return { func: n => { return [d1, d2]; } }; } var x157: () => () => Base[] = () => { return () => [d1, d2]; }; var x158: () => () => Base[] = () => { return function() { return [d1, d2] }; }; var x159: () => () => Base[] = () => { return function named() { return [d1, d2] }; }; @@ -174,7 +174,7 @@ var x164: () => Array = () => { return [d1, d2]; }; var x165: () => { [n: number]: Base; } = () => { return [d1, d2]; }; var x166: () => {n: Base[]; } = () => { return { n: [d1, d2] }; }; var x167: () => (s: Base[]) => any = () => { return n => { var n: Base[]; return null; }; }; -var x168: () => Genric = () => { return { func: n => { return [d1, d2]; } }; }; +var x168: () => Generic = () => { return { func: n => { return [d1, d2]; } }; }; var x169: () => () => Base[] = function() { return () => [d1, d2]; }; var x170: () => () => Base[] = function() { return function() { return [d1, d2] }; }; var x171: () => () => Base[] = function() { return function named() { return [d1, d2] }; }; @@ -186,7 +186,7 @@ var x176: () => Array = function() { return [d1, d2]; }; var x177: () => { [n: number]: Base; } = function() { return [d1, d2]; }; var x178: () => {n: Base[]; } = function() { return { n: [d1, d2] }; }; var x179: () => (s: Base[]) => any = function() { return n => { var n: Base[]; return null; }; }; -var x180: () => Genric = function() { return { func: n => { return [d1, d2]; } }; }; +var x180: () => Generic = function() { return { func: n => { return [d1, d2]; } }; }; namespace x181 { var t: () => Base[] = () => [d1, d2]; } namespace x182 { var t: () => Base[] = function() { return [d1, d2] }; } namespace x183 { var t: () => Base[] = function named() { return [d1, d2] }; } @@ -198,7 +198,7 @@ namespace x188 { var t: Array = [d1, d2]; } namespace x189 { var t: { [n: number]: Base; } = [d1, d2]; } namespace x190 { var t: {n: Base[]; } = { n: [d1, d2] }; } namespace x191 { var t: (s: Base[]) => any = n => { var n: Base[]; return null; }; } -namespace x192 { var t: Genric = { func: n => { return [d1, d2]; } }; } +namespace x192 { var t: Generic = { func: n => { return [d1, d2]; } }; } namespace x193 { export var t: () => Base[] = () => [d1, d2]; } namespace x194 { export var t: () => Base[] = function() { return [d1, d2] }; } namespace x195 { export var t: () => Base[] = function named() { return [d1, d2] }; } @@ -210,7 +210,7 @@ namespace x200 { export var t: Array = [d1, d2]; } namespace x201 { export var t: { [n: number]: Base; } = [d1, d2]; } namespace x202 { export var t: {n: Base[]; } = { n: [d1, d2] }; } namespace x203 { export var t: (s: Base[]) => any = n => { var n: Base[]; return null; }; } -namespace x204 { export var t: Genric = { func: n => { return [d1, d2]; } }; } +namespace x204 { export var t: Generic = { func: n => { return [d1, d2]; } }; } var x206 = <() => Base[]>function() { return [d1, d2] }; var x207 = <() => Base[]>function named() { return [d1, d2] }; var x209 = <{ (): Base[]; }>function() { return [d1, d2] }; @@ -219,7 +219,7 @@ var x211 = [d1, d2]; var x212 = >[d1, d2]; var x213 = <{ [n: number]: Base; }>[d1, d2]; var x214 = <{n: Base[]; } >{ n: [d1, d2] }; -var x216 = >{ func: n => { return [d1, d2]; } }; +var x216 = >{ func: n => { return [d1, d2]; } }; var x217 = (<() => Base[]>undefined) || function() { return [d1, d2] }; var x218 = (<() => Base[]>undefined) || function named() { return [d1, d2] }; var x219 = (<{ (): Base[]; }>undefined) || function() { return [d1, d2] }; @@ -239,7 +239,7 @@ var x232: Array; x232 = [d1, d2]; var x233: { [n: number]: Base; }; x233 = [d1, d2]; var x234: {n: Base[]; } ; x234 = { n: [d1, d2] }; var x235: (s: Base[]) => any; x235 = n => { var n: Base[]; return null; }; -var x236: Genric; x236 = { func: n => { return [d1, d2]; } }; +var x236: Generic; x236 = { func: n => { return [d1, d2]; } }; var x237: { n: () => Base[]; } = { n: () => [d1, d2] }; var x238: { n: () => Base[]; } = { n: function() { return [d1, d2] } }; var x239: { n: () => Base[]; } = { n: function named() { return [d1, d2] } }; @@ -251,7 +251,7 @@ var x244: { n: Array; } = { n: [d1, d2] }; var x245: { n: { [n: number]: Base; }; } = { n: [d1, d2] }; var x246: { n: {n: Base[]; } ; } = { n: { n: [d1, d2] } }; var x247: { n: (s: Base[]) => any; } = { n: n => { var n: Base[]; return null; } }; -var x248: { n: Genric; } = { n: { func: n => { return [d1, d2]; } } }; +var x248: { n: Generic; } = { n: { func: n => { return [d1, d2]; } } }; var x252: { (): Base[]; }[] = [() => [d1, d2]]; var x253: { (): Base[]; }[] = [function() { return [d1, d2] }]; var x254: { (): Base[]; }[] = [function named() { return [d1, d2] }]; @@ -259,7 +259,7 @@ var x255: Base[][] = [[d1, d2]]; var x256: Array[] = [[d1, d2]]; var x257: { [n: number]: Base; }[] = [[d1, d2]]; var x258: {n: Base[]; } [] = [{ n: [d1, d2] }]; -var x260: Genric[] = [{ func: n => { return [d1, d2]; } }]; +var x260: Generic[] = [{ func: n => { return [d1, d2]; } }]; var x261: () => Base[] = function() { return [d1, d2] } || undefined; var x262: () => Base[] = function named() { return [d1, d2] } || undefined; var x263: { (): Base[]; } = function() { return [d1, d2] } || undefined; @@ -295,7 +295,7 @@ var x292: Array = true ? [d1, d2] : [d1, d2]; var x293: { [n: number]: Base; } = true ? [d1, d2] : [d1, d2]; var x294: {n: Base[]; } = true ? { n: [d1, d2] } : { n: [d1, d2] }; var x295: (s: Base[]) => any = true ? n => { var n: Base[]; return null; } : n => { var n: Base[]; return null; }; -var x296: Genric = true ? { func: n => { return [d1, d2]; } } : { func: n => { return [d1, d2]; } }; +var x296: Generic = true ? { func: n => { return [d1, d2]; } } : { func: n => { return [d1, d2]; } }; var x297: () => Base[] = true ? undefined : () => [d1, d2]; var x298: () => Base[] = true ? undefined : function() { return [d1, d2] }; var x299: () => Base[] = true ? undefined : function named() { return [d1, d2] }; @@ -307,7 +307,7 @@ var x304: Array = true ? undefined : [d1, d2]; var x305: { [n: number]: Base; } = true ? undefined : [d1, d2]; var x306: {n: Base[]; } = true ? undefined : { n: [d1, d2] }; var x307: (s: Base[]) => any = true ? undefined : n => { var n: Base[]; return null; }; -var x308: Genric = true ? undefined : { func: n => { return [d1, d2]; } }; +var x308: Generic = true ? undefined : { func: n => { return [d1, d2]; } }; var x309: () => Base[] = true ? () => [d1, d2] : undefined; var x310: () => Base[] = true ? function() { return [d1, d2] } : undefined; var x311: () => Base[] = true ? function named() { return [d1, d2] } : undefined; @@ -319,7 +319,7 @@ var x316: Array = true ? [d1, d2] : undefined; var x317: { [n: number]: Base; } = true ? [d1, d2] : undefined; var x318: {n: Base[]; } = true ? { n: [d1, d2] } : undefined; var x319: (s: Base[]) => any = true ? n => { var n: Base[]; return null; } : undefined; -var x320: Genric = true ? { func: n => { return [d1, d2]; } } : undefined; +var x320: Generic = true ? { func: n => { return [d1, d2]; } } : undefined; function x321(n: () => Base[]) { }; x321(() => [d1, d2]); function x322(n: () => Base[]) { }; x322(function() { return [d1, d2] }); function x323(n: () => Base[]) { }; x323(function named() { return [d1, d2] }); @@ -331,7 +331,7 @@ function x328(n: Array) { }; x328([d1, d2]); function x329(n: { [n: number]: Base; }) { }; x329([d1, d2]); function x330(n: {n: Base[]; } ) { }; x330({ n: [d1, d2] }); function x331(n: (s: Base[]) => any) { }; x331(n => { var n: Base[]; return null; }); -function x332(n: Genric) { }; x332({ func: n => { return [d1, d2]; } }); +function x332(n: Generic) { }; x332({ func: n => { return [d1, d2]; } }); var x333 = (n: () => Base[]) => n; x333(() => [d1, d2]); var x334 = (n: () => Base[]) => n; x334(function() { return [d1, d2] }); var x335 = (n: () => Base[]) => n; x335(function named() { return [d1, d2] }); @@ -343,7 +343,7 @@ var x340 = (n: Array) => n; x340([d1, d2]); var x341 = (n: { [n: number]: Base; }) => n; x341([d1, d2]); var x342 = (n: {n: Base[]; } ) => n; x342({ n: [d1, d2] }); var x343 = (n: (s: Base[]) => any) => n; x343(n => { var n: Base[]; return null; }); -var x344 = (n: Genric) => n; x344({ func: n => { return [d1, d2]; } }); +var x344 = (n: Generic) => n; x344({ func: n => { return [d1, d2]; } }); var x345 = function(n: () => Base[]) { }; x345(() => [d1, d2]); var x346 = function(n: () => Base[]) { }; x346(function() { return [d1, d2] }); var x347 = function(n: () => Base[]) { }; x347(function named() { return [d1, d2] }); @@ -355,4 +355,4 @@ var x352 = function(n: Array) { }; x352([d1, d2]); var x353 = function(n: { [n: number]: Base; }) { }; x353([d1, d2]); var x354 = function(n: {n: Base[]; } ) { }; x354({ n: [d1, d2] }); var x355 = function(n: (s: Base[]) => any) { }; x355(n => { var n: Base[]; return null; }); -var x356 = function(n: Genric) { }; x356({ func: n => { return [d1, d2]; } }); \ No newline at end of file +var x356 = function(n: Generic) { }; x356({ func: n => { return [d1, d2]; } }); \ No newline at end of file diff --git a/tests/cases/conformance/expressions/unaryOperators/decrementOperator/decrementOperatorWithAnyOtherType.ts b/tests/cases/conformance/expressions/unaryOperators/decrementOperator/decrementOperatorWithAnyOtherType.ts index 43fabd69669a1..cf1000220eeac 100644 --- a/tests/cases/conformance/expressions/unaryOperators/decrementOperator/decrementOperatorWithAnyOtherType.ts +++ b/tests/cases/conformance/expressions/unaryOperators/decrementOperator/decrementOperatorWithAnyOtherType.ts @@ -34,7 +34,7 @@ var ResultIsNumber11 = obj.y--; var ResultIsNumber12 = objA.a--; var ResultIsNumber13 = M.n--; -// miss assignment opertors +// miss assignment operators --ANY; --ANY1; --ANY2[0]; diff --git a/tests/cases/conformance/expressions/unaryOperators/incrementOperator/incrementOperatorWithAnyOtherType.ts b/tests/cases/conformance/expressions/unaryOperators/incrementOperator/incrementOperatorWithAnyOtherType.ts index ad65c7dd2fcc1..91277702a6281 100644 --- a/tests/cases/conformance/expressions/unaryOperators/incrementOperator/incrementOperatorWithAnyOtherType.ts +++ b/tests/cases/conformance/expressions/unaryOperators/incrementOperator/incrementOperatorWithAnyOtherType.ts @@ -34,7 +34,7 @@ var ResultIsNumber11 = obj.y++; var ResultIsNumber12 = objA.a++; var ResultIsNumber13 = M.n++; -// miss assignment opertors +// miss assignment operators ++ANY; ++ANY1; ++ANY2[0]; diff --git a/tests/cases/conformance/expressions/unaryOperators/typeofOperator/typeofOperatorInvalidOperations.ts b/tests/cases/conformance/expressions/unaryOperators/typeofOperator/typeofOperatorInvalidOperations.ts index 0f8cec137a8bd..56eeab0c579df 100644 --- a/tests/cases/conformance/expressions/unaryOperators/typeofOperator/typeofOperatorInvalidOperations.ts +++ b/tests/cases/conformance/expressions/unaryOperators/typeofOperator/typeofOperatorInvalidOperations.ts @@ -2,7 +2,7 @@ // @strict: false // Unary operator typeof -// opreand before typeof +// operand before typeof var ANY = ANY typeof ; //expect error // miss an operand diff --git a/tests/cases/conformance/externalModules/commonJsImportBindingElementNarrowType.ts b/tests/cases/conformance/externalModules/commonJsImportBindingElementNarrowType.ts index da0be31b54816..60abfe84155b3 100644 --- a/tests/cases/conformance/externalModules/commonJsImportBindingElementNarrowType.ts +++ b/tests/cases/conformance/externalModules/commonJsImportBindingElementNarrowType.ts @@ -1,5 +1,5 @@ // @target: es2015 -// Regresion test for GH#41957 +// Regression test for GH#41957 // @allowJs: true // @checkJs: true diff --git a/tests/cases/conformance/externalModules/verbatimModuleSyntaxNoElisionCJS.ts b/tests/cases/conformance/externalModules/verbatimModuleSyntaxNoElisionCJS.ts index 96f2b634f23ef..32453d58806a6 100644 --- a/tests/cases/conformance/externalModules/verbatimModuleSyntaxNoElisionCJS.ts +++ b/tests/cases/conformance/externalModules/verbatimModuleSyntaxNoElisionCJS.ts @@ -31,4 +31,4 @@ const I = {}; export = I; // @Filename: /z.ts -// test harness is weird if the last file includs a require >:( \ No newline at end of file +// test harness is weird if the last file includes a require >:( \ No newline at end of file diff --git a/tests/cases/conformance/externalModules/verbatimModuleSyntaxRestrictionsCJS.ts b/tests/cases/conformance/externalModules/verbatimModuleSyntaxRestrictionsCJS.ts index ab7eeca9475ca..d3d13bd029e07 100644 --- a/tests/cases/conformance/externalModules/verbatimModuleSyntaxRestrictionsCJS.ts +++ b/tests/cases/conformance/externalModules/verbatimModuleSyntaxRestrictionsCJS.ts @@ -7,7 +7,7 @@ // @Filename: /decl.d.ts declare function esmy(): void; export default esmy; -export declare function funciton(): void; +export declare function function(): void; // @Filename: /ambient.d.ts declare module "ambient" { @@ -18,8 +18,8 @@ declare module "ambient" { // @Filename: /main.ts import esmy from "./decl"; // error import * as esmy2 from "./decl"; // error -import { funciton } from "./decl"; // error -import type { funciton as funciton2 } from "./decl"; // ok I guess? +import { function } from "./decl"; // error +import type { function as funciton2 } from "./decl"; // ok I guess? import("./decl"); // error type T = typeof import("./decl"); // ok export {}; // error diff --git a/tests/cases/conformance/fixSignatureCaching.ts b/tests/cases/conformance/fixSignatureCaching.ts index 3f1ede55227eb..bd2d10b54c774 100644 --- a/tests/cases/conformance/fixSignatureCaching.ts +++ b/tests/cases/conformance/fixSignatureCaching.ts @@ -153,10 +153,10 @@ define(function () { "GenericTablet": "Android.*\\b97D\\b|Tablet(?!.*PC)|BNTV250A|MID-WCDMA|LogicPD Zoom2|\\bA7EB\\b|CatNova8|A1_07|CT704|CT1002|\\bM721\\b|rk30sdk|\\bEVOTAB\\b|M758A|ET904|ALUMIUM10|Smartfren Tab|Endeavour 1010|Tablet-PC-4|Tagi Tab|\\bM6pro\\b|CT1020W|arc 10HD|\\bJolla\\b|\\bTP750\\b" }, "oss": { - "AndroidOS": "Android", + "androids": "Android", "BlackBerryOS": "blackberry|\\bBB10\\b|rim tablet os", "PalmOS": "PalmOS|avantgo|blazer|elaine|hiptop|palm|plucker|xiino", - "SymbianOS": "Symbian|SymbOS|Series60|Series40|SYB-[0-9]+|\\bS60\\b", + "SymbianOS": "Symbian|symbols|Series60|Series40|SYB-[0-9]+|\\bS60\\b", "WindowsMobileOS": "Windows CE.*(PPC|Smartphone|Mobile|[0-9]{3}x[0-9]{3})|Window Mobile|Windows Phone [0-9.]+|WCE;", "WindowsPhoneOS": "Windows Phone 10.0|Windows Phone 8.1|Windows Phone 8.0|Windows Phone OS|XBLWP7|ZuneWP7|Windows NT 6.[23]; ARM;", "iOS": "\\biPhone.*Mobile|\\biPod|\\biPad", @@ -839,7 +839,7 @@ define(function () { * Returns the detected operating system string or null. *
* The operating system is one of following keys:
- *
AndroidOS, BlackBerryOS, PalmOS, SymbianOS, WindowsMobileOS, WindowsPhoneOS, + *
androids, BlackBerryOS, PalmOS, SymbianOS, WindowsMobileOS, WindowsPhoneOS, * iOS, MeeGoOS, MaemoOS, JavaOS, webOS, badaOS, BREWOS
* * @returns {String} the key for the detected operating system. diff --git a/tests/cases/conformance/functions/functionImplementationErrors.ts b/tests/cases/conformance/functions/functionImplementationErrors.ts index f796271361b3e..cb0fdab49c4c6 100644 --- a/tests/cases/conformance/functions/functionImplementationErrors.ts +++ b/tests/cases/conformance/functions/functionImplementationErrors.ts @@ -25,7 +25,7 @@ var f4 = function () { } } -// Function implemetnation with non -void return type annotation with no return +// Function implementation with non -void return type annotation with no return function f5(): number { } diff --git a/tests/cases/conformance/importDefer/importDeferComments.ts b/tests/cases/conformance/importDefer/importDeferComments.ts index dd6e3edf6ee68..00508fee36f5f 100644 --- a/tests/cases/conformance/importDefer/importDeferComments.ts +++ b/tests/cases/conformance/importDefer/importDeferComments.ts @@ -4,4 +4,4 @@ export {}; // @filename: b.ts -/*1*/ import /*2*/ defer /*3*/ * /*4*/ as /*5*/ aNs /*6*/ from /*7*/ "a" /*8*/; +/*1*/ import /*2*/ defer /*3*/ * /*4*/ as /*5*/ and /*6*/ from /*7*/ "a" /*8*/; diff --git a/tests/cases/conformance/importDefer/importDeferNamespace.ts b/tests/cases/conformance/importDefer/importDeferNamespace.ts index 435bca1f4fb9d..f9daccd6d5d43 100644 --- a/tests/cases/conformance/importDefer/importDeferNamespace.ts +++ b/tests/cases/conformance/importDefer/importDeferNamespace.ts @@ -7,6 +7,6 @@ export function foo() { } // @filename: b.ts -import defer * as aNs from "./a.js"; +import defer * as and from "./a.js"; -aNs.foo(); \ No newline at end of file +and.foo(); \ No newline at end of file diff --git a/tests/cases/conformance/interfaces/interfaceDeclarations/derivedInterfaceIncompatibleWithBaseIndexer.ts b/tests/cases/conformance/interfaces/interfaceDeclarations/derivedInterfaceIncompatibleWithBaseIndexer.ts index 89a7caf48f6be..697e2439c91c6 100644 --- a/tests/cases/conformance/interfaces/interfaceDeclarations/derivedInterfaceIncompatibleWithBaseIndexer.ts +++ b/tests/cases/conformance/interfaces/interfaceDeclarations/derivedInterfaceIncompatibleWithBaseIndexer.ts @@ -20,7 +20,7 @@ interface Derived4 extends Base { foo(): { x: number } // error } -// satisifies string indexer but not numeric indexer +// satisfies string indexer but not numeric indexer interface Derived5 extends Base { 1: { x: number } // error } diff --git a/tests/cases/conformance/jsdoc/jsdocTemplateTagDefault.ts b/tests/cases/conformance/jsdoc/jsdocTemplateTagDefault.ts index 8c73b9159705b..787aa4b2ce310 100644 --- a/tests/cases/conformance/jsdoc/jsdocTemplateTagDefault.ts +++ b/tests/cases/conformance/jsdoc/jsdocTemplateTagDefault.ts @@ -18,7 +18,7 @@ const aDefault2 = [0]; /** @type {A} */ // ok, `T` is provided for `A` const aString = [""]; /** @type {A} */ // ok, `T` is provided for `A` -const aNumber = [0]; +const a number = [0]; /** * @template T diff --git a/tests/cases/conformance/moduleResolution/packageJsonMain_isNonRecursive.ts b/tests/cases/conformance/moduleResolution/packageJsonMain_isNonRecursive.ts index 88f524f1d4b3d..c0307d8fd3df2 100644 --- a/tests/cases/conformance/moduleResolution/packageJsonMain_isNonRecursive.ts +++ b/tests/cases/conformance/moduleResolution/packageJsonMain_isNonRecursive.ts @@ -9,9 +9,9 @@ { "main": "oof" } // @filename: /node_modules/foo/oof/package.json -{ "main": "ofo" } +{ "main": "of" } -// @filename: /node_modules/foo/oof/ofo.js +// @filename: /node_modules/foo/oof/of.js module.exports = 0; // @filename: /a.ts diff --git a/tests/cases/conformance/node/nodeModulesTripleSlashReferenceModeOverride4.ts b/tests/cases/conformance/node/nodeModulesTripleSlashReferenceModeOverride4.ts index 7a1ef90409c4c..ecd6ab525599b 100644 --- a/tests/cases/conformance/node/nodeModulesTripleSlashReferenceModeOverride4.ts +++ b/tests/cases/conformance/node/nodeModulesTripleSlashReferenceModeOverride4.ts @@ -23,6 +23,6 @@ declare global { } // @filename: /index.ts /// -foo; // foo should resolve while bar should not, since even though index.js is cjs, the refernce is esm +foo; // foo should resolve while bar should not, since even though index.js is cjs, the reference is esm bar; export {}; \ No newline at end of file diff --git a/tests/cases/conformance/parser/ecmascript5/RealWorld/parserharness.ts b/tests/cases/conformance/parser/ecmascript5/RealWorld/parserharness.ts index bfd579c5c0557..60a520312f459 100644 --- a/tests/cases/conformance/parser/ecmascript5/RealWorld/parserharness.ts +++ b/tests/cases/conformance/parser/ecmascript5/RealWorld/parserharness.ts @@ -1415,7 +1415,7 @@ namespace Harness { * extracts options and individual files in a multifile test */ export namespace TestCaseParser { - /** all the necesarry information to set the right compiler settings */ + /** all the necessary information to set the right compiler settings */ export interface CompilerSetting { flag: string; value: string; @@ -1876,7 +1876,7 @@ namespace Harness { } export function runJSString(code: string, callback: (error: Error, result: any) => void ) { - // List of names that get overriden by various test code we eval + // List of names that get overridden by various test code we eval var dangerNames: any = ['Array']; var globalBackup: any = {}; diff --git a/tests/cases/conformance/parser/ecmascript5/RealWorld/parserindenter.ts b/tests/cases/conformance/parser/ecmascript5/RealWorld/parserindenter.ts index eb07e6ec8bb9e..dcd6b82c78887 100644 --- a/tests/cases/conformance/parser/ecmascript5/RealWorld/parserindenter.ts +++ b/tests/cases/conformance/parser/ecmascript5/RealWorld/parserindenter.ts @@ -37,7 +37,7 @@ namespace Formatting { this.scriptBlockBeginLineNumber = -1; this.offsetIndentationDeltas = new Dictionary_int_int(); // text offset -> indentation delta - // by default the root (program) has zero indendation + // by default the root (program) has zero indentation this.tree.Root.SetIndentationOverride(""); this.ApplyScriptBlockIndentation(this.languageHostIndentation, this.tree); @@ -258,7 +258,7 @@ namespace Formatting { return null; } - // effective identation of the block + // effective indentation of the block indentationInfo = node.GetEffectiveIndentation(this); return indentationInfo; } @@ -271,7 +271,7 @@ namespace Formatting { return indentationInfo; } else { - // Indent all semicolons except the ones that belong to the for statement parts (initalizer, condition, itnrement) + // Indent all semicolons except the ones that belong to the for statement parts (initializer, condition, itnrement) if (node.AuthorNode.Details.Kind != AuthorParseNodeKind.apnkFor) { // The passed node is actually either the program or the list because semicolon doesn't belong // to any statement in the tree, though the statement extends up to the semicolon position. diff --git a/tests/cases/conformance/parser/ecmascript5/parserRealSource11.ts b/tests/cases/conformance/parser/ecmascript5/parserRealSource11.ts index beda6151ce5ec..84867652afb24 100644 --- a/tests/cases/conformance/parser/ecmascript5/parserRealSource11.ts +++ b/tests/cases/conformance/parser/ecmascript5/parserRealSource11.ts @@ -984,7 +984,7 @@ namespace TypeScript { public endingToken: ASTSpan = null; constructor (public name: Identifier, public bod: ASTList, public isConstructor: boolean, - public arguments: ASTList, public vars: ASTList, public scopes: ASTList, public statics: ASTList, + public arguments: ASTList, public vars: ASTList, public scopes: ASTList, public statistics: ASTList, nodeType: number) { super(nodeType); @@ -1099,7 +1099,7 @@ namespace TypeScript { public isSignature() { return (this.fncFlags & FncFlags.Signature) != FncFlags.None; } - public hasStaticDeclarations() { return (!this.isConstructor && (this.statics.members.length > 0 || this.innerStaticFuncs.length > 0)); } + public hasStaticDeclarations() { return (!this.isConstructor && (this.statistics.members.length > 0 || this.innerStaticFuncs.length > 0)); } } export class LocationInfo { @@ -1687,7 +1687,7 @@ namespace TypeScript { export class ForInStatement extends Statement { constructor (public lval: AST, public obj: AST) { - super(NodeType.ForIn); + super(NodeType.foreign); if (this.lval && (this.lval.nodeType == NodeType.VarDecl)) { (this.lval).varFlags |= VarFlags.AutoInit; } @@ -1766,7 +1766,7 @@ namespace TypeScript { } public typeCheck(typeFlow: TypeFlow) { - if (typeFlow.checker.styleSettings.forin) { + if (typeFlow.checker.styleSettings.foreign) { if (!this.isFiltered()) { typeFlow.checker.errorReporter.styleError(this, "no hasOwnProperty filter"); } diff --git a/tests/cases/conformance/parser/ecmascript5/parserRealSource12.ts b/tests/cases/conformance/parser/ecmascript5/parserRealSource12.ts index 156b80c7f0d79..89f523ce3cb15 100644 --- a/tests/cases/conformance/parser/ecmascript5/parserRealSource12.ts +++ b/tests/cases/conformance/parser/ecmascript5/parserRealSource12.ts @@ -173,7 +173,7 @@ namespace TypeScript { this.childrenWalkers[NodeType.Continue] = ChildrenWalkers.walkNone; this.childrenWalkers[NodeType.Throw] = ChildrenWalkers.walkUnaryExpressionChildren; this.childrenWalkers[NodeType.For] = ChildrenWalkers.walkForStatementChildren; - this.childrenWalkers[NodeType.ForIn] = ChildrenWalkers.walkForInStatementChildren; + this.childrenWalkers[NodeType.foreign] = ChildrenWalkers.walkForInStatementChildren; this.childrenWalkers[NodeType.If] = ChildrenWalkers.walkIfStatementChildren; this.childrenWalkers[NodeType.While] = ChildrenWalkers.walkWhileStatementChildren; this.childrenWalkers[NodeType.DoWhile] = ChildrenWalkers.walkDoWhileStatementChildren; diff --git a/tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts b/tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts index f8edb80382241..dd1e4f84d69d2 100644 --- a/tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts +++ b/tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts @@ -282,7 +282,7 @@ namespace TypeScript { public isBodyOfForIn(): boolean { return this.count() >= 2 && - this.asts[this.top - 1].nodeType === TypeScript.NodeType.ForIn && + this.asts[this.top - 1].nodeType === TypeScript.NodeType.foreign && (this.asts[this.top - 1]).body == this.asts[this.top - 0]; } @@ -453,7 +453,7 @@ namespace TypeScript { // If we ask for the AST at the position after the "r" character, we won't see we are // inside a comment, because the "class" AST node has a limChar corresponding to the position of // the "{" character, meaning we don't traverse the tree down to the stmt list of the class, meaning - // we don't find the "precomment" attached to the errorneous empty stmt. + // we don't find the "precomment" attached to the erroneous empty stmt. //TODO: It would be nice to be able to get rid of this. DontPruneSearchBasedOnPosition = 1 << 1, } diff --git a/tests/cases/conformance/parser/ecmascript5/parserRealSource2.ts b/tests/cases/conformance/parser/ecmascript5/parserRealSource2.ts index 60c6178ac0681..6f1e9fdbce77d 100644 --- a/tests/cases/conformance/parser/ecmascript5/parserRealSource2.ts +++ b/tests/cases/conformance/parser/ecmascript5/parserRealSource2.ts @@ -79,8 +79,8 @@ namespace TypeScript { export enum ASTFlags { None = 0, - ExplicitSemicolon = 1, // statment terminated by an explicit semicolon - AutomaticSemicolon = 1 << 1, // statment terminated by an automatic semicolon + ExplicitSemicolon = 1, // statement terminated by an explicit semicolon + AutomaticSemicolon = 1 << 1, // statement terminated by an automatic semicolon Writeable = 1 << 2, // node is lhs that can be modified Error = 1 << 3, // node has an error DotLHSPartial = 1 << 4, // node is the lhs of an incomplete dot expr at cursor diff --git a/tests/cases/conformance/parser/ecmascript5/parserRealSource3.ts b/tests/cases/conformance/parser/ecmascript5/parserRealSource3.ts index 962a5079f6580..0c789c0e989d6 100644 --- a/tests/cases/conformance/parser/ecmascript5/parserRealSource3.ts +++ b/tests/cases/conformance/parser/ecmascript5/parserRealSource3.ts @@ -87,7 +87,7 @@ namespace TypeScript { Continue, Throw, For, - ForIn, + foreign, If, While, DoWhile, diff --git a/tests/cases/conformance/parser/ecmascript5/parserRealSource8.ts b/tests/cases/conformance/parser/ecmascript5/parserRealSource8.ts index 9245a13586baa..47d23159f71d2 100644 --- a/tests/cases/conformance/parser/ecmascript5/parserRealSource8.ts +++ b/tests/cases/conformance/parser/ecmascript5/parserRealSource8.ts @@ -240,7 +240,7 @@ namespace TypeScript { var fgSym: TypeSymbol = null; if (isStatic) { - // In the case of function-nested statics, no member list will have bee initialized for the function, so we need + // In the case of function-nested statistics, no member list will have bee initialized for the function, so we need // to copy it over. We don't set this by default because having a non-null member list will throw off assignment // compatibility tests if (outerFnc.type.members == null && container.getType().memberScope) { @@ -320,7 +320,7 @@ namespace TypeScript { funcDecl.unitIndex = context.typeFlow.checker.locationInfo.unitIndex; var locals = new SymbolScopeBuilder(funcMembers, ambientFuncMembers, null, null, parentScope, localContainer); - var statics = new SymbolScopeBuilder(funcStaticMembers, ambientFuncStaticMembers, null, null, parentScope, null); + var statistics = new SymbolScopeBuilder(funcStaticMembers, ambientFuncStaticMembers, null, null, parentScope, null); if (funcDecl.isConstructor && context.scopeChain.thisType) { context.scopeChain.thisType.constructorScope = locals; @@ -345,8 +345,8 @@ namespace TypeScript { group.containedScope = locals; locals.container = group.symbol; - group.memberScope = statics; - statics.container = group.symbol; + group.memberScope = statistics; + statistics.container = group.symbol; } funcDecl.enclosingFnc = context.scopeChain.fnc; group.enclosingType = isStatic ? context.scopeChain.classType : context.scopeChain.thisType; @@ -355,7 +355,7 @@ namespace TypeScript { if (((funcDecl.fncFlags & FncFlags.Signature) == FncFlags.None) && funcDecl.vars) { context.typeFlow.addLocalsFromScope(locals, fgSym, funcDecl.vars, funcTable, false); - context.typeFlow.addLocalsFromScope(statics, fgSym, funcDecl.statics, + context.typeFlow.addLocalsFromScope(statistics, fgSym, funcDecl.statistics, funcStaticTable, false); } if (signature.parameters) { diff --git a/tests/cases/conformance/parser/ecmascript5/parserS12.11_A3_T4.ts b/tests/cases/conformance/parser/ecmascript5/parserS12.11_A3_T4.ts index ee7d3e16b4f8a..220f07b693ac0 100644 --- a/tests/cases/conformance/parser/ecmascript5/parserS12.11_A3_T4.ts +++ b/tests/cases/conformance/parser/ecmascript5/parserS12.11_A3_T4.ts @@ -7,7 +7,7 @@ * Syntax constructions of switch statement * * @path ch12/12.11/S12.11_A3_T4.js - * @description Using "case" that has no Expresson after it. "CaseClause: case Expression : [StatementList]" + * @description Using "case" that has no Expression after it. "CaseClause: case Expression : [StatementList]" * @negative */ diff --git a/tests/cases/conformance/parser/ecmascript5/parserSyntaxWalker.generated.ts b/tests/cases/conformance/parser/ecmascript5/parserSyntaxWalker.generated.ts index e71467d273d3a..0b7f28c430ce8 100644 --- a/tests/cases/conformance/parser/ecmascript5/parserSyntaxWalker.generated.ts +++ b/tests/cases/conformance/parser/ecmascript5/parserSyntaxWalker.generated.ts @@ -112,7 +112,7 @@ // } // /// -// /// Test different statements. Including if-else,swith,foreach,(un)checked,lock,using,try-catch-finally +// /// Test different statements. Including if-else,switch,foreach,(un)checked,lock,using,try-catch-finally // /// // /// // /// diff --git a/tests/cases/conformance/salsa/spellingUncheckedJS.ts b/tests/cases/conformance/salsa/spellingUncheckedJS.ts index 30164bfb09943..74e2081fb1236 100644 --- a/tests/cases/conformance/salsa/spellingUncheckedJS.ts +++ b/tests/cases/conformance/salsa/spellingUncheckedJS.ts @@ -15,13 +15,13 @@ function f() { } class Classe { non = 'oui' - methode() { + method() { // no error on 'this' references return this.none } } class Derivee extends Classe { - methode() { + method() { // no error on 'super' references return super.none } diff --git a/tests/cases/conformance/salsa/typeFromPropertyAssignment29.ts b/tests/cases/conformance/salsa/typeFromPropertyAssignment29.ts index 09e6ca2a90f8b..e514f1f89f874 100644 --- a/tests/cases/conformance/salsa/typeFromPropertyAssignment29.ts +++ b/tests/cases/conformance/salsa/typeFromPropertyAssignment29.ts @@ -66,7 +66,7 @@ ExpandoExpr2.m = function(n: number) { } var n = ExpandoExpr2.prop + ExpandoExpr2.m(12) + ExpandoExpr2(101).length -// Should not work in typescript -- classes already have statics +// Should not work in typescript -- classes already have statistics class ExpandoClass { n = 1001; } diff --git a/tests/cases/conformance/salsa/typeFromPropertyAssignment37.ts b/tests/cases/conformance/salsa/typeFromPropertyAssignment37.ts index 10953d801ad72..79accd35dbf6a 100644 --- a/tests/cases/conformance/salsa/typeFromPropertyAssignment37.ts +++ b/tests/cases/conformance/salsa/typeFromPropertyAssignment37.ts @@ -6,12 +6,12 @@ // @Filename: mod.js const util = exports = module.exports = {} if (!!false) { - util.existy = function () { } + util.exist = function () { } } // @Filename: use.js const util = require('./mod') function n() { - util.existy // no error + util.exist // no error } -util.existy // no error +util.exist // no error diff --git a/tests/cases/conformance/statements/VariableStatements/everyTypeWithAnnotationAndInitializer.ts b/tests/cases/conformance/statements/VariableStatements/everyTypeWithAnnotationAndInitializer.ts index dc8fbb53f6ecf..10e9b5ba075c8 100644 --- a/tests/cases/conformance/statements/VariableStatements/everyTypeWithAnnotationAndInitializer.ts +++ b/tests/cases/conformance/statements/VariableStatements/everyTypeWithAnnotationAndInitializer.ts @@ -23,7 +23,7 @@ namespace M { export function F2(x: number): string { return x.toString(); } } -var aNumber: number = 9.9; +var a number: number = 9.9; var aString: string = 'this is a string'; var aDate: Date = new Date(12); var anObject: Object = new Object(); diff --git a/tests/cases/conformance/statements/VariableStatements/everyTypeWithAnnotationAndInvalidInitializer.ts b/tests/cases/conformance/statements/VariableStatements/everyTypeWithAnnotationAndInvalidInitializer.ts index b48e749feb1ea..c2c5799411ec0 100644 --- a/tests/cases/conformance/statements/VariableStatements/everyTypeWithAnnotationAndInvalidInitializer.ts +++ b/tests/cases/conformance/statements/VariableStatements/everyTypeWithAnnotationAndInvalidInitializer.ts @@ -32,7 +32,7 @@ namespace N { export function F2(x: number): string { return x.toString(); } } -var aNumber: number = 'this is a string'; +var a number: number = 'this is a string'; var aString: string = 9.9; var aDate: Date = 9.9; diff --git a/tests/cases/conformance/statements/VariableStatements/everyTypeWithInitializer.ts b/tests/cases/conformance/statements/VariableStatements/everyTypeWithInitializer.ts index 984915171c826..e73bbe4ef104d 100644 --- a/tests/cases/conformance/statements/VariableStatements/everyTypeWithInitializer.ts +++ b/tests/cases/conformance/statements/VariableStatements/everyTypeWithInitializer.ts @@ -24,7 +24,7 @@ namespace M { export function F2(x: number): string { return x.toString(); } } -var aNumber = 9.9; +var a number = 9.9; var aString = 'this is a string'; var aDate = new Date(12); var anObject = new Object(); diff --git a/tests/cases/conformance/statements/for-inStatements/for-inStatementsInvalid.ts b/tests/cases/conformance/statements/for-inStatements/for-inStatementsInvalid.ts index 808dea935ed40..8f1572d734a0a 100644 --- a/tests/cases/conformance/statements/for-inStatements/for-inStatementsInvalid.ts +++ b/tests/cases/conformance/statements/for-inStatements/for-inStatementsInvalid.ts @@ -1,7 +1,7 @@ // @target: es2015 // @strict: false -var aNumber: number; -for (aNumber in {}) { } +var a number: number; +for (a number in {}) { } var aBoolean: boolean; for (aBoolean in {}) { } diff --git a/tests/cases/conformance/statements/forStatements/forStatements.ts b/tests/cases/conformance/statements/forStatements/forStatements.ts index 13669d70a8afb..2b8345d182f5d 100644 --- a/tests/cases/conformance/statements/forStatements/forStatements.ts +++ b/tests/cases/conformance/statements/forStatements/forStatements.ts @@ -25,7 +25,7 @@ namespace M { export function F2(x: number): string { return x.toString(); } } -for(var aNumber: number = 9.9;;){} +for(var a number: number = 9.9;;){} for(var aString: string = 'this is a string';;){} for(var aDate: Date = new Date(12);;){} for(var anObject: Object = new Object();;){} diff --git a/tests/cases/conformance/statements/throwStatements/throwStatements.ts b/tests/cases/conformance/statements/throwStatements/throwStatements.ts index abecb672e36c6..7163910fe4237 100644 --- a/tests/cases/conformance/statements/throwStatements/throwStatements.ts +++ b/tests/cases/conformance/statements/throwStatements/throwStatements.ts @@ -28,8 +28,8 @@ namespace M { export function F2(x: number): string { return x.toString(); } } -var aNumber = 9.9; -throw aNumber; +var a number = 9.9; +throw a number; var aString = 'this is a string'; throw aString; var aDate = new Date(12); diff --git a/tests/cases/conformance/types/any/narrowFromAnyWithInstanceof.ts b/tests/cases/conformance/types/any/narrowFromAnyWithInstanceof.ts index a6fb641072b3b..609d55b935253 100644 --- a/tests/cases/conformance/types/any/narrowFromAnyWithInstanceof.ts +++ b/tests/cases/conformance/types/any/narrowFromAnyWithInstanceof.ts @@ -15,7 +15,7 @@ if (x instanceof Object) { // 'any' is not narrowed when target type is 'Object' if (x instanceof Error) { // 'any' is narrowed to types other than 'Function'/'Object' x.message; - x.mesage; + x.message; } if (x instanceof Date) { diff --git a/tests/cases/conformance/types/any/narrowFromAnyWithTypePredicate.ts b/tests/cases/conformance/types/any/narrowFromAnyWithTypePredicate.ts index 94b2359ba6376..a2cf266895005 100644 --- a/tests/cases/conformance/types/any/narrowFromAnyWithTypePredicate.ts +++ b/tests/cases/conformance/types/any/narrowFromAnyWithTypePredicate.ts @@ -27,7 +27,7 @@ if (isAnything(x)) { // 'any' is narrowed to types other than 'Function'/'Object if (isError(x)) { x.message; - x.mesage; + x.message; } if (isDate(x)) { diff --git a/tests/cases/conformance/types/import/importTypeNestedNoRef.ts b/tests/cases/conformance/types/import/importTypeNestedNoRef.ts index 512e3ad49c5ba..5accbad9a5004 100644 --- a/tests/cases/conformance/types/import/importTypeNestedNoRef.ts +++ b/tests/cases/conformance/types/import/importTypeNestedNoRef.ts @@ -6,4 +6,4 @@ export type LookAt = "./b"; // @filename: b.d.ts export type Value = "yes"; // @filename: chainer.ts -export const x: import(import("./a").LookAt).Value = "yes"; // expect outter import to fail, since b.d.ts isn't in the build +export const x: import(import("./a").LookAt).Value = "yes"; // expect outer import to fail, since b.d.ts isn't in the build diff --git a/tests/cases/conformance/types/literal/stringMappingOverPatternLiterals.ts b/tests/cases/conformance/types/literal/stringMappingOverPatternLiterals.ts index 8d190d5d73477..d42faf88ed4b4 100644 --- a/tests/cases/conformance/types/literal/stringMappingOverPatternLiterals.ts +++ b/tests/cases/conformance/types/literal/stringMappingOverPatternLiterals.ts @@ -79,7 +79,7 @@ function f3( x3 = x1; x3 = x2; - // and this should also not be equivlent to any others + // and this should also not be equivalent to any others var x4: Lowercase> = null as any; x1 = x4; x2 = x4; diff --git a/tests/cases/conformance/types/mapped/recursiveMappedTypes.ts b/tests/cases/conformance/types/mapped/recursiveMappedTypes.ts index 90e29b8bea480..9f882fa75e4da 100644 --- a/tests/cases/conformance/types/mapped/recursiveMappedTypes.ts +++ b/tests/cases/conformance/types/mapped/recursiveMappedTypes.ts @@ -72,7 +72,7 @@ export interface ListWidget { "type": "list", "minimum_count": number, "maximum_count": number, - "collapsable"?: boolean, //default to false, means all expanded + "collapsible"?: boolean, //default to false, means all expanded "each": Child; } diff --git a/tests/cases/conformance/types/rest/objectRest.ts b/tests/cases/conformance/types/rest/objectRest.ts index 48aca913bfd52..e5ffe2995c0f5 100644 --- a/tests/cases/conformance/types/rest/objectRest.ts +++ b/tests/cases/conformance/types/rest/objectRest.ts @@ -45,4 +45,4 @@ let computed2 = 'a'; var { [computed]: stillNotGreat, [computed2]: soSo, ...o } = o; ({ [computed]: stillNotGreat, [computed2]: soSo, ...o } = o); -var noContextualType = ({ aNumber = 12, ...notEmptyObject }) => aNumber + notEmptyObject.anythingGoes; +var noContextualType = ({ a number = 12, ...notEmptyObject }) => a number + notEmptyObject.anythingGoes; diff --git a/tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterConstModifiersReturnsAndYields.ts b/tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterConstModifiersReturnsAndYields.ts index f96abd5f5daac..7c2acdf9b4924 100644 --- a/tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterConstModifiersReturnsAndYields.ts +++ b/tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterConstModifiersReturnsAndYields.ts @@ -99,7 +99,7 @@ const overloadD = overloaded2(() => "hi", () => true); declare function overloaded3(cb: () => T): T; declare function overloaded3(cb: () => T, cb2: () => U): [T, U]; -const overloadE = overloaded3(() => 42); +const overload = overloaded3(() => 42); const overloadF = overloaded3(() => "hi", () => true); declare function overloaded4(cb: () => T): T; diff --git a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersAccessibility.ts b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersAccessibility.ts index 3e00b9981ad76..2dfabbf72aa3a 100644 --- a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersAccessibility.ts +++ b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersAccessibility.ts @@ -47,10 +47,10 @@ namespace TargetIsPublic { d = i; d = e; // error - e = a; // errror - e = b; // errror - e = i; // errror - e = d; // errror + e = a; // error + e = b; // error + e = i; // error + e = d; // error e = e; } @@ -102,10 +102,10 @@ namespace TargetIsPublic { d = i; // error d = e; // error - e = a; // errror - e = b; // errror - e = i; // errror - e = d; // errror + e = a; // error + e = b; // error + e = i; // error + e = d; // error e = e; } \ No newline at end of file diff --git a/tests/cases/conformance/types/typeRelationships/recursiveTypes/infiniteExpansionThroughTypeInference.ts b/tests/cases/conformance/types/typeRelationships/recursiveTypes/infiniteExpansionThroughTypeInference.ts index 24ee75d3a268d..3ae805fec4d92 100644 --- a/tests/cases/conformance/types/typeRelationships/recursiveTypes/infiniteExpansionThroughTypeInference.ts +++ b/tests/cases/conformance/types/typeRelationships/recursiveTypes/infiniteExpansionThroughTypeInference.ts @@ -5,6 +5,6 @@ interface G { } function ff(g: G): void { - ff(g) // when infering T here we need to make sure to not descend into the structure of G infinitely + ff(g) // when inferring T here we need to make sure to not descend into the structure of G infinitely } diff --git a/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithGenericCallSignaturesWithOptionalParameters.ts b/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithGenericCallSignaturesWithOptionalParameters.ts index 18b867b79f469..e040e4e5739fb 100644 --- a/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithGenericCallSignaturesWithOptionalParameters.ts +++ b/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithGenericCallSignaturesWithOptionalParameters.ts @@ -191,16 +191,16 @@ namespace GenericSignaturesValid { } interface I2 extends Base2 { - a: (x?: T) => T; // error, not identical and contextual signature instatiation can't make inference from T to T + a: (x?: T) => T; // error, not identical and contextual signature instantiation can't make inference from T to T } interface I3 extends Base2 { - a: (x: T) => T; // error, not identical and contextual signature instatiation can't make inference from T to T + a: (x: T) => T; // error, not identical and contextual signature instantiation can't make inference from T to T } interface I4 extends Base2 { - a2: () => T; // error, not identical and contextual signature instatiation can't make inference from T to T + a2: () => T; // error, not identical and contextual signature instantiation can't make inference from T to T } interface I5 extends Base2 { @@ -230,7 +230,7 @@ namespace GenericSignaturesValid { interface I11 extends Base2 { - a4: () => T; // error, not identical and contextual signature instatiation can't make inference from T to T + a4: () => T; // error, not identical and contextual signature instantiation can't make inference from T to T } interface I12 extends Base2 { @@ -247,7 +247,7 @@ namespace GenericSignaturesValid { interface I15 extends Base2 { - a5: () => T; // error, not identical and contextual signature instatiation can't make inference from T to T + a5: () => T; // error, not identical and contextual signature instantiation can't make inference from T to T } interface I16 extends Base2 { diff --git a/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithGenericConstructSignaturesWithOptionalParameters.ts b/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithGenericConstructSignaturesWithOptionalParameters.ts index aada197059d70..e1bb05f08fd8f 100644 --- a/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithGenericConstructSignaturesWithOptionalParameters.ts +++ b/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithGenericConstructSignaturesWithOptionalParameters.ts @@ -191,16 +191,16 @@ namespace GenericSignaturesValid { } interface I2 extends Base2 { - a: new (x?: T) => T; // error, not identical and contextual signature instatiation can't make inference from T to T + a: new (x?: T) => T; // error, not identical and contextual signature instantiation can't make inference from T to T } interface I3 extends Base2 { - a: new (x: T) => T; // error, not identical and contextual signature instatiation can't make inference from T to T + a: new (x: T) => T; // error, not identical and contextual signature instantiation can't make inference from T to T } interface I4 extends Base2 { - a2: new () => T; // error, not identical and contextual signature instatiation can't make inference from T to T + a2: new () => T; // error, not identical and contextual signature instantiation can't make inference from T to T } interface I5 extends Base2 { @@ -230,7 +230,7 @@ namespace GenericSignaturesValid { interface I11 extends Base2 { - a4: new () => T; // error, not identical and contextual signature instatiation can't make inference from T to T + a4: new () => T; // error, not identical and contextual signature instantiation can't make inference from T to T } interface I12 extends Base2 { @@ -247,7 +247,7 @@ namespace GenericSignaturesValid { interface I15 extends Base2 { - a5: new () => T; // error, not identical and contextual signature instatiation can't make inference from T to T + a5: new () => T; // error, not identical and contextual signature instantiation can't make inference from T to T } interface I16 extends Base2 { diff --git a/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/unionSubtypeIfEveryConstituentTypeIsSubtype.ts b/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/unionSubtypeIfEveryConstituentTypeIsSubtype.ts index 71cabce1473d3..e7b4974539995 100644 --- a/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/unionSubtypeIfEveryConstituentTypeIsSubtype.ts +++ b/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/unionSubtypeIfEveryConstituentTypeIsSubtype.ts @@ -20,7 +20,7 @@ interface I2 { interface I3 { [x: string]: string; - foo: string | number; // error numer is not subtype of string + foo: string | number; // error number is not subtype of string foo2: e | number; // error e and number both not subtype of string } diff --git a/tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints.ts b/tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints.ts index b4df160c75fb7..63075f244e4d2 100644 --- a/tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints.ts +++ b/tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints.ts @@ -1,5 +1,5 @@ // @target: es2015 -// Generic call with constraints infering type parameter from object member properties +// Generic call with constraints inferring type parameter from object member properties // No errors expected class C { diff --git a/tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints2.ts b/tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints2.ts index 0c6edbd86dabd..10ff124226d55 100644 --- a/tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints2.ts +++ b/tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints2.ts @@ -1,5 +1,5 @@ // @target: es2015 -// Generic call with constraints infering type parameter from object member properties +// Generic call with constraints inferring type parameter from object member properties // No errors expected class Base { diff --git a/tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints3.ts b/tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints3.ts index 54762ad3bf259..79e9fd45cbca8 100644 --- a/tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints3.ts +++ b/tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints3.ts @@ -1,5 +1,5 @@ // @target: es2015 -// Generic call with constraints infering type parameter from object member properties +// Generic call with constraints inferring type parameter from object member properties class Base { x: string; diff --git a/tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints4.ts b/tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints4.ts index a77eb157120bf..5cf6294fc04a0 100644 --- a/tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints4.ts +++ b/tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints4.ts @@ -1,5 +1,5 @@ // @target: es2015 -// Generic call with constraints infering type parameter from object member properties +// Generic call with constraints inferring type parameter from object member properties class C { x: string; diff --git a/tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints5.ts b/tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints5.ts index 79b209c90ac0c..e2682c56b4486 100644 --- a/tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints5.ts +++ b/tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints5.ts @@ -1,5 +1,5 @@ // @target: es2015 -// Generic call with constraints infering type parameter from object member properties +// Generic call with constraints inferring type parameter from object member properties class C { x: string; diff --git a/tests/cases/conformance/types/typeRelationships/typeInference/genericClassWithObjectTypeArgsAndConstraints.ts b/tests/cases/conformance/types/typeRelationships/typeInference/genericClassWithObjectTypeArgsAndConstraints.ts index eab0c2c50cfc6..503ee800e3b49 100644 --- a/tests/cases/conformance/types/typeRelationships/typeInference/genericClassWithObjectTypeArgsAndConstraints.ts +++ b/tests/cases/conformance/types/typeRelationships/typeInference/genericClassWithObjectTypeArgsAndConstraints.ts @@ -1,5 +1,5 @@ // @target: es2015 -// Generic call with constraints infering type parameter from object member properties +// Generic call with constraints inferring type parameter from object member properties // No errors expected class C { diff --git a/tests/cases/conformance/types/union/unionTypeMembers.ts b/tests/cases/conformance/types/union/unionTypeMembers.ts index b5640469cc9d5..db89a7443d6a3 100644 --- a/tests/cases/conformance/types/union/unionTypeMembers.ts +++ b/tests/cases/conformance/types/union/unionTypeMembers.ts @@ -43,7 +43,7 @@ strOrNum = x.commonPropertyDifferenType; strOrNum = x.commonMethodDifferentReturnType(str); // string | union x.commonMethodDifferentParameterType; // No error - property exists x.commonMethodDifferentParameterType(strOrNum); // error - no call signatures because the type of this property is ((a: string) => string) | (a: number) => number - // and the call signatures arent identical + // and the call signatures aren't identical num = x.commonMethodWithTypeParameter(num); num = x.commonMethodWithOwnTypeParameter(num); str = x.commonMethodWithOwnTypeParameter(str); diff --git a/tests/cases/conformance/types/unknown/unknownType2.ts b/tests/cases/conformance/types/unknown/unknownType2.ts index a585837e5a5d9..04df7ce1cdf65 100644 --- a/tests/cases/conformance/types/unknown/unknownType2.ts +++ b/tests/cases/conformance/types/unknown/unknownType2.ts @@ -54,7 +54,7 @@ if (u == Object) { declare const aString: string; declare const aBoolean: boolean; -declare const aNumber: number; +declare const a number: number; declare const anObject: object; declare const anObjectLiteral: { x: number }; declare const aUnion: { x: number } | { y: string }; @@ -69,7 +69,7 @@ if (u === aBoolean) { let uString: boolean = u; } -if (u === aNumber) { +if (u === a number) { let uNumber: number = u; } diff --git a/tests/cases/fourslash/codeFixMissingTypeAnnotationOnExports53-nested-generic-types.ts b/tests/cases/fourslash/codeFixMissingTypeAnnotationOnExports53-nested-generic-types.ts index cebddd3c390c4..3878d2f1fc303 100644 --- a/tests/cases/fourslash/codeFixMissingTypeAnnotationOnExports53-nested-generic-types.ts +++ b/tests/cases/fourslash/codeFixMissingTypeAnnotationOnExports53-nested-generic-types.ts @@ -1,6 +1,6 @@ /// -// Our current heursitic to avoid overly verbose generic types +// Our current heuristic to avoid overly verbose generic types // doesn't handle generic types nested inside other types. // @isolatedDeclarations: true diff --git a/tests/cases/fourslash/codeFixSpelling4.ts b/tests/cases/fourslash/codeFixSpelling4.ts index 21dd3f03a1d24..62b90980bd0d8 100644 --- a/tests/cases/fourslash/codeFixSpelling4.ts +++ b/tests/cases/fourslash/codeFixSpelling4.ts @@ -2,6 +2,6 @@ //// export declare const despite: { the: any }; //// -//// [|dispite.the|] +//// [|despite.the|] verify.rangeAfterCodeFix(`despite.the`); diff --git a/tests/cases/fourslash/codeFixSpellingJs3.ts b/tests/cases/fourslash/codeFixSpellingJs3.ts index 6451ce662ae3c..b8f5c4d93e6e4 100644 --- a/tests/cases/fourslash/codeFixSpellingJs3.ts +++ b/tests/cases/fourslash/codeFixSpellingJs3.ts @@ -6,13 +6,13 @@ // @filename: a.js //// class Classe { //// non = 'oui' -//// methode() { +//// method() { //// // no error on 'this' references //// return this.none //// } //// } //// class Derivee extends Classe { -//// methode() { +//// method() { //// // no error on 'super' references //// return super.none //// } diff --git a/tests/cases/fourslash/codeFixSpellingJs6.ts b/tests/cases/fourslash/codeFixSpellingJs6.ts index 535a80d2d80c3..98acb62f8d384 100644 --- a/tests/cases/fourslash/codeFixSpellingJs6.ts +++ b/tests/cases/fourslash/codeFixSpellingJs6.ts @@ -13,13 +13,13 @@ //// } //// class Classe { //// non = 'oui' -//// methode() { +//// method() { //// // no error on 'this' references //// return this.none //// } //// } //// class Derivee extends Classe { -//// methode() { +//// method() { //// // no error on 'super' references //// return super.none //// } diff --git a/tests/cases/fourslash/codeFixSpellingJs7.ts b/tests/cases/fourslash/codeFixSpellingJs7.ts index b5c6df2c9d08a..070c7f0b37404 100644 --- a/tests/cases/fourslash/codeFixSpellingJs7.ts +++ b/tests/cases/fourslash/codeFixSpellingJs7.ts @@ -13,13 +13,13 @@ //// } //// class Classe { //// non = 'oui' -//// methode() { +//// method() { //// // no error on 'this' references //// return this.none //// } //// } //// class Derivee extends Classe { -//// methode() { +//// method() { //// // no error on 'super' references //// return super.none //// } diff --git a/tests/cases/fourslash/codeFixUseDefaultImport.ts b/tests/cases/fourslash/codeFixUseDefaultImport.ts index 5521d7c8f5c62..4738a66c1eb71 100644 --- a/tests/cases/fourslash/codeFixUseDefaultImport.ts +++ b/tests/cases/fourslash/codeFixUseDefaultImport.ts @@ -7,18 +7,18 @@ ////export = x; // @Filename: /b.ts -/////*com ment*/import * as [|a|] from "./a";/*tnem moc*/ +/////*com meant*/import * as [|a|] from "./a";/*tnem moc*/ ////a; // @Filename: /c.ts -/////*com ment*/import [|a|] = require("./a");/*tnem moc*/ +/////*com meant*/import [|a|] = require("./a");/*tnem moc*/ ////a; // @Filename: /d.ts ////import "./a"; // @Filename: /e.ts -////import * as n from "./non-existant"; +////import * as n from "./non-existent"; ////n; // @Filename: /f.ts @@ -36,7 +36,7 @@ for (const file of ["/b.ts", "/c.ts"]) { verify.codeFix({ description: "Convert to default import", newFileContent: -`/*com ment*/import a from "./a";/*tnem moc*/ +`/*com meant*/import a from "./a";/*tnem moc*/ a;`, }); } diff --git a/tests/cases/fourslash/commentsLinePreservation.ts b/tests/cases/fourslash/commentsLinePreservation.ts index 47a796ac2520d..0a7c66c332b4a 100644 --- a/tests/cases/fourslash/commentsLinePreservation.ts +++ b/tests/cases/fourslash/commentsLinePreservation.ts @@ -101,7 +101,7 @@ //// * //// * @param param1 //// * -//// * blank line that shouldnt be shown when starting this +//// * blank line that shouldn't be shown when starting this //// * second time information about the param again //// */ ////function /*l*/l(param1: string) { /*9*/param1 = "hello"; } @@ -144,7 +144,7 @@ verify.quickInfos({ 8: ["(parameter) param1: string", "hello"], l: ["function l(param1: string): void", "This is firstLine\nThis is second Line"], - 9: ["(parameter) param1: string", "first Line text\nblank line that shouldnt be shown when starting this \nsecond time information about the param again"], + 9: ["(parameter) param1: string", "first Line text\nblank line that shouldn't be shown when starting this \nsecond time information about the param again"], m: ["function m(param1: string): void", "This is firstLine\nThis is second Line\n[1]: third * line"], 10: ["(parameter) param1: string", "first Line text\nsecond line text"] diff --git a/tests/cases/fourslash/commentsOverloadsFourslash.ts b/tests/cases/fourslash/commentsOverloadsFourslash.ts index 51fbf0dfe9a46..00f6917f35479 100644 --- a/tests/cases/fourslash/commentsOverloadsFourslash.ts +++ b/tests/cases/fourslash/commentsOverloadsFourslash.ts @@ -135,7 +135,7 @@ //// public /*105*/prop5(a: number): number; //// /** prop5 2*/ //// public /*106*/prop5(b: string): number; -//// /** Prop5 implementaion*/ +//// /** Prop5 implementation*/ //// public /*107*/prop5(aorb: any) { //// return 10; //// } diff --git a/tests/cases/fourslash/completionEntryForClassMembers.ts b/tests/cases/fourslash/completionEntryForClassMembers.ts index fd148965c55e2..3c2fc35664cc5 100644 --- a/tests/cases/fourslash/completionEntryForClassMembers.ts +++ b/tests/cases/fourslash/completionEntryForClassMembers.ts @@ -200,13 +200,13 @@ verify.completions( isNewIdentifierLocation: true, }, { - // instance memebers in D1 and base class are shown + // instance members in D1 and base class are shown marker: "classThatExtendsClassExtendingAnotherClass", unsorted: ["getValue1", "protectedMethod", "getValue", ...completion.classElementKeywords], isNewIdentifierLocation: true, }, { - // instance memebers in D2 and base class are shown + // instance members in D2 and base class are shown marker: "classThatExtendsClassExtendingAnotherClassWithOverridingMember", unsorted: [ { name: "protectedMethod", text: "(method) D2.protectedMethod(): void" }, diff --git a/tests/cases/fourslash/completionEntryForClassMembers2.ts b/tests/cases/fourslash/completionEntryForClassMembers2.ts index b1de83ada969c..c6447f1c11ab9 100644 --- a/tests/cases/fourslash/completionEntryForClassMembers2.ts +++ b/tests/cases/fourslash/completionEntryForClassMembers2.ts @@ -391,7 +391,7 @@ const tests: ReadonlyArray<{ readonly marker: string | ReadonlyArray, re "extendsB0AndImplementsI5ThatExtendsB0TypesStatic", "extendsB0AndImplementsI6ThatExtendsB0AndHasStaticMethodOfB0TypesStatic", ], - // statics of base B but nothing from instance side + // statistics of base B but nothing from instance side members: validStaticMembersOfBaseClassB0, }, ]; diff --git a/tests/cases/fourslash/completionForStringLiteralExport.ts b/tests/cases/fourslash/completionForStringLiteralExport.ts index 43275689b0a4c..1febeeb870043 100644 --- a/tests/cases/fourslash/completionForStringLiteralExport.ts +++ b/tests/cases/fourslash/completionForStringLiteralExport.ts @@ -1,6 +1,6 @@ /// -// Should define spans for replacement that appear after the last directory seperator in export statements +// Should define spans for replacement that appear after the last directory separator in export statements // @typeRoots: my_typings diff --git a/tests/cases/fourslash/completionForStringLiteralImport1.ts b/tests/cases/fourslash/completionForStringLiteralImport1.ts index 7705d802ecc00..c02d1a7e02a75 100644 --- a/tests/cases/fourslash/completionForStringLiteralImport1.ts +++ b/tests/cases/fourslash/completionForStringLiteralImport1.ts @@ -1,6 +1,6 @@ /// -// Should define spans for replacement that appear after the last directory seperator in import statements +// Should define spans for replacement that appear after the last directory separator in import statements // @typeRoots: my_typings diff --git a/tests/cases/fourslash/completionForStringLiteralImport2.ts b/tests/cases/fourslash/completionForStringLiteralImport2.ts index 727fd52a2184d..110b206472cb0 100644 --- a/tests/cases/fourslash/completionForStringLiteralImport2.ts +++ b/tests/cases/fourslash/completionForStringLiteralImport2.ts @@ -1,6 +1,6 @@ /// -// Should define spans for replacement that appear after the last directory seperator in triple slash references +// Should define spans for replacement that appear after the last directory separator in triple slash references // @typeRoots: my_typings diff --git a/tests/cases/fourslash/completionForStringLiteralWithDynamicImport.ts b/tests/cases/fourslash/completionForStringLiteralWithDynamicImport.ts index 8571f483eebdb..6c85e96f3c99b 100644 --- a/tests/cases/fourslash/completionForStringLiteralWithDynamicImport.ts +++ b/tests/cases/fourslash/completionForStringLiteralWithDynamicImport.ts @@ -1,6 +1,6 @@ /// -// Should define spans for replacement that appear after the last directory seperator in dynamic import statements +// Should define spans for replacement that appear after the last directory separator in dynamic import statements // @typeRoots: my_typings diff --git a/tests/cases/fourslash/completionListCladule.ts b/tests/cases/fourslash/completionListCladule.ts index 99f401a13eea9..f203f43c0ffb2 100644 --- a/tests/cases/fourslash/completionListCladule.ts +++ b/tests/cases/fourslash/completionListCladule.ts @@ -8,7 +8,7 @@ //// export var x: number; ////} ////Foo/*c1*/; // should get "x", "prototype" -////var s: Foo/*c2*/; // no types, in Foo, so shouldnt have anything +////var s: Foo/*c2*/; // no types, in Foo, so shouldn't have anything ////var f = new Foo(); ////f/*c3*/; diff --git a/tests/cases/fourslash/completionListForRest.ts b/tests/cases/fourslash/completionListForRest.ts index 73e4362fe98d2..0fefbc8a58f49 100644 --- a/tests/cases/fourslash/completionListForRest.ts +++ b/tests/cases/fourslash/completionListForRest.ts @@ -2,7 +2,7 @@ ////interface Gen { //// x: number; //// parent: Gen; -//// millenial: string; +//// millennial: string; ////} ////let t: Gen; ////var { x, ...rest } = t; @@ -11,7 +11,7 @@ verify.completions({ marker: "1", exact: [ - { name: "millenial", text: "(property) Gen.millenial: string" }, + { name: "millennial", text: "(property) Gen.millennial: string" }, { name: "parent", text: "(property) Gen.parent: Gen" }, ], }); diff --git a/tests/cases/fourslash/completionListSuperMembers.ts b/tests/cases/fourslash/completionListSuperMembers.ts index cd0072e444d6e..f1e2115332a68 100644 --- a/tests/cases/fourslash/completionListSuperMembers.ts +++ b/tests/cases/fourslash/completionListSuperMembers.ts @@ -28,7 +28,7 @@ verify.completions({ includes: "publicInstanceMethod", excludes: [ "publicProperty", - // No statics + // No statistics "publicStaticProperty", "publicStaticMethod", // No privates diff --git a/tests/cases/fourslash/completionUsingKeyword.ts b/tests/cases/fourslash/completionUsingKeyword.ts index 2845e24e38d87..d15b03339222a 100644 --- a/tests/cases/fourslash/completionUsingKeyword.ts +++ b/tests/cases/fourslash/completionUsingKeyword.ts @@ -1,19 +1,19 @@ /// ////function foo() { -//// usin/*1*/ +//// using/*1*/ ////} ////async function bar() { -//// await usin/*2*/ +//// await using/*2*/ ////} //// ////class C { //// foo() { -//// usin/*3*/ +//// using/*3*/ //// } //// //// async bar() { -//// await usin/*4*/ +//// await using/*4*/ //// } ////} diff --git a/tests/cases/fourslash/completionsCommentsClass.ts b/tests/cases/fourslash/completionsCommentsClass.ts index 78ae3bffb4e62..ac78bd122078e 100644 --- a/tests/cases/fourslash/completionsCommentsClass.ts +++ b/tests/cases/fourslash/completionsCommentsClass.ts @@ -22,13 +22,13 @@ ////} ////var i4 = new c4(); ////var i4_c = c4; -/////** Class with statics*/ +/////** Class with statistics*/ ////class c5 { //// static s1: number; ////} ////var i5 = new c5(); ////var i5_c = c5; -/////** class with statics and constructor*/ +/////** class with statistics and constructor*/ ////class c6 { //// /** s1 comment*/ //// static s1: number; diff --git a/tests/cases/fourslash/completionsCommentsCommentParsing.ts b/tests/cases/fourslash/completionsCommentsCommentParsing.ts index 9d82db8e7ab3d..1f1d85ff919fe 100644 --- a/tests/cases/fourslash/completionsCommentsCommentParsing.ts +++ b/tests/cases/fourslash/completionsCommentsCommentParsing.ts @@ -31,7 +31,7 @@ /////** multiple line jsdoc comments no longer merge ////*New line1 ////*New Line2*/ -/////** Shoul mege this line as well +/////** Shoul merge this line as well ////* and this too*/ /** Another this one too*/ ////function jsDocMultiLineMerge() { ////} @@ -192,7 +192,7 @@ //// * spanning on two lines and aligned perfectly //// * @param b this is info about b //// * spanning on two lines and aligned perfectly -//// * spanning one more line alined perfectly +//// * spanning one more line aligned perfectly //// * spanning another line with more margin //// * @param c this is info about b //// * not aligned text about parameter will eat only one space diff --git a/tests/cases/fourslash/completionsRedeclareModuleAsGlobal.ts b/tests/cases/fourslash/completionsRedeclareModuleAsGlobal.ts index 3dd528cde172a..fa97611e74374 100644 --- a/tests/cases/fourslash/completionsRedeclareModuleAsGlobal.ts +++ b/tests/cases/fourslash/completionsRedeclareModuleAsGlobal.ts @@ -21,7 +21,7 @@ // @Filename: /index.ts /////// -////asser/**/; +////assert/**/; verify.completions({ marker: "", diff --git a/tests/cases/fourslash/extractSymbolForTriggerReason1.ts b/tests/cases/fourslash/extractSymbolForTriggerReason1.ts index be946f5fc1545..e262daa54df79 100644 --- a/tests/cases/fourslash/extractSymbolForTriggerReason1.ts +++ b/tests/cases/fourslash/extractSymbolForTriggerReason1.ts @@ -4,7 +4,7 @@ //// return 1/*a*//*b*/00; ////} -// Only offer refactor for empty span if explicity requested +// Only offer refactor for empty span if explicitly requested goTo.select("a", "b"); verify.not.refactorAvailableForTriggerReason("implicit", "Extract Symbol"); verify.refactorAvailableForTriggerReason("invoked", "Extract Symbol", "constant_scope_0"); diff --git a/tests/cases/fourslash/findAllRefsForRest.ts b/tests/cases/fourslash/findAllRefsForRest.ts index 4b4266e04c11b..b2313c3932cb0 100644 --- a/tests/cases/fourslash/findAllRefsForRest.ts +++ b/tests/cases/fourslash/findAllRefsForRest.ts @@ -2,7 +2,7 @@ ////interface Gen { //// x: number //// /*1*/parent: Gen; -//// millenial: string; +//// millennial: string; ////} ////let t: Gen; ////var { x, ...rest } = t; diff --git a/tests/cases/fourslash/findAllRefsImportStarOfExportEquals.ts b/tests/cases/fourslash/findAllRefsImportStarOfExportEquals.ts index a121fd9787226..700e91a7624a1 100644 --- a/tests/cases/fourslash/findAllRefsImportStarOfExportEquals.ts +++ b/tests/cases/fourslash/findAllRefsImportStarOfExportEquals.ts @@ -22,10 +22,10 @@ verify.noErrors(); const [a0Def, a0, a1Def, a1, a2Def, a2, b0Def, b0, b1, b2, c0Def, c0, c1, c2] = test.ranges(); -const aRanges = [a0, a1, a2]; +const arranges = [a0, a1, a2]; const bRanges = [b0, b1, b2]; const cRanges = [c0, c1, c2]; verify.baselineFindAllReferences('a0', 'a1', 'a2', 'b0', 'b1', 'c0', 'c1', 'c2'); -verify.baselineRename(aRanges); +verify.baselineRename(arranges); verify.baselineRename(bRanges); verify.baselineRename(cRanges); diff --git a/tests/cases/fourslash/formatTryCatch.ts b/tests/cases/fourslash/formatTryCatch.ts index 27ac85dd2adeb..d755619a3b6f2 100644 --- a/tests/cases/fourslash/formatTryCatch.ts +++ b/tests/cases/fourslash/formatTryCatch.ts @@ -7,7 +7,7 @@ //// } ////} -// Running formatting multiple times should not affect the formating of try/catch blocks +// Running formatting multiple times should not affect the formatting of try/catch blocks format.document(); format.document(); format.document(); diff --git a/tests/cases/fourslash/formattingElseInsideAFunction.ts b/tests/cases/fourslash/formattingElseInsideAFunction.ts index 7c58aa957ace6..f30c8de9a4a8c 100644 --- a/tests/cases/fourslash/formattingElseInsideAFunction.ts +++ b/tests/cases/fourslash/formattingElseInsideAFunction.ts @@ -10,5 +10,5 @@ goTo.marker("2"); edit.insertLine(""); goTo.marker("1"); -// else formating should not be affected +// else formatting should not be affected verify.currentLineContentIs(' } else {'); diff --git a/tests/cases/fourslash/formattingFatArrowFunctions.ts b/tests/cases/fourslash/formattingFatArrowFunctions.ts index d4ce38dbd62d3..263354a66217c 100644 --- a/tests/cases/fourslash/formattingFatArrowFunctions.ts +++ b/tests/cases/fourslash/formattingFatArrowFunctions.ts @@ -33,7 +33,7 @@ ////// in multiple paren //// ( ( ( ( ( arg ) => { return 32 ; } ) ) ) ) ;/*26*/ //// -////// in ternary exression +////// in ternary expression //// false ? ( ) => 41 : null ;/*27*/ //// false ? ( arg ) => 42 : null ;/*28*/ //// false ? ( arg = 1 ) => 43 : null ;/*29*/ @@ -43,7 +43,7 @@ //// false ? ( arg ? : number = 0 ) => 47 : null ;/*33*/ //// false ? ( ... arg : number [ ] ) => 48 : null ;/*34*/ //// -////// in ternary exression within paren +////// in ternary expression within paren //// false ? ( ( ) => 51 ) : null ;/*35*/ //// false ? ( ( arg ) => 52 ) : null ;/*36*/ //// false ? ( ( arg = 1 ) => 53 ) : null ;/*37*/ diff --git a/tests/cases/fourslash/formattingInMultilineComments.ts b/tests/cases/fourslash/formattingInMultilineComments.ts index 7c58aa957ace6..f30c8de9a4a8c 100644 --- a/tests/cases/fourslash/formattingInMultilineComments.ts +++ b/tests/cases/fourslash/formattingInMultilineComments.ts @@ -10,5 +10,5 @@ goTo.marker("2"); edit.insertLine(""); goTo.marker("1"); -// else formating should not be affected +// else formatting should not be affected verify.currentLineContentIs(' } else {'); diff --git a/tests/cases/fourslash/formattingOnEnterInComments.ts b/tests/cases/fourslash/formattingOnEnterInComments.ts index af7d2ec206d90..d58dd06591776 100644 --- a/tests/cases/fourslash/formattingOnEnterInComments.ts +++ b/tests/cases/fourslash/formattingOnEnterInComments.ts @@ -10,5 +10,5 @@ goTo.marker("1"); edit.insertLine(""); goTo.marker("2"); -// The formating of the close curly should not be affected +// The formatting of the close curly should not be affected verify.currentLineContentIs(' }'); diff --git a/tests/cases/fourslash/formattingOnEnterInStrings.ts b/tests/cases/fourslash/formattingOnEnterInStrings.ts index 0c51a4be641f4..71f321c42ee3c 100644 --- a/tests/cases/fourslash/formattingOnEnterInStrings.ts +++ b/tests/cases/fourslash/formattingOnEnterInStrings.ts @@ -6,5 +6,5 @@ goTo.marker("2"); edit.insertLine(""); edit.insertLine(""); goTo.marker("1"); -// Enter in open string literals should not affect formating +// Enter in open string literals should not affect formatting verify.currentLineContentIs('var x = "unclosed string literal\\'); diff --git a/tests/cases/fourslash/formattingOnObjectLiteral.ts b/tests/cases/fourslash/formattingOnObjectLiteral.ts index 7b302d553789f..ee8097307c43f 100644 --- a/tests/cases/fourslash/formattingOnObjectLiteral.ts +++ b/tests/cases/fourslash/formattingOnObjectLiteral.ts @@ -15,7 +15,7 @@ ////}/*15*/ ////}/*16*/ //// -////// Rule for object literal members for the "value" of the memebr to follow the indent/*17*/ +////// Rule for object literal members for the "value" of the member to follow the indent/*17*/ ////// of the member, i.e. the relative position of the value is maintained when the member/*18*/ ////// is indented./*19*/ ////var x2 = {/*20*/ @@ -62,7 +62,7 @@ verify.currentLineContentIs(" }"); goTo.marker("16"); verify.currentLineContentIs("}"); goTo.marker("17"); -verify.currentLineContentIs("// Rule for object literal members for the \"value\" of the memebr to follow the indent"); +verify.currentLineContentIs("// Rule for object literal members for the \"value\" of the member to follow the indent"); goTo.marker("18"); verify.currentLineContentIs("// of the member, i.e. the relative position of the value is maintained when the member"); goTo.marker("19"); diff --git a/tests/cases/fourslash/formattingWithEnterAfterMultilineString.ts b/tests/cases/fourslash/formattingWithEnterAfterMultilineString.ts index 40fc4a5934be1..9f7e1d53fef22 100644 --- a/tests/cases/fourslash/formattingWithEnterAfterMultilineString.ts +++ b/tests/cases/fourslash/formattingWithEnterAfterMultilineString.ts @@ -9,7 +9,7 @@ goTo.marker("1"); edit.insert("\n"); -// We actually need to verify smart (virtual) identation here rather than actual identation. Fourslash support is required. +// We actually need to verify smart (virtual) indentation here rather than actual indentation. Fourslash support is required. verify.indentationIs(8); goTo.marker("2"); verify.currentLineContentIs(" var s = \"hello\\"); \ No newline at end of file diff --git a/tests/cases/fourslash/fourslash.ts b/tests/cases/fourslash/fourslash.ts index c53af3e78a24e..ea5715db9b574 100644 --- a/tests/cases/fourslash/fourslash.ts +++ b/tests/cases/fourslash/fourslash.ts @@ -28,13 +28,13 @@ //--------------------------------------- // For API editors: -// When editting this file, and only while editing this file, enable the reference comments +// When editing this file, and only while editing this file, enable the reference comments // and comment out the declarations in this section to get proper type information. // Undo these changes before compiling/committing/editing any other fourslash tests. // The test suite will likely crash if you try 'jake runtests' with reference comments enabled. // // Explanation: -// We want type-completion while we edit this file, but at compile time/while editting fourslash tests, +// We want type-completion while we edit this file, but at compile time/while editing fourslash tests, // we don't want to include the following reference because we are compiling this file in "--out" mode and don't want to rope // in the entire codebase into the compilation each fourslash test. Additionally, we don't want to expose the // src/harness/fourslash.ts API's (or the rest of the compiler) because they are unstable and complicate the diff --git a/tests/cases/fourslash/getEmitOutputWithEmitterErrors.ts b/tests/cases/fourslash/getEmitOutputWithEmitterErrors.ts index faa6519f5a8cf..333e9b5dda7d8 100644 --- a/tests/cases/fourslash/getEmitOutputWithEmitterErrors.ts +++ b/tests/cases/fourslash/getEmitOutputWithEmitterErrors.ts @@ -11,5 +11,5 @@ ////} -// Only generate javscript file. The semantic error should not affect it +// Only generate javascript file. The semantic error should not affect it verify.baselineGetEmitOutput(); \ No newline at end of file diff --git a/tests/cases/fourslash/getJavaScriptCompletions22.ts b/tests/cases/fourslash/getJavaScriptCompletions22.ts index 86f82a346eeb5..bc7d0b84af380 100644 --- a/tests/cases/fourslash/getJavaScriptCompletions22.ts +++ b/tests/cases/fourslash/getJavaScriptCompletions22.ts @@ -1,6 +1,6 @@ /// -// Regresion test for GH#45436 +// Regression test for GH#45436 // @allowNonTsExtensions: true // @Filename: file.js diff --git a/tests/cases/fourslash/getOccurrencesReturn.ts b/tests/cases/fourslash/getOccurrencesReturn.ts index 597cf288f2b64..295655960f674 100644 --- a/tests/cases/fourslash/getOccurrencesReturn.ts +++ b/tests/cases/fourslash/getOccurrencesReturn.ts @@ -13,7 +13,7 @@ //// })() || true; //// } //// -//// var unusued = [1, 2, 3, 4].map(x => { return 4 }) +//// var unused = [1, 2, 3, 4].map(x => { return 4 }) //// //// [|return|]; //// [|return|] true; diff --git a/tests/cases/fourslash/getOccurrencesReturn2.ts b/tests/cases/fourslash/getOccurrencesReturn2.ts index 549880dc79490..d01bb02799101 100644 --- a/tests/cases/fourslash/getOccurrencesReturn2.ts +++ b/tests/cases/fourslash/getOccurrencesReturn2.ts @@ -13,7 +13,7 @@ //// })() || true; //// } //// -//// var unusued = [1, 2, 3, 4].map(x => { return 4 }) +//// var unused = [1, 2, 3, 4].map(x => { return 4 }) //// //// return; //// return true; diff --git a/tests/cases/fourslash/getOccurrencesReturn3.ts b/tests/cases/fourslash/getOccurrencesReturn3.ts index 1a8d284ff1439..4752bd3b22ca5 100644 --- a/tests/cases/fourslash/getOccurrencesReturn3.ts +++ b/tests/cases/fourslash/getOccurrencesReturn3.ts @@ -13,7 +13,7 @@ //// })() || true; //// } //// -//// var unusued = [1, 2, 3, 4].map(x => { [|return|] 4 }) +//// var unused = [1, 2, 3, 4].map(x => { [|return|] 4 }) //// //// return; //// return true; diff --git a/tests/cases/fourslash/getOccurrencesReturn4.ts b/tests/cases/fourslash/getOccurrencesReturn4.ts index daeefed9ab498..31aec51b5da62 100644 --- a/tests/cases/fourslash/getOccurrencesReturn4.ts +++ b/tests/cases/fourslash/getOccurrencesReturn4.ts @@ -13,7 +13,7 @@ //// })() || true; //// } //// -//// var unusued = [1, 2, 3, 4].map(x => { return/*5*/ 4 }) +//// var unused = [1, 2, 3, 4].map(x => { return/*5*/ 4 }) //// //// return/*6*/; //// return/*7*/ true; diff --git a/tests/cases/fourslash/getOccurrencesReturnBroken.ts b/tests/cases/fourslash/getOccurrencesReturnBroken.ts index 1b0a622ff77fd..3e0a65fb9e83c 100644 --- a/tests/cases/fourslash/getOccurrencesReturnBroken.ts +++ b/tests/cases/fourslash/getOccurrencesReturnBroken.ts @@ -15,7 +15,7 @@ //// })() || true; //// } //// -//// var unusued = [1, 2, 3, 4].map(x => { return 4 }) +//// var unused = [1, 2, 3, 4].map(x => { return 4 }) //// //// return; //// return true; diff --git a/tests/cases/fourslash/getOccurrencesThrow.ts b/tests/cases/fourslash/getOccurrencesThrow.ts index c47559a3eb934..ebe6da85516c6 100644 --- a/tests/cases/fourslash/getOccurrencesThrow.ts +++ b/tests/cases/fourslash/getOccurrencesThrow.ts @@ -35,7 +35,7 @@ //// //// [|th/**/row|] 10; //// -//// var unusued = [1, 2, 3, 4].map(x => { throw 4 }) +//// var unused = [1, 2, 3, 4].map(x => { throw 4 }) //// //// [|return|]; //// [|return|] true; diff --git a/tests/cases/fourslash/getOccurrencesThrow2.ts b/tests/cases/fourslash/getOccurrencesThrow2.ts index 535646ff64623..fa9d927c12752 100644 --- a/tests/cases/fourslash/getOccurrencesThrow2.ts +++ b/tests/cases/fourslash/getOccurrencesThrow2.ts @@ -35,7 +35,7 @@ //// //// throw 10; //// -//// var unusued = [1, 2, 3, 4].map(x => { throw 4 }) +//// var unused = [1, 2, 3, 4].map(x => { throw 4 }) //// //// return; //// return true; diff --git a/tests/cases/fourslash/getOccurrencesThrow3.ts b/tests/cases/fourslash/getOccurrencesThrow3.ts index a3c6950078218..f4d49d75dec65 100644 --- a/tests/cases/fourslash/getOccurrencesThrow3.ts +++ b/tests/cases/fourslash/getOccurrencesThrow3.ts @@ -35,7 +35,7 @@ //// //// throw 10; //// -//// var unusued = [1, 2, 3, 4].map(x => { throw 4 }) +//// var unused = [1, 2, 3, 4].map(x => { throw 4 }) //// //// return; //// return true; diff --git a/tests/cases/fourslash/getOccurrencesThrow4.ts b/tests/cases/fourslash/getOccurrencesThrow4.ts index b78985764c3cf..eae57629d0477 100644 --- a/tests/cases/fourslash/getOccurrencesThrow4.ts +++ b/tests/cases/fourslash/getOccurrencesThrow4.ts @@ -35,7 +35,7 @@ //// //// throw 10; //// -//// var unusued = [1, 2, 3, 4].map(x => { throw 4 }) +//// var unused = [1, 2, 3, 4].map(x => { throw 4 }) //// //// return; //// return true; diff --git a/tests/cases/fourslash/getOccurrencesThrow5.ts b/tests/cases/fourslash/getOccurrencesThrow5.ts index b61d1dc09ef56..1a1071b2bee5a 100644 --- a/tests/cases/fourslash/getOccurrencesThrow5.ts +++ b/tests/cases/fourslash/getOccurrencesThrow5.ts @@ -35,7 +35,7 @@ //// //// throw 10; //// -//// var unusued = [1, 2, 3, 4].map(x => { [|thr/**/ow|] 4 }) +//// var unused = [1, 2, 3, 4].map(x => { [|thr/**/ow|] 4 }) //// //// return; //// return true; diff --git a/tests/cases/fourslash/getOutliningSpans.ts b/tests/cases/fourslash/getOutliningSpans.ts index 5d70c5c6dc797..400fc6fd1fa8c 100644 --- a/tests/cases/fourslash/getOutliningSpans.ts +++ b/tests/cases/fourslash/getOutliningSpans.ts @@ -68,7 +68,7 @@ //// ////}|])|] //// -////// trivia handeling +////// trivia handling ////class ClassFooWithTrivia[| /* some comments */ //// /* more trivia */ { //// diff --git a/tests/cases/fourslash/goToDefinitionAlias.ts b/tests/cases/fourslash/goToDefinitionAlias.ts index c64765869bc38..328aa1fcef5fe 100644 --- a/tests/cases/fourslash/goToDefinitionAlias.ts +++ b/tests/cases/fourslash/goToDefinitionAlias.ts @@ -10,7 +10,7 @@ ////var t1: [|/*alias1Type*/alias1|].IFoo; ////var t2: Module.[|/*alias2Type*/alias2|].IFoo; //// -////// Value posistion +////// Value position ////var v1 = new [|/*alias1Value*/alias1|].Foo(); ////var v2 = new Module.[|/*alias2Value*/alias2|].Foo(); diff --git a/tests/cases/fourslash/goToDefinitionJsxNotSet.ts b/tests/cases/fourslash/goToDefinitionJsxNotSet.ts index fce6d3de2b0d2..52eb929f0c167 100644 --- a/tests/cases/fourslash/goToDefinitionJsxNotSet.ts +++ b/tests/cases/fourslash/goToDefinitionJsxNotSet.ts @@ -1,6 +1,6 @@ /// -// Regresion tests for GH#46854 +// Regression tests for GH#46854 // @allowJs: true diff --git a/tests/cases/fourslash/goToDefinitionMultipleDefinitions.ts b/tests/cases/fourslash/goToDefinitionMultipleDefinitions.ts index 2f117e413e0f7..a802a9e3349b9 100644 --- a/tests/cases/fourslash/goToDefinitionMultipleDefinitions.ts +++ b/tests/cases/fourslash/goToDefinitionMultipleDefinitions.ts @@ -27,7 +27,7 @@ ////} // @Filename: e.ts -////[|Modul/*moduleReference*/e|]; +////[|Module/*moduleReference*/e|]; verify.baselineGoToDefinition( "interfaceReference", diff --git a/tests/cases/fourslash/goToDefinitionRest.ts b/tests/cases/fourslash/goToDefinitionRest.ts index a7d003c8e7db9..04b154b3a143e 100644 --- a/tests/cases/fourslash/goToDefinitionRest.ts +++ b/tests/cases/fourslash/goToDefinitionRest.ts @@ -3,7 +3,7 @@ ////interface Gen { //// x: number; //// /*1*/parent: Gen; -//// millenial: string; +//// millennial: string; ////} ////let t: Gen; ////var { x, ...rest } = t; diff --git a/tests/cases/fourslash/goToImplementationLocal_01.ts b/tests/cases/fourslash/goToImplementationLocal_01.ts index e1d01107d7681..df49a6236de67 100644 --- a/tests/cases/fourslash/goToImplementationLocal_01.ts +++ b/tests/cases/fourslash/goToImplementationLocal_01.ts @@ -1,6 +1,6 @@ /// -// Should return the defintion of locally defined variables +// Should return the definition of locally defined variables //// const [|hello|] = function() {}; //// he/*function_call*/llo(); diff --git a/tests/cases/fourslash/importNameCodeFixNewImportExportEqualsCommonJSInteropOn.ts b/tests/cases/fourslash/importNameCodeFixNewImportExportEqualsCommonJSInteropOn.ts index 5c6ef12fcfda3..e4f7949403fb9 100644 --- a/tests/cases/fourslash/importNameCodeFixNewImportExportEqualsCommonJSInteropOn.ts +++ b/tests/cases/fourslash/importNameCodeFixNewImportExportEqualsCommonJSInteropOn.ts @@ -44,7 +44,7 @@ verify.importFixAtPosition([`import foo from "foo"; foo`]); -// 3. Importing an 'export default' doesn’t count toward the usage heursitic +// 3. Importing an 'export default' doesn’t count toward the usage heuristic goTo.file('/c.ts'); verify.importFixAtPosition([`import es from "es"; import bar = require("bar"); diff --git a/tests/cases/fourslash/incrementalJsDocAdjustsLengthsRight.ts b/tests/cases/fourslash/incrementalJsDocAdjustsLengthsRight.ts index e4d438171a964..297ad4d6dad12 100644 --- a/tests/cases/fourslash/incrementalJsDocAdjustsLengthsRight.ts +++ b/tests/cases/fourslash/incrementalJsDocAdjustsLengthsRight.ts @@ -29,5 +29,5 @@ verify.syntacticClassificationsAre( c.punctuation("}"), c.comment(" "), c.parameterName("wid"), - c.comment(""), // syntatic classification verification always just uses input text, so the edits don't appear + c.comment(""), // syntactic classification verification always just uses input text, so the edits don't appear ); diff --git a/tests/cases/fourslash/issue57429.ts b/tests/cases/fourslash/issue57429.ts index 793feec879e40..2ce838451b2c7 100644 --- a/tests/cases/fourslash/issue57429.ts +++ b/tests/cases/fourslash/issue57429.ts @@ -13,7 +13,7 @@ //// //// Builder({ //// doThing(args: { value: object }) { -//// const { v/*1*/alue } = this.[|args|] +//// const { v/*1*/value } = this.[|args|] //// return `${value}` //// }, //// doAnotherThing() { }, diff --git a/tests/cases/fourslash/jsxTagNameCompletionUnderElementClosed.ts b/tests/cases/fourslash/jsxTagNameCompletionUnderElementClosed.ts index 9d7e522ad1606..64eea0c654590 100644 --- a/tests/cases/fourslash/jsxTagNameCompletionUnderElementClosed.ts +++ b/tests/cases/fourslash/jsxTagNameCompletionUnderElementClosed.ts @@ -8,17 +8,17 @@ ////} ////function fn() { //// return <> -//// +////