@ts-for-gir/lib 3.2.7 → 3.2.9

package/lib/dependency-manager.d.ts

@@ -27,6 +27,7 @@ export declare class DependencyManager {
      * @returns All dependencies in the cache
      */
     all(): Dependency[];
+    getAllPackageNames(): string[];
     /**
      * Get the core dependencies
      * @returns
@@ -51,6 +52,12 @@ export declare class DependencyManager {
      * @returns The dependency object
      */
     get(namespace: string, version: string): Dependency;
+    /**
+     * Get all dependencies with the given namespace
+     * @param namespace The namespace of the dependency
+     * @returns All dependencies with the given namespace
+     */
+    list(namespace: string): Dependency[];
     /**
      * Get girModule for dependency
      * @param girModules
@@ -68,13 +75,18 @@ export declare class DependencyManager {
      * @returns Array of dependencies
      */
     fromGirIncludes(girIncludes: GirInclude[]): Dependency[];
-    getAllPackageNames(): string[];
     /**
      * Check if multiple dependencies with the given namespace exist in the cache
      * @param namespace The namespace of the dependency
      * @returns
      */
     hasConflict(namespace: string): boolean;
+    /**
+     * get the latest version of the dependency with the given namespace
+     * @param namespace The namespace of the dependency
+     * @returns The latest version of the dependency
+     */
+    getLatestVersion(namespace: string): Dependency | undefined;
     /**
      * Check if the given version is the latest version of the dependency
      * @param namespace The namespace of the dependency

package/lib/dependency-manager.js

@@ -44,6 +44,9 @@ export class DependencyManager {
     all() {
         return Object.values(this.cache);
     }
+    getAllPackageNames() {
+        return Object.keys(this.cache);
+    }
     /**
      * Get the core dependencies
      * @returns
@@ -100,6 +103,18 @@ export class DependencyManager {
         this.cache[packageName] = dependency;
         return dependency;
     }
+    /**
+     * Get all dependencies with the given namespace
+     * @param namespace The namespace of the dependency
+     * @returns All dependencies with the given namespace
+     */
+    list(namespace) {
+        const packageNames = this.all();
+        const candidates = packageNames.filter((dep) => {
+            return dep.namespace === namespace;
+        });
+        return candidates;
+    }
     /**
      * Get girModule for dependency
      * @param girModules
@@ -130,9 +145,6 @@ export class DependencyManager {
         }
         return dependencies;
     }
-    getAllPackageNames() {
-        return Object.keys(this.cache);
-    }
     /**
      * Check if multiple dependencies with the given namespace exist in the cache
      * @param namespace The namespace of the dependency
@@ -145,6 +157,20 @@ export class DependencyManager {
         });
         return candidates.length > 1;
     }
+    /**
+     * get the latest version of the dependency with the given namespace
+     * @param namespace The namespace of the dependency
+     * @returns The latest version of the dependency
+     */
+    getLatestVersion(namespace) {
+        const candidates = this.list(namespace);
+        const latestVersion = candidates
+            .sort((a, b) => {
+            return a.version.localeCompare(b.version);
+        })
+            .pop();
+        return latestVersion;
+    }
     /**
      * Check if the given version is the latest version of the dependency
      * @param namespace The namespace of the dependency
@@ -152,11 +178,7 @@ export class DependencyManager {
      * @returns
      */
     isLatestVersion(namespace, version) {
-        const hasConflict = this.hasConflict(namespace);
-        if (!hasConflict) {
-            return true;
-        }
-        const latestVersion = this.find(namespace);
+        const latestVersion = this.getLatestVersion(namespace);
         return latestVersion?.version === version;
     }
     /**

package/lib/dependency-manager.js.map

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

package/lib/gir-module.d.ts

@@ -209,7 +209,7 @@ export declare class GirModule {
      * @param girProperty
      * @returns
      */
-    private clonePropertyForLowerCamelCase;
+    private clonePropertyForUnderscores;
     private getClassPropertiesTsData;
     private getClassNonStaticPropertyNames;
     private getClassConstructorsTsData;

package/lib/gir-module.js

@@ -7,7 +7,7 @@ import { GirFactory } from './gir-factory.js';
 import { ConflictResolver } from './conflict-resolver.js';
 import { DependencyManager } from './dependency-manager.js';
 import { NO_TSDATA, WARN_NOT_FOUND_TYPE, WARN_CONSTANT_ALREADY_EXPORTED, WARN_DUPLICATE_SYMBOL, WARN_DUPLICATE_PARAMETER, WARN_DUPLICATE_ENUM_IDENTIFIER, } from './messages.js';
-import { isEqual, find, clone, girBool, removeNamespace, addNamespace, girElementIsIntrospectable, lowerCamelCase, } from './utils.js';
+import { isEqual, find, clone, girBool, removeNamespace, addNamespace, girElementIsIntrospectable, underscores, } from './utils.js';
 import { SymTable } from './symtable.js';
 import { LibraryVersion } from './library-version.js';
 import { GirDirection } from './types/index.js';
@@ -717,16 +717,21 @@ export class GirModule {
             return girVar._tsData;
         }
         let name = girVar.$.name;
-        switch (girTypeName) {
-            case 'property':
-                name = this.transformation.transformPropertyName(girVar.$.name, allowQuotes);
-                break;
-            case 'constant':
-                name = this.transformation.transformConstantName(girVar.$.name, allowQuotes);
-                break;
-            case 'field':
-                name = this.transformation.transformFieldName(girVar.$.name, allowQuotes);
-                break;
+        if (tsTypeName === 'constructor-property') {
+            name = this.transformation.transformConstructorPropertyName(girVar.$.name, allowQuotes);
+        }
+        else {
+            switch (girTypeName) {
+                case 'property':
+                    name = this.transformation.transformPropertyName(girVar.$.name, allowQuotes);
+                    break;
+                case 'constant':
+                    name = this.transformation.transformConstantName(girVar.$.name, allowQuotes);
+                    break;
+                case 'field':
+                    name = this.transformation.transformFieldName(girVar.$.name, allowQuotes);
+                    break;
+            }
         }
         // Use the out type because it can be a union which isn't appropriate
         // for a property
@@ -1213,6 +1218,8 @@ export class GirModule {
         }
         return tsData;
     }
+    // FIXME: https://github.com/gjsify/ts-for-gir/issues/145
+    // FIXME: https://github.com/gjsify/ts-for-gir/issues/131
     getClassConstructPropsTsData(girClass, constructPropNames) {
         const constructProps = [];
         const girProperties = girClass.property;
@@ -1240,12 +1247,12 @@ export class GirModule {
                 this.symTable.set(this.allDependencies, girConstrProp._fullSymName, girConstrProp);
             }
             constructProps.push(girConstrProp);
-            // Add a new property with the name in upper camel case, see https://github.com/gjsify/ts-for-gir/issues/138
-            const lowerCamelCaseProperty = this.clonePropertyForLowerCamelCase(girConstrProp);
-            if (lowerCamelCaseProperty && lowerCamelCaseProperty._fullSymName) {
-                girProperties.push(lowerCamelCaseProperty);
-                this.symTable.set(this.allDependencies, lowerCamelCaseProperty._fullSymName, lowerCamelCaseProperty);
-            }
+            // Clone property with the name in underscores, see https://github.com/gjsify/ts-for-gir/issues/138
+            // const underscoresProperty = this.clonePropertyForUnderscores(girConstrProp)
+            // if (underscoresProperty && underscoresProperty._fullSymName) {
+            //     girProperties.push(underscoresProperty)
+            //     this.symTable.set(this.allDependencies, underscoresProperty._fullSymName, underscoresProperty)
+            // }
         }
         return constructProps;
     }
@@ -1402,7 +1409,7 @@ export class GirModule {
      * @param girProperty
      * @returns
      */
-    clonePropertyForLowerCamelCase(girProperty) {
+    clonePropertyForUnderscores(girProperty) {
         // Only for GJS
         if (this.config.environment === 'node') {
             return undefined;
@@ -1411,9 +1418,9 @@ export class GirModule {
         if (!propertyName) {
             return undefined;
         }
-        const lowerCamelCasePropertyName = lowerCamelCase(propertyName);
+        const underscoresPropertyName = underscores(propertyName);
         // Nothing has changed
-        if (lowerCamelCasePropertyName === propertyName) {
+        if (underscoresPropertyName === propertyName) {
             return undefined;
         }
         const upperCamelCaseGirProperty = clone(girProperty);
@@ -1421,8 +1428,8 @@ export class GirModule {
         if (!upperCamelCaseGirProperty._tsData) {
             return undefined;
         }
-        upperCamelCaseGirProperty._tsData.name = lowerCamelCasePropertyName;
-        upperCamelCaseGirProperty._fullSymName = upperCamelCaseGirProperty._fullSymName?.replace(propertyName, lowerCamelCasePropertyName);
+        upperCamelCaseGirProperty._tsData.name = underscoresPropertyName;
+        upperCamelCaseGirProperty._fullSymName = upperCamelCaseGirProperty._fullSymName?.replace(propertyName, underscoresPropertyName);
         return upperCamelCaseGirProperty;
     }
     getClassPropertiesTsData(girClass, localNames) {
@@ -1444,19 +1451,23 @@ export class GirModule {
                         girProperties.push(localName.property);
                     }
                 }
-                // Add a new property with the name in upper camel case, see https://github.com/gjsify/ts-for-gir/issues/138
-                {
-                    const lowerCamelCaseProperty = this.clonePropertyForLowerCamelCase(girProperty);
-                    if (lowerCamelCaseProperty) {
-                        const localName = this.checkOrSetLocalName(lowerCamelCaseProperty, localNames, 'property');
-                        if (localName?.added && localName.property) {
-                            if (lowerCamelCaseProperty._fullSymName) {
-                                this.symTable.set(this.allDependencies, lowerCamelCaseProperty._fullSymName, lowerCamelCaseProperty);
-                            }
-                            girProperties.push(localName.property);
-                        }
-                    }
-                }
+                // Add a new property with the name in lower camel case, see https://github.com/gjsify/ts-for-gir/issues/138
+                // {
+                //     const underscoresProperty = this.clonePropertyForUnderscores(girProperty)
+                //     if (underscoresProperty) {
+                //         const localName = this.checkOrSetLocalName(underscoresProperty, localNames, 'property')
+                //         if (localName?.added && localName.property) {
+                //             if (underscoresProperty._fullSymName) {
+                //                 this.symTable.set(
+                //                     this.allDependencies,
+                //                     underscoresProperty._fullSymName,
+                //                     underscoresProperty,
+                //                 )
+                //             }
+                //             girProperties.push(localName.property)
+                //         }
+                //     }
+                // }
             }
         }
         return girProperties;