@girs/gcalc-2 4.4.0 → 4.6.0

package/README.md

@@ -4,82 +4,77 @@
 ![version](https://img.shields.io/npm/v/@girs/gcalc-2)
 ![downloads/week](https://img.shields.io/npm/dw/@girs/gcalc-2)
 
+GJS TypeScript type definitions for GCalc-2 using [ts-for-gir](https://github.com/gjsify/ts-for-gir) v4.6.0.
 
-GJS TypeScript type definitions for GCalc-2 using [ts-for-gir](https://github.com/gjsify/ts-for-gir) v4.4.0.
+This package contains type declarations only. It ships no runtime code, so it adds
+nothing to your program and works with any bundler or none at all.
 
 ## Install
 
-Install the type definitions with npm:
 ```bash
 npm install @girs/gcalc-2
 ```
 
-## Usage
+Any package manager works. The package has no dependencies beyond other `@girs/*`
+type packages.
+
+## What it exports
+
+| Import | What you get |
+|---|---|
+| `@girs/gcalc-2` | the namespace as a default export, plus the ambient and global declarations |
+| `@girs/gcalc-2/ambient` | only the `gi://` module declarations |
+| `@girs/gcalc-2/import` | only the `imports.gi` declarations |
+| `@girs/gcalc-2/gcalc-2` | the namespace, without the side-effecting declarations |
+
+## Three ways to import
+
+Which one you use depends on how you write imports elsewhere, not on your toolchain.
+
+### As a module
 
-Import it like any other module:
 ```ts
 import GCalc from '@girs/gcalc-2';
 ```
 
-### Ambient Modules
+### As `gi://`
 
-[Ambient modules](https://github.com/gjsify/ts-for-gir/tree/main/packages/cli#ambient-modules) let you write the same import you would in plain JavaScript.
-For this you need to include `@girs/gcalc-2` or `@girs/gcalc-2/ambient` in your `tsconfig` or entry point Typescript file:
+GJS resolves `gi://` at runtime. To give it types, reference the package once, either
+from your entry point or from `tsconfig.json`:
 
-`index.ts`:
 ```ts
-import '@girs/gcalc-2'
+import '@girs/gcalc-2';
 ```
 
-`tsconfig.json`:
 ```json
-{
-  "compilerOptions": {
-    ...
-  },
-  "include": ["@girs/gcalc-2"],
-  ...
-}
+{ "include": ["@girs/gcalc-2"] }
 ```
 
-The ambient module now resolves with types:
+Then the runtime spelling type-checks:
 
 ```ts
 import GCalc from 'gi://GCalc?version=2';
 ```
 
-### Global import
-
-GJS's global `imports.gi` works too, with types.
-For this you need to include `@girs/gcalc-2` or `@girs/gcalc-2/import` in your `tsconfig` or entry point Typescript file:
+Referencing `@girs/gcalc-2/ambient` instead pulls in these declarations
+alone. See [ambient modules](https://github.com/gjsify/ts-for-gir/tree/main/packages/cli#ambient-modules).
 
-`index.ts`:
-```ts
-import '@girs/gcalc-2'
-```
-
-`tsconfig.json`:
-```json
-{
-  "compilerOptions": {
-    ...
-  },
-  "include": ["@girs/gcalc-2"],
-  ...
-}
-```
+### As `imports.gi`
 
-That form carries types as well:
+GJS's global object works the same way, via `@girs/gcalc-2/import`:
 
 ```ts
 const GCalc = imports.gi.GCalc;
 ```
 
-### Bundle
+## Building
 
-Most projects want a bundler. [esbuild](https://esbuild.github.io/) is the smallest thing that works; the [examples directory](https://github.com/gjsify/ts-for-gir/tree/main/examples) has setups for several others.
+The declarations need no build step. If you bundle, every bundler works, since there is
+no runtime code to resolve. The [examples](https://github.com/gjsify/ts-for-gir/tree/main/examples)
+show working setups for several.
 
 ## Other packages
 
-All existing pre-generated packages can be found on [gjsify/types](https://github.com/gjsify/types).
+Every pre-generated package is at [gjsify/types](https://github.com/gjsify/types).
+
 

package/gcalc-2.d.ts

@@ -35,9 +35,9 @@ export namespace GCalc {
      * @gir-type Enum
      */
     enum AngleUnit {
-        RADIANS,
-        DEGREES,
-        GRADIANS,
+        RADIANS = 0,
+        DEGREES = 1,
+        GRADIANS = 2,
     }
 
 
@@ -162,48 +162,48 @@ export namespace GCalc {
      * @gir-type Enum
      */
     enum ParserTokenType {
-        NONE,
-        EOF,
-        IDENTIFIER,
-        INTEGER_LITERAL,
-        REAL_LITERAL,
-        STAR,
-        PLUS,
-        DIV,
-        MINUS,
-        ASSIGN,
-        OPEN_PARENS,
-        CLOSE_PARENS,
-        CARRET,
-        CLOSE_BRACE,
-        CLOSE_BRACKET,
-        OPEN_BRACE,
-        OPEN_BRACKET,
-        STRING_LITERAL,
-        OP_AND,
-        OP_COALESCING,
-        OP_DEC,
-        OP_EQ,
-        OP_GE,
-        OP_GT,
-        OP_INC,
-        OP_LE,
-        OP_LT,
-        OP_NE,
-        OP_NEG,
-        OP_OR,
-        OP_PTR,
-        OP_SHIFT_LEFT,
-        SEMICOLON,
-        TILDE,
-        COLON,
-        COMMA,
-        DOUBLE_COLON,
-        DOT,
-        ELLIPSIS,
-        INTERR,
-        HASH,
-        CURRENCY_SYMBOL,
+        NONE = 0,
+        EOF = 1,
+        IDENTIFIER = 2,
+        INTEGER_LITERAL = 3,
+        REAL_LITERAL = 4,
+        STAR = 5,
+        PLUS = 6,
+        DIV = 7,
+        MINUS = 8,
+        ASSIGN = 9,
+        OPEN_PARENS = 10,
+        CLOSE_PARENS = 11,
+        CARRET = 12,
+        CLOSE_BRACE = 13,
+        CLOSE_BRACKET = 14,
+        OPEN_BRACE = 15,
+        OPEN_BRACKET = 16,
+        STRING_LITERAL = 17,
+        OP_AND = 18,
+        OP_COALESCING = 19,
+        OP_DEC = 20,
+        OP_EQ = 21,
+        OP_GE = 22,
+        OP_GT = 23,
+        OP_INC = 24,
+        OP_LE = 25,
+        OP_LT = 26,
+        OP_NE = 27,
+        OP_NEG = 28,
+        OP_OR = 29,
+        OP_PTR = 30,
+        OP_SHIFT_LEFT = 31,
+        SEMICOLON = 32,
+        TILDE = 33,
+        COLON = 34,
+        COMMA = 35,
+        DOUBLE_COLON = 36,
+        DOT = 37,
+        ELLIPSIS = 38,
+        INTERR = 39,
+        HASH = 40,
+        CURRENCY_SYMBOL = 41,
     }
 
 
@@ -218,9 +218,9 @@ export namespace GCalc {
      * @gir-type Enum
      */
     enum MathGroupLevel {
-        ONE,
-        TWO,
-        THREE,
+        ONE = 0,
+        TWO = 1,
+        THREE = 2,
     }
 
 
@@ -267,6 +267,9 @@ export namespace GCalc {
         emit<K extends keyof Assign.SignalSignatures>(signal: K, ...args: GObject.GjsParameters<Assign.SignalSignatures[K]> extends [any, ...infer Q] ? Q : never): void;
         emit(signal: string, ...args: any[]): void;
 
+        /**
+         * @throws GLib.Error
+         */
         evaluate(): MathExpression;
     }
 
@@ -1019,7 +1022,7 @@ export namespace GCalc {
 
     namespace ExpressionContainer {
         // Signal signatures
-        interface SignalSignatures extends Gee.ArrayList.SignalSignatures {
+        interface SignalSignatures extends Gee.ArrayList.SignalSignatures, Gio.ListModel.SignalSignatures {
             "notify::parent": (pspec: GObject.ParamSpec) => void;
             "notify::g-type": (pspec: GObject.ParamSpec) => void;
             "notify::g-dup-func": (pspec: GObject.ParamSpec) => void;
@@ -1373,6 +1376,9 @@ export namespace GCalc {
         vfunc_evaluate(): MathExpression;
 
         // Methods
+        /**
+         * @throws GLib.Error
+         */
         evaluate(): MathExpression;
 
         /**
@@ -1403,6 +1409,9 @@ export namespace GCalc {
         get closed(): boolean;
         set closed(val: boolean);
 
+        /**
+         * @throws GLib.Error
+         */
         verify_params(): boolean;
 
         get_param_types(): ExpressionContainer;
@@ -2209,6 +2218,9 @@ export namespace GCalc {
         get closed(): boolean;
         set closed(val: boolean);
 
+        /**
+         * @throws GLib.Error
+         */
         evaluate(): MathExpression;
 
         get_level(): MathGroupLevel;
@@ -2392,6 +2404,7 @@ export namespace GCalc {
 
         /**
          * @param val 
+         * @throws GLib.Error
          */
         set_value(val: GObject.Value | any | null): void;
 
@@ -2483,6 +2496,7 @@ export namespace GCalc {
         /**
          * @param str 
          * @param eqman 
+         * @throws GLib.Error
          */
         parse(str: string, eqman: MathEquationManager): void;
 
@@ -2580,6 +2594,9 @@ export namespace GCalc {
         emit<K extends keyof Polynomial.SignalSignatures>(signal: K, ...args: GObject.GjsParameters<Polynomial.SignalSignatures[K]> extends [any, ...infer Q] ? Q : never): void;
         emit(signal: string, ...args: any[]): void;
 
+        /**
+         * @throws GLib.Error
+         */
         evaluate(): MathExpression;
 
         /**
@@ -2759,11 +2776,13 @@ export namespace GCalc {
         // Methods
         /**
          * @param exp 
+         * @throws GLib.Error
          */
         add_expression(exp: string): void;
 
         /**
          * @param str 
+         * @throws GLib.Error
          */
         solve(str: string): MathResult;
 
@@ -2821,9 +2840,13 @@ export namespace GCalc {
 
         /**
          * @param t 
+         * @throws GLib.Error
          */
         add(t: MathTerm): MathExpression;
 
+        /**
+         * @throws GLib.Error
+         */
         evaluate(): MathExpression;
 
         /**
@@ -2949,6 +2972,9 @@ export namespace GCalc {
         get bind(): MathVariable;
         set bind(val: MathVariable);
 
+        /**
+         * @throws GLib.Error
+         */
         evaluate(): MathExpression;
 
         get_name(): string;
@@ -3719,6 +3745,9 @@ export namespace GCalc {
     interface MathAssign extends GObject.Object {
 
         // Methods
+        /**
+         * @throws GLib.Error
+         */
         evaluate(): MathExpression;
     }
 
@@ -4349,8 +4378,14 @@ export namespace GCalc {
         set closed(val: boolean);
 
         // Methods
+        /**
+         * @throws GLib.Error
+         */
         evaluate(): MathExpression;
 
+        /**
+         * @throws GLib.Error
+         */
         verify_params(): boolean;
 
         get_param_types(): ExpressionContainer;
@@ -4443,6 +4478,9 @@ export namespace GCalc {
         set closed(val: boolean);
 
         // Methods
+        /**
+         * @throws GLib.Error
+         */
         evaluate(): MathExpression;
 
         get_level(): MathGroupLevel;
@@ -4565,6 +4603,7 @@ export namespace GCalc {
         // Methods
         /**
          * @param val 
+         * @throws GLib.Error
          */
         set_value(val: GObject.Value | any | null): void;
 
@@ -4626,6 +4665,9 @@ export namespace GCalc {
     interface MathPolynomial extends GObject.Object, MathPolynomial.Interface {
 
         // Methods
+        /**
+         * @throws GLib.Error
+         */
         evaluate(): MathExpression;
     }
 
@@ -4750,9 +4792,13 @@ export namespace GCalc {
         // Methods
         /**
          * @param t 
+         * @throws GLib.Error
          */
         add(t: MathTerm): MathExpression;
 
+        /**
+         * @throws GLib.Error
+         */
         evaluate(): MathExpression;
     }
 
@@ -4842,6 +4888,9 @@ export namespace GCalc {
         set bind(val: MathVariable);
 
         // Methods
+        /**
+         * @throws GLib.Error
+         */
         evaluate(): MathExpression;
 
         get_name(): string;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@girs/gcalc-2",
-    "version": "4.4.0",
+    "version": "4.6.0",
     "description": "GJS TypeScript type definitions for GCalc-2",
     "type": "module",
     "module": "gcalc-2.js",
@@ -31,12 +31,12 @@
       "test": "tsc --project tsconfig.json"
     },
     "dependencies": {
-      "@girs/gjs": "^4.4.0",
-      "@girs/gio-2.0": "^4.4.0",
-      "@girs/gobject-2.0": "^4.4.0",
-      "@girs/glib-2.0": "^4.4.0",
-      "@girs/gmodule-2.0": "^4.4.0",
-      "@girs/gee-0.8": "^4.4.0"    },
+      "@girs/gjs": "^4.6.0",
+      "@girs/gio-2.0": "^4.6.0",
+      "@girs/gobject-2.0": "^4.6.0",
+      "@girs/glib-2.0": "^4.6.0",
+      "@girs/gmodule-2.0": "^4.6.0",
+      "@girs/gee-0.8": "^4.6.0"    },
     "devDependencies": {
       "typescript": "*"
     },