@idlizer/core 2.0.31 → 2.0.33

package/build/lib/src/idl.d.ts

@@ -21,7 +21,8 @@ export declare enum IDLKind {
     TypeParameterType = 18,
     OptionalType = 19,
     Version = 20,
-    Namespace = 21
+    Namespace = 21,
+    File = 22
 }
 export declare enum IDLEntity {
     Class = "Class",
@@ -58,6 +59,7 @@ export declare enum IDLExtendedAttributes {
     Predefined = "Predefined",
     Protected = "Protected",
     Synthetic = "Synthetic",
+    Throws = "Throws",
     TSType = "TSType",
     TypeArguments = "TypeArguments",
     TypeParameters = "TypeParameters",
@@ -75,10 +77,15 @@ export interface IDLExtendedAttribute {
 export interface IDLNode {
     _idlNodeBrand: any;
     kind: IDLKind;
+    parent?: IDLNode;
     fileName?: string;
     extendedAttributes?: IDLExtendedAttribute[];
     documentation?: string;
 }
+export interface IDLFile extends IDLNode {
+    entries: IDLEntry[];
+    fileName?: string;
+}
 export interface IDLNamedNode extends IDLNode {
     _idlNamedNodeBrand: any;
     name: string;
@@ -86,7 +93,6 @@ export interface IDLNamedNode extends IDLNode {
 export interface IDLEntry extends IDLNode, IDLNamedNode {
     _idlEntryBrand: any;
     comment?: string;
-    namespace?: IDLNamespace;
 }
 export interface IDLType extends IDLNode {
     _idlTypeBrand: any;
@@ -112,7 +118,6 @@ export interface IDLContainerType extends IDLType {
 export interface IDLReferenceType extends IDLType, IDLNamedNode {
     kind: IDLKind.ReferenceType;
     typeArguments?: IDLType[];
-    namespace?: IDLNamespace;
 }
 export interface IDLUnspecifiedGenericType extends IDLType, IDLNamedNode {
     kind: IDLKind.UnspecifiedGenericType;
@@ -204,10 +209,11 @@ export interface IDLInterface extends IDLEntry {
 }
 export interface IDLPackage extends IDLEntry {
     kind: IDLKind.Package;
+    clause: string[];
 }
 export interface IDLImport extends IDLEntry {
     kind: IDLKind.Import;
-    importClause?: string[];
+    clause: string[];
 }
 export interface IDLNamespace extends IDLEntry {
     kind: IDLKind.Namespace;
@@ -220,6 +226,7 @@ export interface IDLCallback extends IDLEntry, IDLSignature {
 export declare function forEachChild(node: IDLNode, cbEnter: (entry: IDLNode) => void, cbLeave?: (entry: IDLNode) => void): void;
 export declare function isNamedNode(type: IDLNode): type is IDLNamedNode;
 export declare function forceAsNamedNode(type: IDLNode): IDLNamedNode;
+export declare function isFile(node: IDLNode): node is IDLFile;
 export declare function isUndefinedType(type: IDLNode): type is IDLPrimitiveType;
 export declare function isVoidType(type: IDLNode): type is IDLPrimitiveType;
 export declare function isPrimitiveType(type: IDLNode): type is IDLPrimitiveType;
@@ -294,21 +301,25 @@ export type IDLNodeInitializer = {
     documentation?: string;
 };
 export declare function createNamespace(name: string, extendedAttributes?: IDLExtendedAttribute[], fileName?: string): IDLNamespace;
-export declare function linkNamespacesBack(node: IDLNode): void;
+export declare function linkParentBack<T extends IDLNode>(node: T): T;
 export declare function getNamespacesPathFor(entry: IDLEntry): IDLNamespace[];
+export declare function getFileFor(entry: IDLNode): IDLFile | undefined;
 export declare function isEqualByQualifedName(a?: IDLEntry, b?: IDLEntry): boolean;
+export declare function getPackageClause(entry: IDLFile | IDLEntry): string[];
+export declare function getPackageName(entry: IDLFile | IDLEntry): string;
 export declare function getNamespaceName(a: IDLEntry): string;
 export declare function getFQName(a: IDLEntry): string;
 export declare function createVersion(value: string[], extendedAttributes?: IDLExtendedAttribute[], fileName?: string): IDLVersion;
 export declare function fetchNamespaceFrom(pointOfView?: IDLNode): IDLNamespace | undefined;
-export declare function createReferenceType(name: string, typeArguments?: IDLType[], pointOfView?: IDLNode): IDLReferenceType;
+export declare function createReferenceType(name: string, typeArguments?: IDLType[]): IDLReferenceType;
 export declare function createReferenceType(source: IDLEntry, typeArguments?: IDLType[]): IDLReferenceType;
 export declare function createUnspecifiedGenericType(name: string, typeArguments: IDLType[]): IDLUnspecifiedGenericType;
 export declare function entityToType(entity: IDLNode): IDLType;
 export declare function createContainerType(container: IDLContainerKind, element: IDLType[]): IDLContainerType;
 export declare function createUnionType(types: IDLType[], name?: string): IDLUnionType;
-export declare function createPackage(name: string): IDLPackage;
-export declare function createImport(name: string, importClause?: string[], nodeInitializer?: IDLNodeInitializer): IDLImport;
+export declare function createFile(entries: IDLEntry[], fileName?: string): IDLFile;
+export declare function createPackage(clause: string[]): IDLPackage;
+export declare function createImport(clause: string[], name?: string, nodeInitializer?: IDLNodeInitializer): IDLImport;
 export declare function createEnum(name: string, elements: IDLEnumMember[], nodeInitializer: IDLNodeInitializer): IDLEnum;
 export declare function createEnumMember(name: string, parent: IDLEnum, type: IDLPrimitiveType, initializer: number | string | undefined, nodeInitializer?: IDLNodeInitializer): IDLEnumMember;
 export declare function createInterface(name: string, subkind: IDLInterfaceSubkind, inheritance?: IDLReferenceType[], constructors?: IDLConstructor[], constants?: IDLConstant[], properties?: IDLProperty[], methods?: IDLMethod[], callables?: IDLCallable[], typeParameters?: string[], nodeInitializer?: IDLNodeInitializer): IDLInterface;

package/build/lib/src/idl.js

@@ -40,6 +40,7 @@ export var IDLKind;
     IDLKind[IDLKind["OptionalType"] = 19] = "OptionalType";
     IDLKind[IDLKind["Version"] = 20] = "Version";
     IDLKind[IDLKind["Namespace"] = 21] = "Namespace";
+    IDLKind[IDLKind["File"] = 22] = "File";
 })(IDLKind || (IDLKind = {}));
 export var IDLEntity;
 (function (IDLEntity) {
@@ -78,6 +79,7 @@ export var IDLExtendedAttributes;
     IDLExtendedAttributes["Predefined"] = "Predefined";
     IDLExtendedAttributes["Protected"] = "Protected";
     IDLExtendedAttributes["Synthetic"] = "Synthetic";
+    IDLExtendedAttributes["Throws"] = "Throws";
     IDLExtendedAttributes["TSType"] = "TSType";
     IDLExtendedAttributes["TypeArguments"] = "TypeArguments";
     IDLExtendedAttributes["TypeParameters"] = "TypeParameters";
@@ -101,6 +103,9 @@ export function forEachChild(node, cbEnter, cbLeave) {
     var _a, _b;
     cbEnter(node);
     switch (node.kind) {
+        case IDLKind.File:
+            node.entries.forEach((value) => forEachChild(value, cbEnter, cbLeave));
+            break;
         case IDLKind.Namespace:
             node.members.forEach((value) => forEachChild(value, cbEnter, cbLeave));
             break;
@@ -187,6 +192,9 @@ export function forceAsNamedNode(type) {
     }
     return type;
 }
+export function isFile(node) {
+    return node.kind === IDLKind.File;
+}
 export function isUndefinedType(type) {
     return isPrimitiveType(type) && type.name === IDLUndefinedType.name;
 }
@@ -346,29 +354,41 @@ export function createNamespace(name, extendedAttributes, fileName) {
         _idlNamedNodeBrand: innerIdlSymbol,
     };
 }
-export function linkNamespacesBack(node) {
-    let namespacePath = [];
-    forEachChild(node, child => {
-        if (isEntry(child) || isReferenceType(child)) {
-            if (!child.namespace)
-                child.namespace = namespacePath.length ? namespacePath[namespacePath.length - 1] : undefined;
-        }
-        if (isNamespace(child))
-            namespacePath.push(child);
-    }, child => {
-        if (isNamespace(child))
-            namespacePath.pop();
+export function linkParentBack(node) {
+    const parentStack = [];
+    forEachChild(node, (node) => {
+        if (isPrimitiveType(node))
+            return;
+        if (parentStack.length)
+            node.parent = parentStack[parentStack.length - 1];
+        parentStack.push(node);
+    }, (node) => {
+        if (isPrimitiveType(node))
+            return;
+        parentStack.pop();
     });
+    return node;
 }
 export function getNamespacesPathFor(entry) {
-    let iterator = entry.namespace;
+    let iterator = entry.parent;
     const result = [];
     while (iterator) {
-        result.unshift(iterator);
-        iterator = iterator.namespace;
+        if (isNamespace(iterator))
+            result.unshift(iterator);
+        iterator = iterator.parent;
     }
     return result;
 }
+export function getFileFor(entry) {
+    let iterator = entry;
+    while (iterator) {
+        if (isFile(iterator))
+            return iterator;
+        iterator = iterator.parent;
+    }
+    console.warn(`Entry ${JSON.stringify(entry)} does not have IDLFile in parents`);
+    return undefined;
+}
 export function isEqualByQualifedName(a, b) {
     if (a === b)
         return true;
@@ -376,17 +396,28 @@ export function isEqualByQualifedName(a, b) {
         return false;
     if (a.kind !== b.kind || a.name !== b.name)
         return false;
-    return isEqualByQualifedName(a.namespace, b.namespace);
+    return getFQName(a) === getFQName(b);
+}
+export function getPackageClause(entry) {
+    let file = getFileFor(entry);
+    if (!file)
+        return [];
+    for (const child of file.entries)
+        if (isPackage(child))
+            return child.clause;
+    // console.warn("Expected to have one IDLPackage inside IDLFile. Using empty package name")
+    return [];
+}
+export function getPackageName(entry) {
+    return getPackageClause(entry).join(".");
 }
 export function getNamespaceName(a) {
     return getNamespacesPathFor(a).map(it => it.name).join('.');
 }
 export function getFQName(a) {
-    let ns = getNamespaceName(a);
-    if (ns !== '') {
-        ns += '.';
-    }
-    return ns + a.name;
+    // TODO package name is very dirty now, waiting for Alexander Rekunkov PR
+    // return [...getPackageClause(a), ...getNamespacesPathFor(a).map(it => it.name), a.name].join('.')
+    return [...getNamespacesPathFor(a).map(it => it.name), a.name].join('.');
 }
 export function createVersion(value, extendedAttributes, fileName) {
     return {
@@ -401,30 +432,26 @@ export function createVersion(value, extendedAttributes, fileName) {
     };
 }
 export function fetchNamespaceFrom(pointOfView) {
-    if (pointOfView) {
-        if (isNamespace(pointOfView))
-            return pointOfView;
-        if (isEntry(pointOfView) || isReferenceType(pointOfView))
-            return pointOfView.namespace;
+    let node = pointOfView;
+    while (node) {
+        if (isNamespace(node))
+            return node;
+        node = node.parent;
     }
     return undefined;
 }
-export function createReferenceType(nameOrSource, typeArguments, pointOfView) {
+export function createReferenceType(nameOrSource, typeArguments) {
     let name;
-    let namespace;
     if (typeof nameOrSource === 'string') {
         name = nameOrSource;
-        namespace = fetchNamespaceFrom(pointOfView);
     }
     else {
-        name = nameOrSource.name;
-        namespace = fetchNamespaceFrom(nameOrSource);
+        name = getFQName(nameOrSource);
     }
     return {
         kind: IDLKind.ReferenceType,
         name,
         typeArguments,
-        namespace: namespace,
         _idlNodeBrand: innerIdlSymbol,
         _idlTypeBrand: innerIdlSymbol,
         _idlNamedNodeBrand: innerIdlSymbol,
@@ -444,7 +471,12 @@ export function entityToType(entity) {
     if (isType(entity)) {
         return entity;
     }
-    return createReferenceType(forceAsNamedNode(entity).name, undefined, entity);
+    else if (isEntry(entity)) {
+        return createReferenceType(entity);
+    }
+    else {
+        throw new Error(`Expected to have IDLType or IDLEntry, got ${entity}`);
+    }
 }
 export function createContainerType(container, element) {
     return {
@@ -467,17 +499,26 @@ export function createUnionType(types, name) {
         _idlNamedNodeBrand: innerIdlSymbol,
     };
 }
-export function createPackage(name) {
+export function createFile(entries, fileName) {
+    return {
+        kind: IDLKind.File,
+        entries: entries,
+        fileName,
+        _idlNodeBrand: innerIdlSymbol,
+    };
+}
+export function createPackage(clause) {
     return {
         kind: IDLKind.Package,
-        name,
+        name: "",
+        clause,
         _idlNodeBrand: innerIdlSymbol,
         _idlEntryBrand: innerIdlSymbol,
         _idlNamedNodeBrand: innerIdlSymbol,
     };
 }
-export function createImport(name, importClause, nodeInitializer) {
-    return Object.assign(Object.assign({ kind: IDLKind.Import, name, importClause: importClause }, nodeInitializer), { _idlNodeBrand: innerIdlSymbol, _idlEntryBrand: innerIdlSymbol, _idlNamedNodeBrand: innerIdlSymbol });
+export function createImport(clause, name, nodeInitializer) {
+    return Object.assign(Object.assign({ kind: IDLKind.Import, name: name || "", clause }, nodeInitializer), { _idlNodeBrand: innerIdlSymbol, _idlEntryBrand: innerIdlSymbol, _idlNamedNodeBrand: innerIdlSymbol });
 }
 export function createEnum(name, elements, nodeInitializer) {
     return Object.assign(Object.assign({ kind: IDLKind.Enum, name: name, elements: elements }, nodeInitializer), { _idlNodeBrand: innerIdlSymbol, _idlEntryBrand: innerIdlSymbol, _idlNamedNodeBrand: innerIdlSymbol });
@@ -713,13 +754,15 @@ export function printMethod(idl) {
     ];
 }
 export function printPackage(idl) {
+    if (!idl.clause.length)
+        return [];
     return [
-        `package "${idl.name}";`
+        `package ${idl.clause.join(".")};`
     ];
 }
 export function printImport(idl) {
     return [
-        `import "${idl.name}";`
+        `import ${idl.clause.join(".")}${idl.name ? " as " : ""}${idl.name};`
     ];
 }
 export function printNamespace(idl) {

package/build/lib/src/idlize.d.ts

@@ -1,4 +1,14 @@
 import * as ts from "typescript";
-import { GenerateOptions, GenericVisitor } from "./options";
-export declare function generate<T>(inputDirs: string[], inputFiles: string[], outputDir: string, visitorFactory: (sourceFile: ts.SourceFile, typeChecker: ts.TypeChecker) => GenericVisitor<T>, options: GenerateOptions<T>): void;
+import { GenerateOptions } from "./options";
+export interface GenerateVisitor<T> {
+    visitPhase1(): T;
+    visitPhase2?(siblings: {
+        [key in string]: {
+            tsSourceFile: ts.SourceFile;
+            visitor: GenerateVisitor<T>;
+            result: T;
+        };
+    }): T;
+}
+export declare function generate<T>(inputDirs: string[], inputFiles: string[], outputDir: string, visitorFactory: (sourceFile: ts.SourceFile, program: ts.Program, compilerHost: ts.CompilerHost) => GenerateVisitor<T>, options: GenerateOptions<T>): void;
 //# sourceMappingURL=idlize.d.ts.map

package/build/lib/src/idlize.js

@@ -62,7 +62,8 @@ export function generate(inputDirs, inputFiles, outputDir, visitorFactory, optio
         });
     }
     input = Array.from(new Set(input.map(p => path.resolve(p)))).sort();
-    let program = ts.createProgram(input.concat([path.join(__dirname, "../stdlib.d.ts")]), options.compilerOptions);
+    let compilerHost = ts.createCompilerHost(options.compilerOptions);
+    let program = ts.createProgram(input.concat([path.join(__dirname, "../stdlib.d.ts")]), options.compilerOptions, compilerHost);
     if (options.enableLog) {
         console.log("Initialized TypeScript program with input files:", input);
     }
@@ -70,23 +71,37 @@ export function generate(inputDirs, inputFiles, outputDir, visitorFactory, optio
         fs.mkdirSync(outputDir, { recursive: true });
     const typeChecker = program.getTypeChecker();
     (_a = options.onBegin) === null || _a === void 0 ? void 0 : _a.call(options, outputDir, typeChecker);
+    const dtsFileName2Visitor = {};
     for (const sourceFile of program.getSourceFiles()) {
-        const resolvedSourceFile = path.resolve(sourceFile.fileName);
-        const isInDir = resolvedInputDirs.some(dir => resolvedSourceFile.startsWith(dir));
-        const isExplicitFile = input.some(f => path.resolve(f) === resolvedSourceFile);
+        const resolvedSourceFileName = path.resolve(sourceFile.fileName);
+        const isInDir = resolvedInputDirs.some(dir => resolvedSourceFileName.startsWith(dir));
+        const isExplicitFile = input.some(f => path.resolve(f) === resolvedSourceFileName);
         if (!isInDir && !isExplicitFile) {
             if (options.enableLog) {
-                console.log(`Skipping file: ${resolvedSourceFile}`);
+                console.log(`Skipping file: ${resolvedSourceFileName}`);
             }
             continue;
         }
         if (options.enableLog) {
-            console.log(`Processing file: ${resolvedSourceFile}`);
+            console.log(`Processing file: ${resolvedSourceFileName}`);
         }
         // Walk the tree to search for classes
-        const visitor = visitorFactory(sourceFile, typeChecker);
-        const output = visitor.visitWholeFile();
-        (_b = options.onSingleFile) === null || _b === void 0 ? void 0 : _b.call(options, output, outputDir, sourceFile);
+        const visitor = visitorFactory(sourceFile, program, compilerHost);
+        const result = visitor.visitPhase1();
+        dtsFileName2Visitor[sourceFile.fileName] = {
+            tsSourceFile: sourceFile,
+            visitor,
+            result
+        };
+    }
+    for (const resolvedSourceFileName in dtsFileName2Visitor) {
+        const visitorStaff = dtsFileName2Visitor[resolvedSourceFileName];
+        if (visitorStaff.visitor.visitPhase2)
+            visitorStaff.result = visitorStaff.visitor.visitPhase2(dtsFileName2Visitor);
+    }
+    for (const resolvedSourceFileName in dtsFileName2Visitor) {
+        const visitorStaff = dtsFileName2Visitor[resolvedSourceFileName];
+        (_b = options.onSingleFile) === null || _b === void 0 ? void 0 : _b.call(options, visitorStaff.result, outputDir, visitorStaff.tsSourceFile);
     }
     (_c = options.onEnd) === null || _c === void 0 ? void 0 : _c.call(options, outputDir);
     if (options.enableLog) {

package/build/lib/src/library.d.ts

@@ -1,14 +1,9 @@
 import * as idl from './idl';
 export interface IDLLibrary {
-    readonly files: readonly IDLFile[];
+    readonly files: readonly idl.IDLFile[];
 }
-export interface IDLFile {
-    fileName: string;
-    package?: idl.IDLPackage;
-    entities: idl.IDLNode[];
-}
-declare function createLibrary(files: IDLFile[]): IDLLibrary;
-declare function toLibrary(ii: Iterable<IDLFile>): IDLLibrary;
+declare function createLibrary(files: idl.IDLFile[]): IDLLibrary;
+declare function toLibrary(ii: Iterable<idl.IDLFile>): IDLLibrary;
 declare function serializeParam(params: unknown): string;
 export interface LibraryQuery<A, R> {
     fn: (x: A) => R;
@@ -44,8 +39,8 @@ export declare const lib: {
     lens: typeof lens;
     query: typeof query;
     select: {
-        files(): LibraryReducer<readonly IDLFile[]>;
-        nodes(params: EntitiesParams): LibraryQuery<readonly IDLFile[], idl.IDLNode[]>;
+        files(): LibraryReducer<readonly idl.IDLFile[]>;
+        nodes(params: EntitiesParams): LibraryQuery<readonly idl.IDLFile[], idl.IDLNode[]>;
         entries(): LibraryQuery<idl.IDLNode[], idl.IDLEntry[]>;
         interfaces(): LibraryQuery<idl.IDLNode[], idl.IDLInterface[]>;
         hasExt<T extends idl.IDLNode>(attr: idl.IDLExtendedAttributes): LibraryQuery<T[], T[]>;

package/build/lib/src/library.js

@@ -148,7 +148,7 @@ const select = {
             return [node];
         }
         return req(key, xs => {
-            return xs.flatMap(x => x.entities).flatMap(go);
+            return xs.flatMap(x => x.entries).flatMap(go);
         });
     },
     entries() {
@@ -166,7 +166,7 @@ const select = {
     name(name) {
         return reduce(`select.by.name.${name}`, lib => {
             return lib.files.flatMap(it => {
-                return it.entities.flatMap(it => {
+                return it.entries.flatMap(it => {
                     if (idl.isNamedNode(it) && it.name === name) {
                         return [it];
                     }

package/build/lib/src/peer-generation/PeerFile.d.ts

@@ -2,13 +2,14 @@ import * as idl from '../idl';
 import { PeerClass } from "./PeerClass";
 import { LibraryFileInterface } from '../LibraryInterface';
 export declare class PeerFile implements LibraryFileInterface {
-    readonly originalFilename: string;
-    readonly entries: idl.IDLEntry[];
+    readonly file: idl.IDLFile;
     readonly isPredefined: boolean;
     readonly peers: Map<string, PeerClass>;
-    constructor(originalFilename: string, entries: idl.IDLEntry[], isPredefined?: boolean);
+    constructor(file: idl.IDLFile, isPredefined?: boolean);
     packageName(): string;
     package(): idl.IDLPackage | undefined;
     get peersToGenerate(): PeerClass[];
+    get entries(): idl.IDLEntry[];
+    get originalFilename(): string;
 }
 //# sourceMappingURL=PeerFile.d.ts.map

package/build/lib/src/peer-generation/PeerFile.js

@@ -14,9 +14,8 @@
  */
 import * as idl from '../idl';
 export class PeerFile {
-    constructor(originalFilename, entries, isPredefined = false) {
-        this.originalFilename = originalFilename;
-        this.entries = entries;
+    constructor(file, isPredefined = false) {
+        this.file = file;
         this.isPredefined = isPredefined;
         this.peers = new Map();
     }
@@ -37,5 +36,13 @@ export class PeerFile {
         const peers = Array.from(this.peers.values());
         return peers;
     }
+    // TODO just to not refactor too much in one PR
+    get entries() {
+        return this.file.entries;
+    }
+    // TODO just to not refactor too much in one PR
+    get originalFilename() {
+        return this.file.fileName;
+    }
 }
 //# sourceMappingURL=PeerFile.js.map

package/build/lib/src/peer-generation/PeerLibrary.d.ts

@@ -10254,10 +10254,8 @@ export declare class PeerLibrary implements LibraryInterface {
     asIDLLibrary(): IDLLibrary;
     get globalScopeInterfaces(): idl.IDLInterface[];
     layout: LayoutManager;
-    private _syntheticEntries;
-    /** @deprecated PeerLibrary should contain only SDK entries */
-    get syntheticEntries(): idl.IDLEntry[];
-    initSyntheticEntries(entries: idl.IDLEntry[]): void;
+    private _syntheticFile;
+    initSyntheticEntries(file: idl.IDLFile): void;
     readonly files: PeerFile[];
     readonly builderClasses: Map<string, BuilderClass>;
     get buildersToGenerate(): BuilderClass[];
@@ -10279,8 +10277,8 @@ export declare class PeerLibrary implements LibraryInterface {
     setCurrentContext(context: string | undefined): void;
     findFileByOriginalFilename(filename: string): PeerFile | undefined;
     mapType(type: idl.IDLType): string;
-    resolveTypeReference(type: idl.IDLReferenceType, pointOfView?: idl.IDLEntry, rootEntries?: idl.IDLEntry[]): idl.IDLEntry | undefined;
-    resolvePackageName(entry: idl.IDLEntry): string;
+    resolveTypeReference(type: idl.IDLReferenceType): idl.IDLEntry | undefined;
+    private resolveTypeReferenceScoped;
     hasInLibrary(entry: idl.IDLEntry): boolean;
     typeConvertor(param: string, type: idl.IDLType, isOptionalParam?: boolean): ArgConvertor;
     declarationConvertor(param: string, type: idl.IDLReferenceType, declaration: idl.IDLEntry | undefined): ArgConvertor;

package/build/lib/src/peer-generation/PeerLibrary.js

@@ -40,21 +40,13 @@ export class PeerLibrary {
             return this._cachedIdlLibrary;
         }
         this._cachedIdlLibrary = {
-            files: this.files.map(file => ({
-                fileName: file.originalFilename,
-                entities: file.entries,
-                package: file.package()
-            }))
+            files: this.files.map(file => file.file)
         };
         return this._cachedIdlLibrary;
     }
     get globalScopeInterfaces() { return query(this.asIDLLibrary(), lenses.globals); }
-    /** @deprecated PeerLibrary should contain only SDK entries */
-    get syntheticEntries() {
-        return this._syntheticEntries;
-    }
-    initSyntheticEntries(entries) {
-        this._syntheticEntries = entries;
+    initSyntheticEntries(file) {
+        this._syntheticFile = file;
     }
     get buildersToGenerate() {
         return Array.from(this.builderClasses.values()).filter(it => it.needBeGenerated);
@@ -66,7 +58,7 @@ export class PeerLibrary {
         this.language = language;
         this.libraryPackages = libraryPackages;
         this.layout = LayoutManager.Empty();
-        this._syntheticEntries = [];
+        this._syntheticFile = idl.createFile([]);
         this.files = [];
         this.builderClasses = new Map();
         this.materializedClasses = new Map();
@@ -110,7 +102,7 @@ export class PeerLibrary {
     createContinuationCallbackReference(continuationType) {
         const continuationParameters = this.createContinuationParameters(continuationType);
         const syntheticName = generateSyntheticFunctionName(continuationParameters, idl.IDLVoidType);
-        return idl.createReferenceType(syntheticName, undefined, continuationType);
+        return idl.createReferenceType(syntheticName);
     }
     getCurrentContext() {
         return this.context;
@@ -124,15 +116,15 @@ export class PeerLibrary {
     mapType(type) {
         return this.targetNameConvertorInstance.convert(type);
     }
-    resolveTypeReference(type, pointOfView, rootEntries) {
-        const entry = this.syntheticEntries.find(it => it.name === type.name);
+    resolveTypeReference(type) {
+        return this.resolveTypeReferenceScoped(type);
+    }
+    resolveTypeReferenceScoped(type, pointOfView, rootEntries) {
+        const entry = this._syntheticFile.entries.find(it => it.name === type.name);
         if (entry)
             return entry;
         const qualifiedName = type.name.split(".");
-        pointOfView !== null && pointOfView !== void 0 ? pointOfView : (pointOfView = type.namespace);
-        let pointOfViewNamespace = !pointOfView || idl.isNamespace(pointOfView)
-            ? pointOfView
-            : pointOfView.namespace;
+        let pointOfViewNamespace = idl.fetchNamespaceFrom(type.parent);
         rootEntries !== null && rootEntries !== void 0 ? rootEntries : (rootEntries = this.files.flatMap(it => it.entries));
         if (1 === qualifiedName.length) {
             const predefined = rootEntries.filter(it => idl.hasExtAttribute(it, idl.IDLExtendedAttributes.Predefined));
@@ -152,9 +144,12 @@ export class PeerLibrary {
                 if (!candidates.length)
                     break;
                 if (qualifiedNamePart === qualifiedName.length - 1) {
-                    return candidates.length == 1
+                    const target = candidates.length == 1
                         ? candidates[0]
                         : candidates.find(it => !idl.hasExtAttribute(it, idl.IDLExtendedAttributes.Import)); // probably the wrong logic here
+                    if (target && idl.isImport(target)) // Temporary disable Import declarations
+                        return undefined;
+                    return target;
                 }
                 entries = [];
                 for (const candidate of candidates) {
@@ -166,7 +161,7 @@ export class PeerLibrary {
                         entries.push(...candidate.constants, ...candidate.properties, ...candidate.methods);
                 }
             }
-            pointOfViewNamespace = pointOfViewNamespace === null || pointOfViewNamespace === void 0 ? void 0 : pointOfViewNamespace.namespace;
+            pointOfViewNamespace = idl.fetchNamespaceFrom(pointOfViewNamespace === null || pointOfViewNamespace === void 0 ? void 0 : pointOfViewNamespace.parent);
         }
         // TODO: remove the next block after namespaces out of quarantine
         if (!pointOfView) {
@@ -174,7 +169,7 @@ export class PeerLibrary {
             const traverseNamespaces = (entry) => {
                 if (entry && idl.isNamespace(entry) && entry.members.length) {
                     //console.log(`Try alien namespace '${idl.getNamespacesPathFor(entry.members[0]).map(obj => obj.name).join(".")}' to resolve name '${type.name}'`)
-                    const resolved = this.resolveTypeReference(type, entry, rootEntries);
+                    const resolved = this.resolveTypeReferenceScoped(type, entry, rootEntries);
                     if (resolved)
                         resolveds.push(resolved);
                     entry.members.forEach(traverseNamespaces);
@@ -186,22 +181,9 @@ export class PeerLibrary {
         } // end of block to remove
         return undefined; // empty result
     }
-    resolvePackageName(entry) {
-        var _a;
-        if (this._syntheticEntries.includes(entry))
-            return ((_a = this.libraryPackages) === null || _a === void 0 ? void 0 : _a.length) ? this.libraryPackages[0] : this.files[0].packageName();
-        while (entry.namespace) {
-            entry = entry.namespace;
-        }
-        for (const file of this.files) {
-            if (file.entries.includes(entry))
-                return file.packageName();
-        }
-        throw new Error(`Package name for entry ${entry.name} was not found`);
-    }
     hasInLibrary(entry) {
         var _a, _b;
-        return !((_a = this.libraryPackages) === null || _a === void 0 ? void 0 : _a.length) || ((_b = this.libraryPackages) === null || _b === void 0 ? void 0 : _b.includes(this.resolvePackageName(entry)));
+        return !((_a = this.libraryPackages) === null || _a === void 0 ? void 0 : _a.length) || ((_b = this.libraryPackages) === null || _b === void 0 ? void 0 : _b.includes(idl.getPackageName(entry)));
     }
     typeConvertor(param, type, isOptionalParam = false) {
         if (isOptionalParam) {