@ts-for-gir/lib 3.3.0 → 4.0.0-beta.2

package/lib/gir/util.js

@@ -0,0 +1,556 @@
+import { deprecatedVersion, introducedVersion, isDeprecated } from "./namespace.js";
+import { GirDirection } from "@gi.ts/parser";
+import { TypeIdentifier, ThisType, ArrayType, ClosureType, GTypeType, BinaryType, ObjectType, NullableType, StringType, NumberType, BooleanType, Uint8ArrayType, AnyType, UnknownType, NeverType, VoidType, GenerifiedTypeIdentifier, GenericType, NativeType } from "../gir.js";
+import { TwoKeyMap } from "../util.js";
+const reservedWords = [
+    // For now, at least, the typescript compiler doesn't throw on numerical types like int, float, etc.
+    "abstract",
+    "arguments",
+    "await",
+    "boolean",
+    "break",
+    "byte",
+    "case",
+    "catch",
+    "char",
+    "class",
+    "const",
+    "continue",
+    "constructor", // This isn't technically reserved, but it's problematic.
+    "debugger",
+    "default",
+    "delete",
+    "do",
+    // "double",
+    "else",
+    "enum",
+    "eval",
+    "export",
+    "extends",
+    "false",
+    "final",
+    "finally",
+    // "float",
+    "for",
+    "function",
+    "goto",
+    "if",
+    "implements",
+    "import",
+    "in",
+    "instanceof",
+    // "int",
+    "interface",
+    "let",
+    // "long",
+    "native",
+    "new",
+    "null",
+    "package",
+    "private",
+    "protected",
+    "public",
+    "return",
+    "short",
+    "static",
+    "super",
+    "switch",
+    "synchronized",
+    "this",
+    "throw",
+    "throws",
+    "transient",
+    "true",
+    "try",
+    "typeof",
+    "var",
+    "void",
+    "volatile",
+    "while",
+    "with",
+    "yield"
+];
+export function getAliasType(modName, _ns, parameter) {
+    let name = parameter.type?.[0].$["name"] || "unknown";
+    const nameParts = name.split(" ");
+    if (nameParts.length === 1) {
+        name = nameParts[0];
+    }
+    else {
+        name = nameParts[1];
+    }
+    return parseTypeExpression(modName, name);
+}
+/**
+ * This function determines whether a given type is a "pointer type"...
+ *
+ * Any type where the c:type ends with *
+ */
+function isPointerType(types) {
+    const type = types?.[0];
+    if (!type)
+        return false;
+    const ctype = type.$["c:type"];
+    if (!ctype)
+        return false;
+    const typeName = type.$.name;
+    if (!typeName)
+        return false;
+    if (isPrimitiveType(typeName))
+        return false;
+    return ctype.endsWith("*");
+}
+/* Decode the type */
+export function getType(ns, param) {
+    const modName = ns.name;
+    if (!param)
+        return VoidType;
+    let name = "";
+    let arrayDepth = null;
+    let length = null;
+    let isPointer = false;
+    const parameter = param;
+    if (parameter.array && parameter.array[0]) {
+        arrayDepth = 1;
+        const [array] = parameter.array;
+        if (array.$ && array.$.length != null) {
+            length = Number.parseInt(array.$.length, 10);
+            if (Number.isNaN(length)) {
+                throw new Error(`Error parsing array length: ${array.$.length}`);
+            }
+        }
+        if (array.type && array.type[0].$ && array.type[0].$["name"]) {
+            name = array.type[0].$["name"];
+        }
+        else if (array.array) {
+            let arr = array;
+            let depth = 1;
+            while (Array.isArray(arr.array)) {
+                arr = arr.array[0];
+                depth++;
+            }
+            const possibleName = arr.type?.[0].$["name"];
+            if (possibleName) {
+                name = possibleName;
+            }
+            else {
+                name = "unknown";
+                console.log(`Failed to find array type in ${modName}: `, JSON.stringify(parameter.$, null, 4), "\nMarking as unknown!");
+            }
+            arrayDepth = depth;
+            isPointer = isPointerType(array.type);
+        }
+        else {
+            name = "unknown";
+        }
+    }
+    else if (parameter.type && parameter.type[0] && parameter.type[0].$) {
+        const possibleName = parameter.type[0].$["name"];
+        if (possibleName) {
+            name = possibleName;
+        }
+        else {
+            name = "unknown";
+            console.log(`Failed to find type in ${modName}: `, JSON.stringify(parameter.type[0].$, null, 4), "\nMarking as unknown!");
+        }
+        isPointer = isPointerType(parameter.type);
+    }
+    else if (parameter.varargs || (parameter.$ && parameter.$.name === "...")) {
+        arrayDepth = 1;
+        name = "any";
+    }
+    else {
+        name = "unknown";
+        console.log(`Unknown varargs type in ${modName}: `, JSON.stringify(parameter.$, null, 4), "\nMarking as unknown!");
+    }
+    let closure = null;
+    if (parameter.$ && parameter.$.closure) {
+        closure = Number.parseInt(parameter.$.closure, 10);
+        if (Number.isNaN(closure)) {
+            throw new Error(`Error parsing closure data position: ${parameter.$.closure}`);
+        }
+    }
+    const nullable = parameter.$ && parameter.$["nullable"] === "1";
+    const allowNone = parameter.$ && parameter.$["allow-none"] === "1";
+    const x = name.split(" ");
+    if (x.length === 1) {
+        name = x[0];
+    }
+    else {
+        name = x[1];
+    }
+    const baseType = parseTypeString(name);
+    if (!baseType) {
+        throw new Error(`Un-parsable type: ${name}`);
+    }
+    let variableType = parseTypeExpression(modName, name);
+    if (variableType instanceof TypeIdentifier) {
+        if (variableType.is("GLib", "List") || variableType.is("GLib", "SList")) {
+            // TODO: $?.name was not necessary in gi.ts, but TelepathyLogger
+            // fails to generate now.
+            const listType = parameter?.type?.[0].type?.[0]?.$?.name;
+            if (listType) {
+                name = listType;
+                variableType = parseTypeExpression(modName, name);
+                arrayDepth = 1;
+            }
+        }
+        else if (variableType.is("GLib", "HashTable")) {
+            const keyType = parameter?.type?.[0]?.type?.[0]?.$.name;
+            const valueType = parameter?.type?.[0]?.type?.[1]?.$.name;
+            if (keyType && valueType) {
+                const key = parseTypeExpression(modName, keyType);
+                const value = parseTypeExpression(modName, valueType);
+                variableType = new GenerifiedTypeIdentifier("HashTable", "GLib", [key, value]);
+            }
+        }
+    }
+    if (arrayDepth != null) {
+        const primitiveArrayType = resolvePrimitiveArrayType(name, arrayDepth);
+        if (primitiveArrayType) {
+            const [primitiveName, primitiveArrayDepth] = primitiveArrayType;
+            variableType = ArrayType.new({
+                type: primitiveName,
+                arrayDepth: primitiveArrayDepth,
+                length
+            });
+        }
+        else {
+            variableType = ArrayType.new({ type: variableType, arrayDepth, length });
+        }
+    }
+    else if (closure != null) {
+        variableType = ClosureType.new({ type: variableType, user_data: closure });
+    }
+    if (parameter.$ &&
+        (parameter.$.direction === GirDirection.Inout || parameter.$.direction === GirDirection.Out) &&
+        (nullable || allowNone) &&
+        !(variableType instanceof NativeType)) {
+        return new NullableType(variableType);
+    }
+    if ((!parameter.$?.direction || parameter.$.direction === GirDirection.In) && nullable) {
+        return new NullableType(variableType);
+    }
+    variableType.isPointer = isPointer;
+    return variableType;
+}
+export const SanitizedIdentifiers = new Map();
+export function sanitizeIdentifierName(namespace, name) {
+    // This is a unique case where the name is "empty".
+    if (name === "") {
+        return "''";
+    }
+    let sanitized_name = name.replace(/[^A-z0-9_]/gi, "_");
+    if (reservedWords.includes(sanitized_name)) {
+        sanitized_name = `__${sanitized_name}`;
+    }
+    if (sanitized_name.match(/^[^A-z_]/) != null) {
+        sanitized_name = `__${sanitized_name}`;
+    }
+    if (namespace && sanitized_name !== name) {
+        SanitizedIdentifiers.set(`${namespace}.${name}`, `${namespace}.${sanitized_name}`);
+    }
+    return sanitized_name;
+}
+// TODO: Until we support resolving via c:type, fix GIRs with
+// broken namespacing...
+export function sanitizeNamespace(namespace) {
+    if (namespace === "Tracker_Vala") {
+        return "Tracker";
+    }
+    return namespace;
+}
+export function sanitizeMemberName(name) {
+    // This is a unique case where the name is "empty".
+    if (name === "") {
+        return "''";
+    }
+    return name.replace(/[^A-z0-9_]/gi, "_");
+}
+export function isInvalid(name) {
+    if (reservedWords.includes(name)) {
+        return true;
+    }
+    const sanitized = sanitizeMemberName(name);
+    if (sanitized.match(/^[^A-z_]/) != null) {
+        return true;
+    }
+    return false;
+}
+export function parseDoc(element) {
+    const el = element.doc?.[0]?._;
+    return el ? `${el}` : null;
+}
+export function parseDeprecatedDoc(element) {
+    return element["doc-deprecated"]?.[0]?._ ?? null;
+}
+export function parseMetadata(element) {
+    const version = introducedVersion(element);
+    const deprecatedIn = deprecatedVersion(element);
+    const deprecated = isDeprecated(element);
+    const doc = parseDeprecatedDoc(element);
+    if (!version && !deprecated && !deprecatedIn && !doc) {
+        return undefined;
+    }
+    return {
+        ...(deprecated ? { deprecated } : {}),
+        ...(doc ? { deprecatedDoc: doc } : {}),
+        ...(deprecatedIn ? { deprecatedVersion: deprecatedIn } : {}),
+        ...(version ? { introducedVersion: version } : {})
+    };
+}
+export function parseTypeString(type) {
+    if (type.includes(".")) {
+        const parts = type.split(".");
+        if (parts.length > 2) {
+            throw new Error(`Invalid type string ${type} passed.`);
+        }
+        const [namespace, name] = parts;
+        return { name, namespace };
+    }
+    else {
+        return { name: type, namespace: null };
+    }
+}
+export function parseTypeIdentifier(modName, type) {
+    const baseType = parseTypeString(type);
+    if (baseType.namespace) {
+        return new TypeIdentifier(baseType.name, baseType.namespace);
+    }
+    else {
+        return new TypeIdentifier(baseType.name, modName);
+    }
+}
+export function parseTypeExpression(modName, type) {
+    const baseType = parseTypeString(type);
+    if (baseType.namespace) {
+        return new TypeIdentifier(baseType.name, baseType.namespace).sanitize();
+    }
+    else {
+        const primitiveType = resolvePrimitiveType(baseType.name);
+        if (primitiveType !== null) {
+            return primitiveType;
+        }
+        else {
+            return new TypeIdentifier(baseType.name, modName).sanitize();
+        }
+    }
+}
+export function resolvePrimitiveArrayType(name, arrayDepth) {
+    if (arrayDepth > 0) {
+        switch (name) {
+            case "gint8":
+            case "guint8":
+                return [Uint8ArrayType, arrayDepth - 1];
+        }
+    }
+    const resolvedName = resolvePrimitiveType(name);
+    if (resolvedName) {
+        return [resolvedName, arrayDepth];
+    }
+    else {
+        return null;
+    }
+}
+export function isPrimitiveType(name) {
+    return resolvePrimitiveType(name) !== null;
+}
+export function resolvePrimitiveType(name) {
+    switch (name) {
+        case "":
+            console.error("Resolving '' to any on " + name);
+            return AnyType;
+        case "filename":
+            return StringType;
+        // Pass this through
+        case "GType":
+            return GTypeType;
+        case "utf8":
+            return StringType;
+        case "void": // Support TS "void"
+        case "none":
+            return VoidType;
+        // TODO Some libraries are bad and don't use g-prefixed numerical types
+        case "uint":
+        case "int":
+        case "uint8":
+        case "int8":
+        case "uint16":
+        case "int16":
+        case "uint32":
+        case "int32":
+        case "int64":
+        case "uint64":
+        case "double":
+        case "long":
+        case "float":
+        // Most libraries will use these though:
+        case "gshort":
+        case "guint32":
+        case "guint16":
+        case "gint16":
+        case "gunichar":
+        case "gint8":
+        case "gint32":
+        case "gushort":
+        case "gfloat":
+        case "gchar":
+        case "guint":
+        case "glong":
+        case "gulong":
+        case "gint":
+        case "guint8":
+        case "guint64":
+        case "gint64":
+        case "gdouble":
+        case "gssize":
+        case "gsize":
+            return NumberType;
+        case "gboolean":
+            return BooleanType;
+        case "gpointer": // This is typically used in callbacks to pass data, so we'll allow anything.
+            return AnyType;
+        case "object":
+            return ObjectType;
+        case "va_list":
+            return AnyType;
+        case "guintptr": // You can't use pointers in GJS! (at least that I'm aware of)
+            return NeverType;
+        case "never": // Support TS "never"
+            return NeverType;
+        case "unknown": // Support TS "unknown"
+            return UnknownType;
+        case "any": // Support TS "any"
+            return AnyType;
+        case "this": // Support TS "this"
+            return ThisType;
+        case "number": // Support TS "number"
+            return NumberType;
+        case "string": // Support TS "string"
+            return StringType;
+        case "boolean": // Support TS "boolean"
+            return BooleanType;
+        case "object": // Support TS "object"
+            return ObjectType;
+    }
+    return null;
+}
+export function resolveDirectedType(type, direction) {
+    if (type instanceof ArrayType) {
+        if ((direction === GirDirection.In || direction === GirDirection.Inout) &&
+            type.type.equals(Uint8ArrayType) &&
+            type.arrayDepth === 0) {
+            return new BinaryType(type, StringType);
+        }
+        else {
+            // Rewrap arrays if they have directional types
+            return type.rewrap(resolveDirectedType(type.type, direction) ?? type.type);
+        }
+    }
+    else if (type instanceof TypeIdentifier) {
+        if ((direction === GirDirection.In || direction === GirDirection.Inout) && type.is("GLib", "Bytes")) {
+            return new BinaryType(type, Uint8ArrayType);
+        }
+        else if (type.is("GObject", "Value")) {
+            if (direction === GirDirection.In || direction === GirDirection.Inout) {
+                return new BinaryType(type, AnyType);
+            }
+            else {
+                // GJS converts GObject.Value out parameters to their unboxed type, which we don't know,
+                // so type as `unknown`
+                return UnknownType;
+            }
+        }
+        else if (type.is("GLib", "HashTable")) {
+            if (direction === GirDirection.In) {
+                return new BinaryType(new NativeType("{ [key: string]: any }"), type);
+            }
+            else {
+                return type;
+            }
+        }
+    }
+    return null;
+}
+/**
+ * Resolves a class identifier.
+ *
+ * If the identifier is a class type it is returned,
+ * otherwise `null`.
+ *
+ * @param namespace
+ * @param type
+ */
+export function resolveTypeIdentifier(namespace, type) {
+    const ns = type.namespace;
+    const name = type.name;
+    const resolved_ns = namespace.assertInstalledImport(ns);
+    const pclass = resolved_ns.getClass(name);
+    if (pclass) {
+        return pclass;
+    }
+    else {
+        return null;
+    }
+}
+/**
+ *
+ * @param a
+ * @param b
+ */
+function isTypeConflict(a, b) {
+    return !a.equals(b) || !b.equals(a);
+}
+/**
+ * Checks if a given type expression in the context of a given this type
+ * is a subtype (compatible with) of another type expression in the context
+ * of a parent type.
+ *
+ * @param namespace
+ * @param thisType
+ * @param parentThisType
+ * @param potentialSubtype
+ * @param parentType
+ */
+export function isSubtypeOf(namespace, thisType, parentThisType, potentialSubtype, parentType) {
+    if (!isTypeConflict(potentialSubtype, parentType)) {
+        return true;
+    }
+    const unwrappedSubtype = potentialSubtype.unwrap();
+    let unwrappedParent = parentType.unwrap();
+    if ((potentialSubtype.equals(ThisType) && unwrappedParent.equals(thisType)) ||
+        (parentType.equals(ThisType) && unwrappedSubtype.equals(parentThisType))) {
+        return true;
+    }
+    if (unwrappedParent instanceof GenericType && unwrappedParent.identifier !== "T") {
+        // Technically there could be a conflicting generic, but most generic types should specify a replacement for type checking.
+        // "T" denotes a local function generic in the current implementation, those can't be ignored.
+        if (!unwrappedParent.replacedType) {
+            return true;
+        }
+        // Use the generic replaced type as a stand-in.
+        unwrappedParent = unwrappedParent.replacedType;
+    }
+    if (!(unwrappedSubtype instanceof TypeIdentifier) || !(unwrappedParent instanceof TypeIdentifier)) {
+        return false;
+    }
+    const resolutions = namespace.parent.subtypes.get(unwrappedSubtype.name, unwrappedSubtype.namespace) ??
+        new TwoKeyMap();
+    const resolution = resolutions.get(unwrappedParent.name, unwrappedParent.namespace);
+    if (typeof resolution === "boolean") {
+        return resolution;
+    }
+    const resolved = resolveTypeIdentifier(namespace, unwrappedSubtype);
+    if (!resolved) {
+        return false;
+    }
+    const parentResolution = resolved.resolveParents();
+    // This checks that the two types have the same form, regardless of identifier (e.g. A | null and B | null)
+    const isStructurallySubtype = potentialSubtype.rewrap(AnyType).equals(parentType.rewrap(AnyType));
+    const isSubtype = isStructurallySubtype &&
+        parentResolution.node.someParent((t) => t.getType().equals(unwrappedParent));
+    resolutions.set(unwrappedParent.name, unwrappedParent.namespace, isSubtype);
+    namespace.parent.subtypes.set(unwrappedSubtype.name, unwrappedSubtype.namespace, resolutions);
+    return isSubtype;
+}
+//# sourceMappingURL=util.js.map

package/lib/gir/util.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"util.js","sourceRoot":"","sources":["../../src/gir/util.ts"],"names":[],"mappings":"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"}

package/lib/gir-factory.d.ts

@@ -1,4 +1,4 @@
-import type { GirFunctionElement, GirDocElement, GirVirtualMethodElement, GirCallableParamElement, GirConstructorElement, GirMethodElement, GirInstanceParameter, GirPropertyElement, GirAnnotation, TsFunction, TsParameter, TsGenericParameter, TsProperty, TsType, TsDoc, InjectionFunction, InjectionInstanceParameter, InjectionGenericParameter, InjectionType, InjectionParameter, InjectionProperty, Environment, TypeGirProperty, TypeGirFunction, TypeGirEnumerationMember, TypeTsEnumerationMember, TypeTsFunction, TypeTsProperty, TsClass } from './types/index.js';
+import type { GirFunctionElement, GirDocElement, GirVirtualMethodElement, GirCallableParamElement, GirConstructorElement, GirMethodElement, GirInstanceParameter, GirPropertyElement, GirAnnotation, TsFunction, TsParameter, TsGenericParameter, TsProperty, TsType, TsDoc, InjectionFunction, InjectionInstanceParameter, InjectionGenericParameter, InjectionType, InjectionParameter, InjectionProperty, TypeGirProperty, TypeGirFunction, TypeGirEnumerationMember, TypeTsEnumerationMember, TypeTsFunction, TypeTsProperty, TsClass } from './types/index.js';
 /**
  * Creates new gir and ts objects
  */
@@ -44,7 +44,7 @@ export declare class GirFactory {
      * @param withDisconnect If `true` this also generates a `disconnect` method
      * @returns
      */
-    newTsSignalMethods(signalName: string | undefined, callbackType: string | undefined, emitInParams: InjectionParameter[], parentClass: TsClass, environment: Environment, withDisconnect?: boolean): TsFunction[];
+    newTsSignalMethods(signalName: string | undefined, callbackType: string | undefined, emitInParams: InjectionParameter[], parentClass: TsClass, withDisconnect?: boolean): TsFunction[];
     newGirAttr(name?: string): (GirConstructorElement & GirFunctionElement & GirMethodElement & GirVirtualMethodElement)['$'];
     newGirAnnotation(data?: Partial<GirAnnotation['$']>): GirAnnotation;
     newGirDocElement(text?: string, filename?: string, line?: string, column?: string): GirDocElement;

package/lib/gir-factory.js

@@ -234,7 +234,7 @@ export class GirFactory {
      * @param withDisconnect If `true` this also generates a `disconnect` method
      * @returns
      */
-    newTsSignalMethods(signalName, callbackType, emitInParams, parentClass, environment, withDisconnect = false) {
+    newTsSignalMethods(signalName, callbackType, emitInParams, parentClass, withDisconnect = false) {
         const tsMethods = [];
         const girTypeName = 'signal';
         const sigNameInParam = {
@@ -277,49 +277,13 @@ export class GirFactory {
             girTypeName,
         }, parentClass);
         tsMethods.push(connectTsFn);
-        if (environment === 'gjs') {
-            const connectAfterTsFn = this.newTsFunction({
-                name: 'connect_after',
-                inParams: [sigNameInParam, callbackInParam],
-                returnTypes: [numberReturnType],
-                girTypeName,
-            }, parentClass);
-            tsMethods.push(connectAfterTsFn);
-        }
-        else if (environment === 'node') {
-            const afterInParam = {
-                name: 'after',
-                type: [
-                    this.newTsType({
-                        type: 'boolean',
-                        optional: true,
-                    }),
-                ],
-                doc: this.newTsDoc(),
-            };
-            const nodeEventEmitterReturnType = this.newTsType({
-                type: 'NodeJS.EventEmitter',
-            });
-            const onTsFn = this.newTsFunction({
-                name: 'on',
-                inParams: [sigNameInParam, callbackInParam, afterInParam],
-                returnTypes: [nodeEventEmitterReturnType],
-                girTypeName,
-            }, parentClass);
-            const onceTsFn = this.newTsFunction({
-                name: 'once',
-                inParams: [sigNameInParam, callbackInParam, afterInParam],
-                returnTypes: [nodeEventEmitterReturnType],
-                girTypeName,
-            }, parentClass);
-            const offTsFn = this.newTsFunction({
-                name: 'off',
-                inParams: [sigNameInParam, callbackInParam],
-                returnTypes: [nodeEventEmitterReturnType],
-                girTypeName,
-            }, parentClass);
-            tsMethods.push(onTsFn, onceTsFn, offTsFn);
-        }
+        const connectAfterTsFn = this.newTsFunction({
+            name: 'connect_after',
+            inParams: [sigNameInParam, callbackInParam],
+            returnTypes: [numberReturnType],
+            girTypeName,
+        }, parentClass);
+        tsMethods.push(connectAfterTsFn);
         const emitTsFn = this.newTsFunction({
             name: 'emit',
             inParams: [sigNameInParam, ...emitInParams],