@idlizer/core 2.0.21 → 2.0.23

package/build/lib/src/LanguageWriters/convertors/CppConvertors.js

@@ -21,15 +21,15 @@ export class CppInteropConvertor extends InteropConvertor {
     unwrap(type, result) {
         const conf = generatorConfiguration();
         if (idl.isType(type) && idl.isOptionalType(type)) {
-            return `${conf.param("OptionalPrefix")}${result.text}`;
+            return `${conf.OptionalPrefix}${result.text}`;
         }
         if (result.noPrefix) {
             return result.text;
         }
-        const typePrefix = conf.param("TypePrefix");
+        const typePrefix = conf.TypePrefix;
         // TODO remove this ugly hack for CustomObject's
         const convertedToCustomObject = result.text === idl.IDLCustomObjectType.name;
-        const libPrefix = idl.isPrimitiveType(type) || convertedToCustomObject ? "" : conf.param("LibraryPrefix");
+        const libPrefix = idl.isPrimitiveType(type) || convertedToCustomObject ? "" : conf.LibraryPrefix;
         return `${typePrefix}${libPrefix}${result.text}`;
     }
     convert(node) {

package/build/lib/src/LanguageWriters/convertors/InteropConvertors.d.ts

@@ -35,6 +35,8 @@ export declare class InteropNameConvertor implements IdlNameConvertor {
     convert(node: idl.IDLNode): string;
 }
 export declare class InteropReturnTypeConvertor implements TypeConvertor<string> {
+    protected readonly resolver?: ReferenceResolver | undefined;
+    constructor(resolver?: ReferenceResolver | undefined);
     isVoid(method: PeerMethod): boolean;
     convert(type: idl.IDLType): string;
     convertContainer(type: idl.IDLContainerType): string;

package/build/lib/src/LanguageWriters/convertors/InteropConvertors.js

@@ -57,7 +57,7 @@ export class InteropConvertor {
         return this.make(node.name);
     }
     convertCallback(node) {
-        return this.make(generatorConfiguration().param("LibraryPrefix") + node.name, true);
+        return this.make(generatorConfiguration().LibraryPrefix + node.name, true);
     }
     convertMethod(node) {
         return this.make(node.name);
@@ -98,7 +98,7 @@ export class InteropConvertor {
             case "Object":
                 return this.make('CustomObject');
         }
-        if (generatorConfiguration().paramArray("knownParameterized").includes(refName)) {
+        if (generatorConfiguration().param("parameterized").includes(refName)) {
             return this.make('CustomObject');
         }
         let decl = this.resolver.toDeclaration(type);
@@ -173,6 +173,9 @@ export class InteropNameConvertor {
     }
 }
 export class InteropReturnTypeConvertor {
+    constructor(resolver) {
+        this.resolver = resolver;
+    }
     isVoid(method) {
         return this.convert(method.returnType) === idl.IDLVoidType.name;
     }
@@ -225,6 +228,10 @@ export class InteropReturnTypeConvertor {
     convertTypeReference(type) {
         if (type.name.endsWith("Attribute"))
             return idl.IDLVoidType.name;
+        // Callbacks and array types return by value
+        if (this.resolver && idl.isCallback(this.resolver.toDeclaration(type))) {
+            return type.name;
+        }
         return PrimitiveTypesInstance.NativePointer.getText();
     }
     convertUnion(type) {

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

@@ -1,12 +1,17 @@
 export interface GeneratorConfiguration {
     param<T>(name: string): T;
-    paramArray<T>(name: string): T[];
+    readonly params: Record<string, any>;
+    TypePrefix: string;
+    LibraryPrefix: string;
+    OptionalPrefix: string;
 }
 export declare class BaseGeneratorConfiguration implements GeneratorConfiguration {
-    protected params: Record<string, any>;
+    readonly params: Record<string, any>;
     constructor(params?: Record<string, any>);
     param<T>(name: string): T;
-    paramArray<T>(name: string): T[];
+    get TypePrefix(): string;
+    get LibraryPrefix(): string;
+    get OptionalPrefix(): string;
 }
 export declare function setDefaultConfiguration(config: GeneratorConfiguration): void;
 export declare function generatorConfiguration(): GeneratorConfiguration;

package/build/lib/src/config.js

@@ -15,7 +15,7 @@
 export class BaseGeneratorConfiguration {
     constructor(params = {}) {
         this.params = {};
-        Object.assign(this.params, params);
+        Object.assign(this.params, Object.assign({ TypePrefix: "", LibraryPrefix: "", OptionalPrefix: "" }, params));
     }
     param(name) {
         if (name in this.params) {
@@ -23,12 +23,9 @@ export class BaseGeneratorConfiguration {
         }
         throw new Error(`${name} is unknown`);
     }
-    paramArray(name) {
-        if (name in this.params) {
-            return this.params[name];
-        }
-        throw new Error(`${name} is unknown`);
-    }
+    get TypePrefix() { return this.param("TypePrefix"); }
+    get LibraryPrefix() { return this.param("LibraryPrefix"); }
+    get OptionalPrefix() { return this.param("OptionalPrefix"); }
 }
 let currentConfig = new BaseGeneratorConfiguration();
 export function setDefaultConfiguration(config) {

package/build/lib/src/from-idl/DtsPrinter.js

@@ -168,7 +168,7 @@ export class CustomPrintVisitor {
         let isProtected = hasExtAttribute(node, IDLExtendedAttributes.Protected);
         if (isCommonMethod) {
             // TODO: not very clean, but we don't need to print these so far.
-            // if (PeerGeneratorConfig.ignorePeerMethod.includes(node.name)) return
+            // if (peerGeneratorConfiguration().ignorePeerMethod.includes(node.name)) return
             const typeParams = (_a = this.currentInterface) === null || _a === void 0 ? void 0 : _a.typeParameters;
             const returnType = typeParams && typeParams.length > 0 ? typeParams[0] : this.currentInterface.name;
             this.print(`${getName(node)}(value: ${this.printTypeForTS(node.type, undefined, undefined, isCommonMethod)}): ${returnType};`);

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

@@ -1,5 +1,4 @@
 export * from "./config";
-export * from "./configMerge";
 export * from "./idl";
 export * from "./visitor";
 export * from "./library";

package/build/lib/src/index.js

@@ -13,7 +13,6 @@
  * limitations under the License.
  */
 export * from "./config";
-export * from "./configMerge";
 export * from "./idl";
 export * from "./visitor";
 export * from "./library";

package/build/lib/src/inheritance.js

@@ -39,9 +39,9 @@ export function isCommonMethodOrSubclass(typeChecker, decl) {
     return isSubclass;
 }
 export function determineInheritanceRole(name) {
-    if (generatorConfiguration().paramArray("rootComponents").includes(name))
+    if (generatorConfiguration().param("rootComponents").includes(name))
         return InheritanceRole.Root;
-    if (generatorConfiguration().paramArray("standaloneComponents").includes(name))
+    if (generatorConfiguration().param("standaloneComponents").includes(name))
         return InheritanceRole.Standalone;
     return InheritanceRole.Heir;
 }

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

@@ -32,7 +32,7 @@ export class BuilderClass {
  */
 export function isBuilderClass(declaration) {
     const className = declaration.name;
-    if (generatorConfiguration().paramArray("builderClasses").includes(className)) {
+    if (generatorConfiguration().param("builderClasses").includes(className)) {
         return true;
     }
     if (isCustomBuilderClass(className)) {
@@ -43,7 +43,7 @@ export function isBuilderClass(declaration) {
     // are used for now.
     return false;
     /*
-    if (PeerGeneratorConfig.isStandardNameIgnored(className)) {
+    if (peerGeneratorConfiguration().isStandardNameIgnored(className)) {
         return false
     }
 

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

@@ -26,7 +26,7 @@ export function isMaterialized(declaration, resolver) {
         declaration.subkind === idl.IDLInterfaceSubkind.Tuple) {
         return false;
     }
-    for (const ignore of generatorConfiguration().paramArray("ignoreMaterialized")) {
+    for (const ignore of generatorConfiguration().param("ignoreMaterialized")) {
         if (declaration.name.endsWith(ignore))
             return false;
     }
@@ -87,6 +87,9 @@ export class MaterializedMethod extends PeerMethod {
             }
             return `(void*) 300`;
         }
+        if (idl.isReferenceType(this.method.signature.returnType)) {
+            return "{}";
+        }
         return undefined;
     }
     get receiverType() {

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

@@ -19,7 +19,7 @@ export class PrimitiveType {
         this.isPointer = isPointer;
     }
     getText() {
-        return generatorConfiguration().param("TypePrefix") + this.name;
+        return generatorConfiguration().TypePrefix + this.name;
     }
     toString() {
         return this.getText();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@idlizer/core",
-  "version": "2.0.21",
+  "version": "2.0.23",
   "description": "",
   "types": "build/lib/src/index.d.ts",
   "exports": {
@@ -34,7 +34,7 @@
   },
   "keywords": [],
   "dependencies": {
-    "@koalaui/interop": "1.4.8",
+    "@koalaui/interop": "1.5.0",
     "typescript": "4.9.5",
     "@types/node": "^18.0.0"
   },