@idlizer/core 2.1.10-arktscgen-3a → 2.1.10-arktscgen-5

package/build/lib/src/idl.js

@@ -87,11 +87,13 @@ export var IDLExtendedAttributes;
     IDLExtendedAttributes["TypeAnnotations"] = "TypeAnnotations";
     IDLExtendedAttributes["TypeArguments"] = "TypeArguments";
     IDLExtendedAttributes["TypeParameters"] = "TypeParameters";
+    IDLExtendedAttributes["TypeParametersDefaults"] = "TypeParametersDefaults";
     IDLExtendedAttributes["VerbatimDts"] = "VerbatimDts";
     IDLExtendedAttributes["HandWrittenImplementation"] = "HandWrittenImplementation";
     IDLExtendedAttributes["ExtraMethod"] = "ExtraMethod";
     IDLExtendedAttributes["OverloadAlias"] = "OverloadAlias";
     IDLExtendedAttributes["OverloadPriority"] = "OverloadPriority";
+    IDLExtendedAttributes["TransformOnSerialize"] = "TransformOnSerialize";
 })(IDLExtendedAttributes || (IDLExtendedAttributes = {}));
 export var IDLAccessorAttribute;
 (function (IDLAccessorAttribute) {
@@ -443,6 +445,7 @@ export const IDLSerializerBuffer = createPrimitiveType('SerializerBuffer');
 export const IDLFunctionType = createPrimitiveType('Function');
 export const IDLCustomObjectType = createPrimitiveType('CustomObject');
 export const IDLInteropReturnBufferType = createPrimitiveType('InteropReturnBuffer');
+export const IDLNullTypeName = "idlize.stdlib.Null";
 export function createNamespace(name, members, nodeInitializer) {
     return Object.assign(Object.assign({ kind: IDLKind.Namespace, members: members !== null && members !== void 0 ? members : [], name: name }, nodeInitializer), { _idlNodeBrand: innerIdlSymbol, _idlEntryBrand: innerIdlSymbol, _idlNamedNodeBrand: innerIdlSymbol });
 }
@@ -479,6 +482,7 @@ export function getNamespacesPathFor(node) {
     }
     return result;
 }
+const nodesWithoutIDLFiles = new Set();
 export function getFileFor(node) {
     let iterator = node;
     while (iterator) {
@@ -486,7 +490,11 @@ export function getFileFor(node) {
             return iterator;
         iterator = iterator.parent;
     }
-    console.warn(`Node ${getQualifiedName(node, "namespace.name")} does not have IDLFile in parents`);
+    const name = getQualifiedName(node, "namespace.name");
+    if (!nodesWithoutIDLFiles.has(name)) {
+        console.warn(`Node ${name} does not have IDLFile in parents`);
+        nodesWithoutIDLFiles.add(name);
+    }
     return undefined;
 }
 export function isEqualByQualifedName(a, b, pattern = "package.namespace.name") {
@@ -872,23 +880,29 @@ export function unescapeKeyword(name) {
 const printedIndentInc = "[[indent-inc]]";
 const printedIndentDec = "[[indent-dec]]";
 export function printType(type, options) {
+    var _a;
     if (!type)
         throw new Error("Missing type");
     if (isInterface(type))
         return type.name;
-    if (isOptionalType(type))
-        return `(${printType(type.type)} or ${IDLUndefinedType.name})`;
+    if (isOptionalType(type)) {
+        if (hasExtAttribute(type, IDLExtendedAttributes.UnionOnlyNull))
+            return `(${printType(type.type)} or ${IDLNullTypeName})`;
+        else if (hasExtAttribute(type, IDLExtendedAttributes.UnionWithNull))
+            return `(${printType(type.type)} or ${IDLUndefinedType.name} or${IDLNullTypeName})`;
+        else
+            return `(${printType(type.type)} or ${IDLUndefinedType.name})`;
+    }
     if (isPrimitiveType(type))
         return type.name;
     if (isContainerType(type))
         return `${type.containerKind}<${type.elementType.map(it => printType(it)).join(", ")}>`;
     if (isReferenceType(type)) {
-        const extAttrs = type.extendedAttributes ? Array.from(type.extendedAttributes) : [];
         if (type.typeArguments)
-            extAttrs.push({ name: IDLExtendedAttributes.TypeArguments, value: type.typeArguments.map(it => printType(it)).join(",") });
-        if (!extAttrs.length)
+            updateExtAttribute(type, IDLExtendedAttributes.TypeArguments, type.typeArguments.map(it => printType(it)).join(","));
+        if (!((_a = type.extendedAttributes) === null || _a === void 0 ? void 0 : _a.length))
             return type.name;
-        let res = `[${quoteAttributeValues(extAttrs)}] ${type.name}`;
+        let res = `[${quoteAttributeValues(type.extendedAttributes)}] ${type.name}`;
         if (options === null || options === void 0 ? void 0 : options.bracketsAroundReferenceTypeWithExtAttrs)
             return `(${res})`;
         return res;
@@ -958,18 +972,31 @@ export function printExtendedAttributes(idl, indentLevel) {
             break;
     }
     const attributes = Array.from(idl.extendedAttributes || []);
-    if (typeParameters === null || typeParameters === void 0 ? void 0 : typeParameters.length)
+    if ((typeParameters === null || typeParameters === void 0 ? void 0 : typeParameters.length) && !attributes.find(x => x.name === IDLExtendedAttributes.TypeParameters))
         attributes.push({ name: IDLExtendedAttributes.TypeParameters, value: typeParameters.join(",") });
-    if (typeArguments === null || typeArguments === void 0 ? void 0 : typeArguments.length)
+    if ((typeArguments === null || typeArguments === void 0 ? void 0 : typeArguments.length) && !attributes.find(x => x.name === IDLExtendedAttributes.TypeArguments))
         attributes.push({ name: IDLExtendedAttributes.TypeArguments, value: typeArguments.map(it => printType(it)).join(",") });
     if (idl.documentation) {
         let docs = {
             name: IDLExtendedAttributes.Documentation,
             value: idl.documentation
         };
-        attributes.push(docs);
+        attributes.unshift(docs);
     }
-    const attrSpec = quoteAttributeValues(attributes);
+    // Deduplicate
+    const names = new Set();
+    const actualAttributes = [];
+    for (const attr of attributes) {
+        if (names.has(attr.name)) {
+            continue;
+        }
+        names.add(attr.name);
+        actualAttributes.push(attr);
+    }
+    if (actualAttributes.length == 0) {
+        return [];
+    }
+    const attrSpec = quoteAttributeValues(actualAttributes);
     return attrSpec ? [`[${attrSpec}]`] : [];
 }
 export const attributesToQuote = new Set([
@@ -981,6 +1008,7 @@ export const attributesToQuote = new Set([
     IDLExtendedAttributes.TraceKey,
     IDLExtendedAttributes.TypeArguments,
     IDLExtendedAttributes.TypeParameters,
+    IDLExtendedAttributes.TypeParametersDefaults,
 ]);
 function quoteAttributeValues(attributes) {
     return attributes === null || attributes === void 0 ? void 0 : attributes.map(it => {
@@ -1181,6 +1209,17 @@ export function getExtAttribute(node, name) {
     var _a, _b;
     return (_b = (_a = node.extendedAttributes) === null || _a === void 0 ? void 0 : _a.find(it => it.name === name)) === null || _b === void 0 ? void 0 : _b.value;
 }
+export function removeExtAttribute(node, name) {
+    if (node.extendedAttributes) {
+        node.extendedAttributes = node.extendedAttributes.filter(it => it.name !== name);
+    }
+}
+export function updateExtAttribute(node, name, value) {
+    var _a;
+    removeExtAttribute(node, name);
+    (_a = node.extendedAttributes) !== null && _a !== void 0 ? _a : (node.extendedAttributes = []);
+    node.extendedAttributes.push({ name, value });
+}
 export function getVerbatimDts(node) {
     let value = getExtAttribute(node, IDLExtendedAttributes.VerbatimDts);
     return value ? value.substring(1, value.length - 1) : undefined;
@@ -1203,6 +1242,16 @@ export function decomposeQualifiedName(type) {
     }
     return [undefined, typeName];
 }
+export function qualifiedNameStartsWith(node, template) {
+    const name = Array.isArray(node) ? node : getFQName(node).split(".");
+    if (name.length < template.length)
+        return false;
+    for (let i = 0; i < template.length; i++) {
+        if (name[i] != template[i])
+            return false;
+    }
+    return true;
+}
 export function maybeUnwrapOptionalType(type) {
     if (isOptionalType(type)) {
         return type.type;
@@ -1320,4 +1369,17 @@ export function extremumOfOrdinals(enumEntry) {
     });
     return { low, high };
 }
+export const PACKAGE_IDLIZE_INTERNAL = "idlize.internal";
+export function isInIdlize(entry) {
+    return isInPackage(entry, "idlize");
+}
+export function isInIdlizeInterop(entry) {
+    return isInPackage(entry, `${PACKAGE_IDLIZE_INTERNAL}.interop`);
+}
+export function isInIdlizeInternal(entry) {
+    return isInPackage(entry, PACKAGE_IDLIZE_INTERNAL);
+}
+export function isInIdlizeStdlib(entry) {
+    return isInPackage(entry, "idlize.stdlib");
+}
 //# sourceMappingURL=idl.js.map

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

@@ -3,11 +3,9 @@ export * from "./idl";
 export * from "./resolveNamedNode";
 export * from "./visitor";
 export * from "./library";
-export * from "./idlize";
 export * from "./inheritance";
 export * from "./Language";
 export * from "./languageSpecificKeywords";
-export * from "./options";
 export * from "./util";
 export * from "./rand_utils";
 export * from "./IndentedPrinter";
@@ -22,14 +20,12 @@ export * from "./LanguageWriters/nameConvertor";
 export * from "./LanguageWriters/convertors/CppConvertors";
 export * from "./LanguageWriters/convertors/TSConvertors";
 export * from "./LanguageWriters/convertors/ETSConvertors";
-export * from "./LanguageWriters/convertors/JavaConvertors";
 export * from "./LanguageWriters/convertors/CJConvertors";
 export * from "./LanguageWriters/convertors/InteropConvertors";
 export * from "./LanguageWriters/convertors/KotlinConvertors";
 export * from "./LanguageWriters/writers/CJLanguageWriter";
 export * from "./LanguageWriters/writers/CLikeLanguageWriter";
 export * from "./LanguageWriters/writers/CppLanguageWriter";
-export * from "./LanguageWriters/writers/JavaLanguageWriter";
 export * from "./LanguageWriters/writers/TsLanguageWriter";
 export * from "./LanguageWriters/writers/ETSLanguageWriter";
 export * from "./LanguageWriters/writers/KotlinLanguageWriter";
@@ -49,16 +45,18 @@ export * from "./peer-generation/isStructureType";
 export * from "./peer-generation/isEnumType";
 export * from "./peer-generation/unions";
 export * from "./peer-generation/getSuperType";
+export * from "./peer-generation/ConflictingDeclarations";
 export * from "./transformers/FqnTransformer";
 export * from "./transformers/GenericTransformer";
 export * from "./transformers/NullTransformer";
+export * from "./transformers/OnSerializeTransformer";
 export * from "./LanguageWriters";
 export * from "./peer-generation/ReferenceResolver";
 export * from "./peer-generation/idl/common";
 export * from "./from-idl/IDLLinter";
 export { fromIDL, scanIDL } from "./from-idl/common";
 export { idlToDtsString, CustomPrintVisitor } from "./from-idl/DtsPrinter";
-export { toIDLFile, addSyntheticType, resolveSyntheticType, IDLTokenInfoMap } from "./from-idl/deserialize";
+export { parseIDLFile, addSyntheticType, resolveSyntheticType } from "./from-idl/deserialize";
 export { Parser, FatalParserException } from "./from-idl/parser";
 export { D, ConfigTypeInfer, ConfigSchema, inspectSchema } from './configDescriber';
 //# sourceMappingURL=index.d.ts.map

package/build/lib/src/index.js

@@ -17,11 +17,9 @@ export * from "./idl";
 export * from "./resolveNamedNode";
 export * from "./visitor";
 export * from "./library";
-export * from "./idlize";
 export * from "./inheritance";
 export * from "./Language";
 export * from "./languageSpecificKeywords";
-export * from "./options";
 export * from "./util";
 export * from "./rand_utils";
 export * from "./IndentedPrinter";
@@ -36,14 +34,12 @@ export * from "./LanguageWriters/nameConvertor";
 export * from "./LanguageWriters/convertors/CppConvertors";
 export * from "./LanguageWriters/convertors/TSConvertors";
 export * from "./LanguageWriters/convertors/ETSConvertors";
-export * from "./LanguageWriters/convertors/JavaConvertors";
 export * from "./LanguageWriters/convertors/CJConvertors";
 export * from "./LanguageWriters/convertors/InteropConvertors";
 export * from "./LanguageWriters/convertors/KotlinConvertors";
 export * from "./LanguageWriters/writers/CJLanguageWriter";
 export * from "./LanguageWriters/writers/CLikeLanguageWriter";
 export * from "./LanguageWriters/writers/CppLanguageWriter";
-export * from "./LanguageWriters/writers/JavaLanguageWriter";
 export * from "./LanguageWriters/writers/TsLanguageWriter";
 export * from "./LanguageWriters/writers/ETSLanguageWriter";
 export * from "./LanguageWriters/writers/KotlinLanguageWriter";
@@ -63,16 +59,18 @@ export * from "./peer-generation/isStructureType";
 export * from "./peer-generation/isEnumType";
 export * from "./peer-generation/unions";
 export * from "./peer-generation/getSuperType";
+export * from "./peer-generation/ConflictingDeclarations";
 export * from "./transformers/FqnTransformer";
 export * from "./transformers/GenericTransformer";
 export * from "./transformers/NullTransformer";
+export * from "./transformers/OnSerializeTransformer";
 export * from "./LanguageWriters";
 export * from "./peer-generation/ReferenceResolver";
 export * from "./peer-generation/idl/common";
 export * from "./from-idl/IDLLinter";
 export { fromIDL, scanIDL } from "./from-idl/common";
 export { idlToDtsString, CustomPrintVisitor } from "./from-idl/DtsPrinter";
-export { toIDLFile, addSyntheticType, resolveSyntheticType } from "./from-idl/deserialize";
+export { parseIDLFile, addSyntheticType, resolveSyntheticType } from "./from-idl/deserialize";
 export { Parser, FatalParserException } from "./from-idl/parser";
 export { D, inspectSchema } from './configDescriber';
 //# sourceMappingURL=index.js.map

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

@@ -1,4 +1,3 @@
-import * as ts from "typescript";
 export declare enum InheritanceRole {
     Finalizable = 0,
     PeerNode = 1,
@@ -6,7 +5,6 @@ export declare enum InheritanceRole {
     Heir = 3,
     Standalone = 4
 }
-export declare function isCommonMethodOrSubclass(typeChecker: ts.TypeChecker, decl: ts.ClassDeclaration): boolean;
 export declare function determineInheritanceRole(name: string): InheritanceRole;
 export declare function determineParentRole(name: string | undefined, parent: string | undefined): InheritanceRole;
 export declare function isCommonMethod(name: string): boolean;

package/build/lib/src/inheritance.js

@@ -12,9 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import * as ts from "typescript";
 import { generatorConfiguration } from "./config";
-import { asString, heritageDeclarations, identName } from "./util";
 export var InheritanceRole;
 (function (InheritanceRole) {
     InheritanceRole[InheritanceRole["Finalizable"] = 0] = "Finalizable";
@@ -23,21 +21,6 @@ export var InheritanceRole;
     InheritanceRole[InheritanceRole["Heir"] = 3] = "Heir";
     InheritanceRole[InheritanceRole["Standalone"] = 4] = "Standalone";
 })(InheritanceRole || (InheritanceRole = {}));
-export function isCommonMethodOrSubclass(typeChecker, decl) {
-    var _a;
-    let name = identName(decl.name);
-    let isSubclass = isRoot(name);
-    (_a = decl.heritageClauses) === null || _a === void 0 ? void 0 : _a.forEach(it => {
-        heritageDeclarations(typeChecker, it).forEach(it => {
-            let name = asString(it.name);
-            isSubclass = isSubclass || isRoot(name);
-            if (!ts.isClassDeclaration(it))
-                return isSubclass;
-            isSubclass = isSubclass || isCommonMethodOrSubclass(typeChecker, it);
-        });
-    });
-    return isSubclass;
-}
 export function determineInheritanceRole(name) {
     if (generatorConfiguration().rootComponents.includes(name))
         return InheritanceRole.Root;

package/build/lib/src/languageSpecificKeywords.js

@@ -35,7 +35,7 @@ export const CJKeywords = new Set([
     'break', 'is', 'as', 'in', 'match',
     'from', 'where', 'extend', 'spawn',
     'synchronized', 'macro', 'quote', 'true',
-    /*'false', */ 'static', 'public', 'private',
+    'false', 'static', 'public', 'private',
     'protected', 'override', 'redef', 'abstract',
     'open', 'operator', 'foreign', 'inout',
     'prop', 'mut', 'unsafe', 'get', 'set', 'type'

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

@@ -0,0 +1,6 @@
+import * as idl from "../idl";
+import { Language } from "../Language";
+import { LibraryInterface } from "../LibraryInterface";
+export declare function findTopLevelConflicts(library: LibraryInterface, language: Language): string[];
+export declare function isTopLevelConflicted(library: LibraryInterface, language: Language, node: idl.IDLEntry): boolean;
+//# sourceMappingURL=ConflictingDeclarations.d.ts.map

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

@@ -0,0 +1,43 @@
+import * as idl from "../idl";
+import { Language } from "../Language";
+const findTopLevelConflicts_cache = new Map();
+export function findTopLevelConflicts(library, language) {
+    if (!findTopLevelConflicts_cache.has(library))
+        findTopLevelConflicts_cache.set(library, new Map);
+    const libraryCache = findTopLevelConflicts_cache.get(library);
+    if (!libraryCache.has(language))
+        libraryCache.set(language, findTopLevelConflictsUncached(library, language));
+    return libraryCache.get(language);
+}
+function findTopLevelConflictsUncached(library, language) {
+    const foundNames = new Set();
+    const conflictingNames = new Set();
+    const ignoreTypedefs = language === Language.CPP;
+    for (const file of library.files) {
+        for (const entry of file.entries) {
+            if (idl.isSyntheticEntry(entry))
+                continue;
+            if (ignoreTypedefs && idl.isTypedef(entry))
+                // for redefinitions like `typedef _Resource Resource;` - in CPP than anyway will be expanded to Resource declaration
+                continue;
+            if (idl.isCallback(entry) || idl.isInterface(entry) || idl.isTypedef(entry) || idl.isEnum(entry)) {
+                if (foundNames.has(entry.name)) {
+                    conflictingNames.add(entry.name);
+                }
+                else {
+                    foundNames.add(entry.name);
+                }
+            }
+        }
+    }
+    return Array.from(conflictingNames);
+}
+export function isTopLevelConflicted(library, language, node) {
+    const topLevelConflicts = findTopLevelConflicts(library, language);
+    while (node.parent && idl.isNamespace(node.parent)) {
+        node = node.parent;
+    }
+    return node.parent !== undefined
+        && idl.isFile(node.parent) && idl.isEntry(node) && topLevelConflicts.includes(node.name);
+}
+//# sourceMappingURL=ConflictingDeclarations.js.map

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

@@ -23,4 +23,6 @@ export declare class LayoutManager {
     handwrittenPackage(): string;
     static Empty(): LayoutManager;
 }
+export declare function wrapCurrentFileDescription<T>(description: LayoutTargetDescription, op: () => T): T;
+export declare function isDeclaredInCurrentFile(layout: LayoutManagerStrategy, over: LayoutTargetDescription): boolean;
 //# sourceMappingURL=LayoutManager.d.ts.map

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

@@ -35,4 +35,19 @@ export class LayoutManager {
         return new LayoutManager({ resolve: () => '', handwrittenPackage: () => '' });
     }
 }
+let currentGenerationDescription;
+export function wrapCurrentFileDescription(description, op) {
+    const prev = currentGenerationDescription;
+    currentGenerationDescription = description;
+    const result = op();
+    currentGenerationDescription = prev;
+    return result;
+}
+export function isDeclaredInCurrentFile(layout, over) {
+    if (!currentGenerationDescription)
+        throw new Error("Current file context is not set up. Please use `wrapCurrentFileDescription` to set up current context. That must be temporary solution until structural printers are ready");
+    if (layout.resolve(currentGenerationDescription) === layout.resolve(over))
+        return true;
+    return false;
+}
 //# sourceMappingURL=LayoutManager.js.map

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

@@ -11,6 +11,8 @@ export declare class MaterializedField {
     isNullableOriginalTypeField?: boolean | undefined;
     extraMethodName: string | undefined;
     constructor(field: Field, argConvertor: ArgConvertor, outArgConvertor?: ArgConvertor | undefined, isNullableOriginalTypeField?: boolean | undefined, extraMethodName?: string | undefined);
+    hasGetter(): boolean;
+    hasSetter(): boolean;
 }
 export declare class MaterializedMethod extends PeerMethod {
     decl: idl.IDLConstructor | idl.IDLMethod | undefined;

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

@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 import * as idl from '../idl';
-import { copyMethod, Method, MethodModifier, NamedMethodSignature } from '../LanguageWriters/LanguageWriter';
+import { copyMethod, FieldModifier, Method, MethodModifier, NamedMethodSignature } from '../LanguageWriters/LanguageWriter';
 import { capitalize } from '../util';
 import { qualifiedName } from './idl/common';
 import { PeerMethod, PeerMethodSignature } from './PeerMethod';
@@ -25,6 +25,19 @@ export class MaterializedField {
         this.isNullableOriginalTypeField = isNullableOriginalTypeField;
         this.extraMethodName = extraMethodName;
     }
+    hasGetter() {
+        const isGetter = this.field.modifiers.includes(FieldModifier.GET);
+        const isSetter = this.field.modifiers.includes(FieldModifier.SET);
+        const isAccessor = isGetter || isSetter;
+        return !isAccessor || isGetter;
+    }
+    hasSetter() {
+        const isReadonly = this.field.modifiers.includes(FieldModifier.READONLY);
+        const isGetter = this.field.modifiers.includes(FieldModifier.GET);
+        const isSetter = this.field.modifiers.includes(FieldModifier.SET);
+        const isAccessor = isGetter || isSetter;
+        return (!isAccessor && !isReadonly) || isSetter;
+    }
 }
 export class MaterializedMethod extends PeerMethod {
     constructor(decl, sig, originalParentName, implementationParentName, returnType, isCallSignature, uniqueOverloadName, method) {

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

@@ -10273,8 +10273,6 @@ export declare class PeerLibrary implements LibraryInterface {
     readonly customComponentMethods: string[];
     createLanguageWriter(language?: Language): LanguageWriter;
     createTypeNameConvertor(language: Language): IdlNameConvertor;
-    protected readonly targetNameConvertorInstance: IdlNameConvertor;
-    private readonly interopNameConvertorInstance;
     get libraryPrefix(): string;
     createContinuationParameters(continuationType: idl.IDLType): idl.IDLParameter[];
     createContinuationCallbackReference(continuationType: idl.IDLType): idl.IDLReferenceType;
@@ -10294,7 +10292,6 @@ export declare class PeerLibrary implements LibraryInterface {
     typeConvertor(param: string, type: idl.IDLType, isOptionalParam?: boolean): ArgConvertor;
     declarationConvertor(param: string, type: idl.IDLReferenceType, declaration: idl.IDLEntry | undefined): ArgConvertor;
     private customConvertor;
-    getInteropName(node: idl.IDLNode): string;
     toDeclaration(type: idl.IDLType | idl.IDLTypedef | idl.IDLCallback | idl.IDLEnum | idl.IDLInterface): idl.IDLEntry | idl.IDLType;
     setFileLayout(strategy: LayoutManagerStrategy): void;
     withFileLayout(strategy: LayoutManagerStrategy, op: () => void): void;