typedoc 0.26.11 → 0.27.0-beta.1

package/dist/lib/cli.js

@@ -1,29 +1,4 @@
-"use strict";
 /* eslint-disable no-console */
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
 const ExitCodes = {
     Ok: 0,
     OptionError: 1,
@@ -33,7 +8,7 @@ const ExitCodes = {
     ExceptionThrown: 6,
     Watching: 7,
 };
-const td = __importStar(require("typedoc"));
+import * as td from "../index.js";
 void main();
 async function main() {
     let app;
@@ -85,13 +60,7 @@ async function run(app) {
     if (app.options.getValue("watch")) {
         app.convertAndWatch(async (project) => {
             app.validate(project);
-            const json = app.options.getValue("json");
-            if (!json || app.options.isSet("out")) {
-                await app.generateDocs(project, app.options.getValue("out"));
-            }
-            if (json) {
-                await app.generateJson(project, json);
-            }
+            await app.generateOutputs(project);
         });
         return ExitCodes.Watching;
     }
@@ -115,13 +84,7 @@ async function run(app) {
         return ExitCodes.ValidationError;
     }
     if (app.options.getValue("emit") !== "none") {
-        const json = app.options.getValue("json");
-        if (!json || app.options.isSet("out")) {
-            await app.generateDocs(project, app.options.getValue("out"));
-        }
-        if (json) {
-            await app.generateJson(project, json);
-        }
+        await app.generateOutputs(project);
         if (app.logger.hasErrors()) {
             return ExitCodes.OutputError;
         }

package/dist/lib/converter/comments/blockLexer.d.ts

@@ -1,3 +1,3 @@
 import ts from "typescript";
-import { type Token } from "./lexer";
+import { type Token } from "./lexer.js";
 export declare function lexBlockComment(file: string, pos?: number, end?: number, jsDoc?: ts.JSDoc | undefined, checker?: ts.TypeChecker | undefined): Generator<Token, undefined, undefined>;

package/dist/lib/converter/comments/blockLexer.js

@@ -1,18 +1,12 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.lexBlockComment = lexBlockComment;
-const typescript_1 = __importDefault(require("typescript"));
-const lexer_1 = require("./lexer");
-const ReflectionSymbolId_1 = require("../../models/reflections/ReflectionSymbolId");
-const symbols_1 = require("../utils/symbols");
-function* lexBlockComment(file, pos = 0, end = file.length, jsDoc = undefined, checker = undefined) {
+import ts from "typescript";
+import { TokenSyntaxKind } from "./lexer.js";
+import { ReflectionSymbolId } from "../../models/reflections/ReflectionSymbolId.js";
+import { resolveAliasedSymbol } from "../utils/symbols.js";
+export function* lexBlockComment(file, pos = 0, end = file.length, jsDoc = undefined, checker = undefined) {
     // Wrapper around our real lex function to collapse adjacent text tokens.
     let textToken;
     for (const token of lexBlockComment2(file, pos, end, getLinkTags(jsDoc), checker)) {
-        if (token.kind === lexer_1.TokenSyntaxKind.Text) {
+        if (token.kind === TokenSyntaxKind.Text) {
             if (textToken) {
                 textToken.text += token.text;
             }
@@ -38,9 +32,9 @@ function getLinkTags(jsDoc) {
     if (jsDoc?.comment && typeof jsDoc.comment !== "string") {
         for (const part of jsDoc.comment) {
             switch (part.kind) {
-                case typescript_1.default.SyntaxKind.JSDocLink:
-                case typescript_1.default.SyntaxKind.JSDocLinkCode:
-                case typescript_1.default.SyntaxKind.JSDocLinkPlain:
+                case ts.SyntaxKind.JSDocLink:
+                case ts.SyntaxKind.JSDocLinkCode:
+                case ts.SyntaxKind.JSDocLinkPlain:
                     result.push(part);
             }
         }
@@ -50,9 +44,9 @@ function getLinkTags(jsDoc) {
             continue;
         for (const part of block.comment) {
             switch (part.kind) {
-                case typescript_1.default.SyntaxKind.JSDocLink:
-                case typescript_1.default.SyntaxKind.JSDocLinkCode:
-                case typescript_1.default.SyntaxKind.JSDocLinkPlain:
+                case ts.SyntaxKind.JSDocLink:
+                case ts.SyntaxKind.JSDocLinkCode:
+                case ts.SyntaxKind.JSDocLinkPlain:
                     result.push(part);
             }
         }
@@ -95,20 +89,20 @@ function* lexBlockComment2(file, pos, end, linkTags, checker) {
         }
         switch (file[pos]) {
             case "\n":
-                yield makeToken(lexer_1.TokenSyntaxKind.NewLine, 1);
+                yield makeToken(TokenSyntaxKind.NewLine, 1);
                 lineStart = true;
                 break;
             case "{":
                 if (braceStartsType && nextNonWs(pos + 1) !== "@") {
-                    yield makeToken(lexer_1.TokenSyntaxKind.TypeAnnotation, findEndOfType(pos) - pos);
+                    yield makeToken(TokenSyntaxKind.TypeAnnotation, findEndOfType(pos) - pos);
                     braceStartsType = false;
                 }
                 else {
-                    yield makeToken(lexer_1.TokenSyntaxKind.OpenBrace, 1);
+                    yield makeToken(TokenSyntaxKind.OpenBrace, 1);
                 }
                 break;
             case "}":
-                yield makeToken(lexer_1.TokenSyntaxKind.CloseBrace, 1);
+                yield makeToken(TokenSyntaxKind.CloseBrace, 1);
                 braceStartsType = false;
                 break;
             case "`": {
@@ -132,7 +126,7 @@ function* lexBlockComment2(file, pos, end, linkTags, checker) {
                         lookahead += tickCount;
                         codeText.push(file.substring(lookaheadStart, lookahead));
                         yield {
-                            kind: lexer_1.TokenSyntaxKind.Code,
+                            kind: TokenSyntaxKind.Code,
                             text: codeText.join(""),
                             pos,
                         };
@@ -177,14 +171,14 @@ function* lexBlockComment2(file, pos, end, linkTags, checker) {
                         file.substring(pos, end).includes("\n")) {
                         codeText.push(file.substring(lookaheadStart, end));
                         yield {
-                            kind: lexer_1.TokenSyntaxKind.Code,
+                            kind: TokenSyntaxKind.Code,
                             text: codeText.join(""),
                             pos,
                         };
                         pos = lookahead;
                     }
                     else {
-                        yield makeToken(lexer_1.TokenSyntaxKind.Text, tickCount);
+                        yield makeToken(TokenSyntaxKind.Text, tickCount);
                     }
                 }
                 break;
@@ -203,7 +197,7 @@ function* lexBlockComment2(file, pos, end, linkTags, checker) {
                 if (lookahead !== pos + 1 &&
                     (lookahead === end || /[\s}]/.test(file[lookahead]))) {
                     braceStartsType = true;
-                    const token = makeToken(lexer_1.TokenSyntaxKind.Tag, lookahead - pos);
+                    const token = makeToken(TokenSyntaxKind.Tag, lookahead - pos);
                     attachLinkTagResult(token);
                     yield token;
                     break;
@@ -238,7 +232,7 @@ function* lexBlockComment2(file, pos, end, linkTags, checker) {
                 }
                 // This piece of text had line continuations or escaped text
                 yield {
-                    kind: lexer_1.TokenSyntaxKind.Text,
+                    kind: TokenSyntaxKind.Text,
                     text: textParts.join(""),
                     pos,
                 };
@@ -260,7 +254,7 @@ function* lexBlockComment2(file, pos, end, linkTags, checker) {
             if (link.name) {
                 const tsTarget = checker?.getSymbolAtLocation(getRightmostName(link.name));
                 if (tsTarget) {
-                    token.tsLinkTarget = new ReflectionSymbolId_1.ReflectionSymbolId((0, symbols_1.resolveAliasedSymbol)(tsTarget, checker));
+                    token.tsLinkTarget = new ReflectionSymbolId(resolveAliasedSymbol(tsTarget, checker));
                     token.tsLinkText = link.text.replace(/^\s*\|\s*/, "");
                 }
             }
@@ -368,10 +362,10 @@ function discoverIndent(file, pos, end) {
     return [commentHasStars, indent];
 }
 function getRightmostName(name) {
-    if (typescript_1.default.isJSDocMemberName(name)) {
+    if (ts.isJSDocMemberName(name)) {
         return name.right;
     }
-    if (typescript_1.default.isQualifiedName(name)) {
+    if (ts.isQualifiedName(name)) {
         return name.right;
     }
     return name;

package/dist/lib/converter/comments/declarationReference.js

@@ -1,4 +1,3 @@
-"use strict";
 /**
  * Parser for declaration references, see the [TSDoc grammar](https://github.com/microsoft/tsdoc/blob/main/tsdoc/src/beta/DeclarationReference.grammarkdown)
  * for reference. TypeDoc **does not** support the full grammar today. This is intentional, since the TSDoc
@@ -6,17 +5,7 @@
  *
  * @module
  */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.MeaningKeywords = void 0;
-exports.meaningToString = meaningToString;
-exports.parseString = parseString;
-exports.parseModuleSource = parseModuleSource;
-exports.parseSymbolReference = parseSymbolReference;
-exports.parseComponent = parseComponent;
-exports.parseComponentPath = parseComponentPath;
-exports.parseMeaning = parseMeaning;
-exports.parseDeclarationReference = parseDeclarationReference;
-exports.MeaningKeywords = [
+export const MeaningKeywords = [
     "class", // SymbolFlags.Class
     "interface", // SymbolFlags.Interface
     "type", // SymbolFlags.TypeAlias
@@ -35,7 +24,7 @@ exports.MeaningKeywords = [
     "getter",
     "setter",
 ];
-function meaningToString(meaning) {
+export function meaningToString(meaning) {
     let result = "";
     if (meaning.keyword) {
         result += meaning.keyword;
@@ -144,7 +133,7 @@ function parseUnicodeEscapeSequence(source, pos, end) {
 // StringCharacter::
 //   SourceCharacter but not one of `"` or `\` or LineTerminator
 //   `\` EscapeSequence
-function parseString(source, pos, end) {
+export function parseString(source, pos, end) {
     let result = "";
     if (source[pos++] !== '"')
         return;
@@ -166,7 +155,7 @@ function parseString(source, pos, end) {
     }
 }
 // ModuleSource:: String | ModuleSourceCharacters
-function parseModuleSource(source, pos, end) {
+export function parseModuleSource(source, pos, end) {
     if (pos >= end)
         return;
     if (source[pos] === '"') {
@@ -184,7 +173,7 @@ function parseModuleSource(source, pos, end) {
 // SymbolReference:
 //     ComponentPath Meaning?
 //     Meaning
-function parseSymbolReference(source, pos, end) {
+export function parseSymbolReference(source, pos, end) {
     const path = parseComponentPath(source, pos, end);
     pos = path?.[1] ?? pos;
     const meaning = parseMeaning(source, pos, end);
@@ -197,7 +186,7 @@ function parseSymbolReference(source, pos, end) {
 //     String
 //     ComponentCharacters
 //     `[` DeclarationReference `]` <--- THIS ONE IS NOT IMPLEMENTED.
-function parseComponent(source, pos, end) {
+export function parseComponent(source, pos, end) {
     if (pos < end && source[pos] === '"') {
         return parseString(source, pos, end);
     }
@@ -219,7 +208,7 @@ function parseComponent(source, pos, end) {
 //     ComponentPath `.` Component                      // Navigate via 'exports' of |ComponentPath|
 //     ComponentPath `#` Component                      // Navigate via 'members' of |ComponentPath|
 //     ComponentPath `~` Component                      // Navigate via 'locals' of |ComponentPath|
-function parseComponentPath(source, pos, end) {
+export function parseComponentPath(source, pos, end) {
     const components = [];
     let component = parseComponent(source, pos, end);
     if (!component)
@@ -249,10 +238,10 @@ function parseComponentPath(source, pos, end) {
 //
 // UserLabel:
 //     UserLabelStart UserLabelCharacter*
-function parseMeaning(source, pos, end) {
+export function parseMeaning(source, pos, end) {
     if (source[pos++] !== ":")
         return;
-    const keyword = exports.MeaningKeywords.find((kw) => pos + kw.length <= end && source.startsWith(kw, pos));
+    const keyword = MeaningKeywords.find((kw) => pos + kw.length <= end && source.startsWith(kw, pos));
     if (keyword) {
         pos += keyword.length;
     }
@@ -307,7 +296,7 @@ function parseMeaning(source, pos, end) {
 //   ModuleSource `!` SymbolReference              // Reference to an export of a module
 //   ModuleSource `!` `~` SymbolReference          // Reference to a local of a module
 //   `!` SymbolReference                           // Reference to global symbol
-function parseDeclarationReference(source, pos, end) {
+export function parseDeclarationReference(source, pos, end) {
     let moduleSource;
     let symbolReference;
     let resolutionStart = "local";

package/dist/lib/converter/comments/declarationReferenceResolver.d.ts

@@ -1,3 +1,3 @@
-import { type Reflection } from "../../models";
-import type { DeclarationReference } from "./declarationReference";
+import { type Reflection } from "../../models/index.js";
+import type { DeclarationReference } from "./declarationReference.js";
 export declare function resolveDeclarationReference(reflection: Reflection, ref: DeclarationReference): Reflection | undefined;

package/dist/lib/converter/comments/declarationReferenceResolver.js

@@ -1,55 +1,59 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolveDeclarationReference = resolveDeclarationReference;
-const assert_1 = require("assert");
-const models_1 = require("../../models");
-const utils_1 = require("../../utils");
+import { ok } from "assert";
+import { ContainerReflection, DeclarationReflection, ReferenceReflection, ReflectionKind, } from "../../models/index.js";
+import { assertNever, filterMap } from "../../utils/index.js";
 function resolveReferenceReflection(ref) {
-    if (ref instanceof models_1.ReferenceReflection) {
+    if (ref instanceof ReferenceReflection) {
         return ref.getTargetReflectionDeep();
     }
     return ref;
 }
-function resolveDeclarationReference(reflection, ref) {
+export function resolveDeclarationReference(reflection, ref) {
     let high = [];
     let low = [];
     if (ref.moduleSource) {
         high =
-            reflection.project.children?.filter((c) => c.kindOf(models_1.ReflectionKind.SomeModule) &&
+            reflection.project.children?.filter((c) => c.kindOf(ReflectionKind.SomeModule) &&
                 c.name === ref.moduleSource) || [];
     }
     else if (ref.resolutionStart === "global") {
         high.push(reflection.project);
+        if (reflection.project.children?.length === 1) {
+            high.push(reflection.project.children[0]);
+        }
     }
     else {
         // Work around no-unnecessary-condition, should be unnecessary... want a trap if it ever becomes false.
-        (0, assert_1.ok)(ref.resolutionStart.startsWith("local") &&
+        ok(ref.resolutionStart.startsWith("local") &&
             ref.resolutionStart.length === 5);
         // TypeScript's behavior is to first try to resolve links via variable scope, and then
         // if the link still hasn't been found, check either siblings (if comment belongs to a member)
         // or otherwise children.
         let refl = reflection;
-        if (refl.kindOf(models_1.ReflectionKind.ExportContainer)) {
+        if (refl.kindOf(ReflectionKind.ExportContainer)) {
             high.push(refl);
         }
         while (refl.parent) {
             refl = refl.parent;
-            if (refl.kindOf(models_1.ReflectionKind.ExportContainer)) {
+            if (refl.kindOf(ReflectionKind.ExportContainer)) {
                 high.push(refl);
             }
             else {
                 low.push(refl);
             }
+            if (refl.kindOf(ReflectionKind.Project) &&
+                refl.children?.length === 1) {
+                high.push(refl.children[0]);
+            }
         }
-        if (reflection.kindOf(models_1.ReflectionKind.SomeMember)) {
+        if (reflection.kindOf(ReflectionKind.SomeMember)) {
             high.push(reflection.parent);
         }
-        else if (reflection.kindOf(models_1.ReflectionKind.SomeSignature) &&
-            reflection.parent.kindOf(models_1.ReflectionKind.SomeMember)) {
+        else if (reflection.kindOf(ReflectionKind.SomeSignature) &&
+            reflection.parent.kindOf(ReflectionKind.SomeMember)) {
             high.push(reflection.parent.parent);
         }
         else if (high[0] !== reflection) {
-            if (reflection.parent instanceof models_1.ContainerReflection) {
+            if (reflection.parent instanceof ContainerReflection) {
                 high.push(...(reflection.parent.childrenIncludingDocuments?.filter((c) => c.name === reflection.name) || []));
             }
             else {
@@ -82,7 +86,7 @@ function resolveDeclarationReference(reflection, ref) {
     return high[0] || low[0];
 }
 function filterMapByMeaning(reflections, meaning) {
-    return (0, utils_1.filterMap)(reflections, (refl) => {
+    return filterMap(reflections, (refl) => {
         const kwResolved = resolveKeyword(refl, meaning.keyword) || [];
         if (meaning.label) {
             return kwResolved.find((r) => r.comment?.label === meaning.label);
@@ -93,48 +97,48 @@ function filterMapByMeaning(reflections, meaning) {
 function resolveKeyword(refl, kw) {
     switch (kw) {
         case undefined:
-            return refl instanceof models_1.DeclarationReflection && refl.signatures
+            return refl instanceof DeclarationReflection && refl.signatures
                 ? refl.signatures
                 : [refl];
         case "class":
-            if (refl.kindOf(models_1.ReflectionKind.Class))
+            if (refl.kindOf(ReflectionKind.Class))
                 return [refl];
             break;
         case "interface":
-            if (refl.kindOf(models_1.ReflectionKind.Interface))
+            if (refl.kindOf(ReflectionKind.Interface))
                 return [refl];
             break;
         case "type":
-            if (refl.kindOf(models_1.ReflectionKind.SomeType))
+            if (refl.kindOf(ReflectionKind.SomeType))
                 return [refl];
             break;
         case "enum":
-            if (refl.kindOf(models_1.ReflectionKind.Enum))
+            if (refl.kindOf(ReflectionKind.Enum))
                 return [refl];
             break;
         case "namespace":
-            if (refl.kindOf(models_1.ReflectionKind.SomeModule))
+            if (refl.kindOf(ReflectionKind.SomeModule))
                 return [refl];
             break;
         case "function":
-            if (refl.kindOf(models_1.ReflectionKind.FunctionOrMethod)) {
+            if (refl.kindOf(ReflectionKind.FunctionOrMethod)) {
                 return refl.signatures;
             }
             break;
         case "var":
-            if (refl.kindOf(models_1.ReflectionKind.Variable))
+            if (refl.kindOf(ReflectionKind.Variable))
                 return [refl];
             break;
         case "new":
         case "constructor":
-            if (refl.kindOf(models_1.ReflectionKind.ClassOrInterface |
-                models_1.ReflectionKind.TypeLiteral)) {
-                const ctor = refl.children?.find((c) => c.kindOf(models_1.ReflectionKind.Constructor));
+            if (refl.kindOf(ReflectionKind.ClassOrInterface |
+                ReflectionKind.TypeLiteral)) {
+                const ctor = refl.children?.find((c) => c.kindOf(ReflectionKind.Constructor));
                 return ctor.signatures;
             }
             break;
         case "member":
-            if (refl.kindOf(models_1.ReflectionKind.SomeMember))
+            if (refl.kindOf(ReflectionKind.SomeMember))
                 return [refl];
             break;
         case "event":
@@ -150,7 +154,7 @@ function resolveKeyword(refl, kw) {
             }
             break;
         case "complex":
-            if (refl.kindOf(models_1.ReflectionKind.SomeType))
+            if (refl.kindOf(ReflectionKind.SomeType))
                 return [refl];
             break;
         case "getter":
@@ -164,13 +168,13 @@ function resolveKeyword(refl, kw) {
             }
             break;
         default:
-            (0, utils_1.assertNever)(kw);
+            assertNever(kw);
     }
 }
 function resolveSymbolReferencePart(refl, path) {
     let high = [];
     let low = [];
-    if (!(refl instanceof models_1.ContainerReflection) ||
+    if (!(refl instanceof ContainerReflection) ||
         !refl.childrenIncludingDocuments) {
         return { high, low };
     }
@@ -181,9 +185,9 @@ function resolveSymbolReferencePart(refl, path) {
         // Also is more consistent with how TypeScript resolves link tags.
         case ".":
             high = refl.childrenIncludingDocuments.filter((r) => r.name === path.path &&
-                (r.kindOf(models_1.ReflectionKind.SomeExport) || r.flags.isStatic));
+                (r.kindOf(ReflectionKind.SomeExport) || r.flags.isStatic));
             low = refl.childrenIncludingDocuments.filter((r) => r.name === path.path &&
-                (!r.kindOf(models_1.ReflectionKind.SomeExport) || !r.flags.isStatic));
+                (!r.kindOf(ReflectionKind.SomeExport) || !r.flags.isStatic));
             break;
         // Resolve via "members", interface children, class instance properties/accessors/methods,
         // enum members, type literal properties
@@ -191,14 +195,14 @@ function resolveSymbolReferencePart(refl, path) {
             high =
                 refl.children?.filter((r) => {
                     return (r.name === path.path &&
-                        r.kindOf(models_1.ReflectionKind.SomeMember) &&
+                        r.kindOf(ReflectionKind.SomeMember) &&
                         !r.flags.isStatic);
                 }) || [];
             break;
         // Resolve via "locals"... treat this as a stricter `.` which only supports traversing
         // module/namespace exports since TypeDoc doesn't support documenting locals.
         case "~":
-            if (refl.kindOf(models_1.ReflectionKind.SomeModule | models_1.ReflectionKind.Project)) {
+            if (refl.kindOf(ReflectionKind.SomeModule | ReflectionKind.Project)) {
                 high = refl.children?.filter((r) => r.name === path.path) || [];
             }
             break;

package/dist/lib/converter/comments/discovery.d.ts

@@ -1,7 +1,7 @@
 import ts from "typescript";
-import { ReflectionKind } from "../../models";
-import { type Logger } from "../../utils";
-import { CommentStyle } from "../../utils/options/declaration";
+import { ReflectionKind } from "../../models/index.js";
+import { type Logger } from "../../utils/index.js";
+import { CommentStyle } from "../../utils/options/declaration.js";
 export interface DiscoveredComment {
     file: ts.SourceFile;
     ranges: ts.CommentRange[];
@@ -10,5 +10,5 @@ export interface DiscoveredComment {
 }
 export declare function discoverFileComments(node: ts.SourceFile, commentStyle: CommentStyle): DiscoveredComment[];
 export declare function discoverNodeComment(node: ts.Node, commentStyle: CommentStyle): DiscoveredComment | undefined;
-export declare function discoverComment(symbol: ts.Symbol, kind: ReflectionKind, logger: Logger, commentStyle: CommentStyle, checker: ts.TypeChecker): DiscoveredComment | undefined;
+export declare function discoverComment(symbol: ts.Symbol, kind: ReflectionKind, logger: Logger, commentStyle: CommentStyle, checker: ts.TypeChecker, declarationWarnings: boolean): DiscoveredComment | undefined;
 export declare function discoverSignatureComment(declaration: ts.SignatureDeclaration | ts.JSDocSignature, checker: ts.TypeChecker, commentStyle: CommentStyle): DiscoveredComment | undefined;