@gtkx/codegen 1.5.0 → 1.6.0

package/dist/writer/context.d.ts

@@ -1,18 +1,35 @@
 import type { Library } from "../gir/library.js";
 import type { GirNamespace } from "../gir/namespace.js";
 import { type Declaration, ModuleBuilder } from "./module.js";
+type BootstrapCallOptions = {
+    moduleExports?: string[];
+    runtimeImports?: string[];
+};
 declare class ModuleContext {
+    private registrationSink;
+    private readonly hoistedBases;
     module: ModuleBuilder;
     namespace: GirNamespace;
     library: Library;
+    dependencies: Set<string>;
+    externalDependencies: Set<string>;
+    bootstrapCalls: string[];
+    bootstrapModuleExports: Set<string>;
+    bootstrapRuntimeImports: Set<string>;
     constructor(namespace: GirNamespace, library: Library);
+    get isTreeShaken(): boolean;
     addRuntimeImport(name: string): void;
     addRuntimeTypeImport(name: string): void;
     hoistDescriptor(expression: string): string;
+    beginRegistrations(): void;
+    takeRegistrations(): string[];
+    collectRegistration(code: string, requires?: string[]): void;
+    addBootstrapCall(code: string, options?: BootstrapCallOptions): void;
     addGObjectBootstrapImports(): void;
     addCrossNamespaceImport(namespaceName: string): string;
     declare(declaration: Declaration): void;
     qualify(namespaceName: string, name: string): string;
+    hoistBaseRef(expression: string): string;
 }
 export { ModuleContext };
 //# sourceMappingURL=context.d.ts.map

package/dist/writer/context.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../src/writer/context.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAExD,OAAO,EAAE,KAAK,WAAW,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE9D,cAAM,aAAa;IACR,MAAM,EAAE,aAAa,CAAuB;IAC5C,SAAS,EAAE,YAAY,CAAC;IACxB,OAAO,EAAE,OAAO,CAAC;gBAEZ,SAAS,EAAE,YAAY,EAAE,OAAO,EAAE,OAAO;IAKrD,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAIpC,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAIxC,eAAe,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM;IAI3C,0BAA0B,IAAI,IAAI;IAclC,uBAAuB,CAAC,aAAa,EAAE,MAAM,GAAG,MAAM;IA2BtD,OAAO,CAAC,WAAW,EAAE,WAAW,GAAG,IAAI;IAUvC,OAAO,CAAC,aAAa,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM;CAOvD;AAED,OAAO,EAAE,aAAa,EAAE,CAAC"}
+{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../src/writer/context.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAExD,OAAO,EAAE,KAAK,WAAW,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE9D,KAAK,oBAAoB,GAAG;IACxB,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;CAC7B,CAAC;AA0BF,cAAM,aAAa;IACf,OAAO,CAAC,gBAAgB,CAAuB;IAC/C,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAkC;IACxD,MAAM,EAAE,aAAa,CAAuB;IAC5C,SAAS,EAAE,YAAY,CAAC;IACxB,OAAO,EAAE,OAAO,CAAC;IACjB,YAAY,EAAE,GAAG,CAAC,MAAM,CAAC,CAAa;IACtC,oBAAoB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAa;IAC9C,cAAc,EAAE,MAAM,EAAE,CAAM;IAC9B,sBAAsB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAa;IAChD,uBAAuB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAa;gBAE5C,SAAS,EAAE,YAAY,EAAE,OAAO,EAAE,OAAO;IAKrD,IAAI,YAAY,IAAI,OAAO,CAE1B;IAED,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAIpC,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAIxC,eAAe,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM;IAI3C,kBAAkB,IAAI,IAAI;IAI1B,iBAAiB,IAAI,MAAM,EAAE;IAO7B,mBAAmB,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,GAAE,MAAM,EAAO,GAAG,IAAI;IAUhE,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,GAAE,oBAAyB,GAAG,IAAI;IAexE,0BAA0B,IAAI,IAAI;IAkBlC,uBAAuB,CAAC,aAAa,EAAE,MAAM,GAAG,MAAM;IAgBtD,OAAO,CAAC,WAAW,EAAE,WAAW,GAAG,IAAI;IAWvC,OAAO,CAAC,aAAa,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM;IAQpD,YAAY,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM;CAsB3C;AAED,OAAO,EAAE,aAAa,EAAE,CAAC"}

package/dist/writer/context.js

@@ -1,13 +1,44 @@
 import { externalPackageFor } from "../gir/external-namespaces.js";
 import { ModuleBuilder } from "./module.js";
+const addExternalNamespaceImport = (context, packageName, namespaceName) => {
+    if (context.isTreeShaken) {
+        context.externalDependencies.add(packageName);
+    }
+    else {
+        context.module.imports.addSideEffect(packageName);
+    }
+    context.module.imports.addNamespace(packageName, namespaceName);
+};
+const addInternalNamespaceImport = (context, namespaceName) => {
+    const directory = namespaceName.toLowerCase();
+    const isFoundational = directory === "gobject" || directory === "glib";
+    const path = isFoundational ? `../${directory}/${directory}.js` : `../${directory}/index.js`;
+    if (context.isTreeShaken) {
+        context.dependencies.add(directory);
+    }
+    else if (!isFoundational) {
+        context.module.imports.addSideEffect(path);
+    }
+    context.module.imports.addNamespace(path, namespaceName);
+};
 class ModuleContext {
+    registrationSink;
+    hoistedBases = new Map();
     module = new ModuleBuilder();
     namespace;
     library;
+    dependencies = new Set();
+    externalDependencies = new Set();
+    bootstrapCalls = [];
+    bootstrapModuleExports = new Set();
+    bootstrapRuntimeImports = new Set();
     constructor(namespace, library) {
         this.namespace = namespace;
         this.library = library;
     }
+    get isTreeShaken() {
+        return this.library.isTreeShaken;
+    }
     addRuntimeImport(name) {
         this.module.imports.addNamed("@gtkx/runtime", name);
     }
@@ -17,7 +48,36 @@ class ModuleContext {
     hoistDescriptor(expression) {
         return this.module.hoistDescriptor(expression);
     }
+    beginRegistrations() {
+        this.registrationSink = [];
+    }
+    takeRegistrations() {
+        const collected = this.registrationSink ?? [];
+        this.registrationSink = undefined;
+        return collected;
+    }
+    collectRegistration(code, requires = []) {
+        if (this.registrationSink === undefined) {
+            this.module.appendRegistration(code, requires);
+            return;
+        }
+        this.registrationSink.push(code);
+    }
+    addBootstrapCall(code, options = {}) {
+        const moduleExports = options.moduleExports ?? [];
+        const runtimeImports = options.runtimeImports ?? [];
+        for (const name of moduleExports) {
+            this.bootstrapModuleExports.add(name);
+        }
+        for (const name of runtimeImports) {
+            this.bootstrapRuntimeImports.add(name);
+        }
+        this.bootstrapCalls.push(code);
+    }
     addGObjectBootstrapImports() {
+        if (this.isTreeShaken) {
+            return;
+        }
         if (this.namespace.name === "GObject") {
             return;
         }
@@ -33,26 +93,21 @@ class ModuleContext {
             return namespaceName;
         }
         const packageName = externalPackageFor(namespaceName);
-        if (packageName !== undefined) {
-            this.module.imports.addSideEffect(packageName);
-            this.module.imports.addNamespace(packageName, namespaceName);
-            return namespaceName;
+        if (packageName === undefined) {
+            addInternalNamespaceImport(this, namespaceName);
         }
-        const directory = namespaceName.toLowerCase();
-        const isFoundational = directory === "gobject" || directory === "glib";
-        const path = isFoundational ? `../${directory}/${directory}.js` : `../${directory}/index.js`;
-        if (!isFoundational) {
-            this.module.imports.addSideEffect(path);
+        else {
+            addExternalNamespaceImport(this, packageName, namespaceName);
         }
-        this.module.imports.addNamespace(path, namespaceName);
         return namespaceName;
     }
     declare(declaration) {
-        const { name, code, owner } = declaration;
+        const { name, code, owner, isLocal } = declaration;
         this.module.appendDeclaration({
             name,
             code,
             owner: owner === undefined ? undefined : `${this.namespace.name}.${owner}`,
+            isLocal,
         });
     }
     qualify(namespaceName, name) {
@@ -61,6 +116,23 @@ class ModuleContext {
         }
         return `${this.addCrossNamespaceImport(namespaceName)}.${name}`;
     }
+    hoistBaseRef(expression) {
+        if (!expression.includes(".")) {
+            return expression;
+        }
+        const existing = this.hoistedBases.get(expression);
+        if (existing !== undefined) {
+            return existing;
+        }
+        const local = `_${expression.replaceAll(".", "_")}`;
+        this.hoistedBases.set(expression, local);
+        this.module.appendDeclaration({
+            name: local,
+            code: `const ${local}: typeof ${expression} = ${expression};`,
+            isLocal: true,
+        });
+        return local;
+    }
 }
 export { ModuleContext };
 //# sourceMappingURL=context.js.map

package/dist/writer/context.js.map

@@ -1 +1 @@
-{"version":3,"file":"context.js","sourceRoot":"","sources":["../../src/writer/context.ts"],"names":[],"mappings":"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","sourcesContent":["import type { Library } from \"../gir/library.js\";\nimport type { GirNamespace } from \"../gir/namespace.js\";\nimport { externalPackageFor } from \"../gir/external-namespaces.js\";\nimport { type Declaration, ModuleBuilder } from \"./module.js\";\n\nclass ModuleContext {\n    public module: ModuleBuilder = new ModuleBuilder();\n    public namespace: GirNamespace;\n    public library: Library;\n\n    constructor(namespace: GirNamespace, library: Library) {\n        this.namespace = namespace;\n        this.library = library;\n    }\n\n    addRuntimeImport(name: string): void {\n        this.module.imports.addNamed(\"@gtkx/runtime\", name);\n    }\n\n    addRuntimeTypeImport(name: string): void {\n        this.module.imports.addNamed(\"@gtkx/runtime\", name, true);\n    }\n\n    hoistDescriptor(expression: string): string {\n        return this.module.hoistDescriptor(expression);\n    }\n\n    addGObjectBootstrapImports(): void {\n        if (this.namespace.name === \"GObject\") {\n            return;\n        }\n\n        if (this.namespace.name === \"GLib\") {\n            return;\n        }\n\n        this.module.imports.addSideEffect(\"../gobject/overrides/object.js\");\n        this.module.imports.addSideEffect(\"../gobject/overrides/param-spec-getters.js\");\n        this.module.imports.addSideEffect(\"../gobject/overrides/value.js\");\n    }\n\n    addCrossNamespaceImport(namespaceName: string): string {\n        if (namespaceName === this.namespace.name) {\n            return namespaceName;\n        }\n\n        const packageName = externalPackageFor(namespaceName);\n\n        if (packageName !== undefined) {\n            this.module.imports.addSideEffect(packageName);\n            this.module.imports.addNamespace(packageName, namespaceName);\n\n            return namespaceName;\n        }\n\n        const directory = namespaceName.toLowerCase();\n        const isFoundational = directory === \"gobject\" || directory === \"glib\";\n        const path = isFoundational ? `../${directory}/${directory}.js` : `../${directory}/index.js`;\n\n        if (!isFoundational) {\n            this.module.imports.addSideEffect(path);\n        }\n\n        this.module.imports.addNamespace(path, namespaceName);\n\n        return namespaceName;\n    }\n\n    declare(declaration: Declaration): void {\n        const { name, code, owner } = declaration;\n\n        this.module.appendDeclaration({\n            name,\n            code,\n            owner: owner === undefined ? undefined : `${this.namespace.name}.${owner}`,\n        });\n    }\n\n    qualify(namespaceName: string, name: string): string {\n        if (namespaceName === this.namespace.name) {\n            return name;\n        }\n\n        return `${this.addCrossNamespaceImport(namespaceName)}.${name}`;\n    }\n}\n\nexport { ModuleContext };\n"]}
+{"version":3,"file":"context.js","sourceRoot":"","sources":["../../src/writer/context.ts"],"names":[],"mappings":"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","sourcesContent":["import type { Library } from \"../gir/library.js\";\nimport type { GirNamespace } from \"../gir/namespace.js\";\nimport { externalPackageFor } from \"../gir/external-namespaces.js\";\nimport { type Declaration, ModuleBuilder } from \"./module.js\";\n\ntype BootstrapCallOptions = {\n    moduleExports?: string[];\n    runtimeImports?: string[];\n};\n\nconst addExternalNamespaceImport = (context: ModuleContext, packageName: string, namespaceName: string): void => {\n    if (context.isTreeShaken) {\n        context.externalDependencies.add(packageName);\n    } else {\n        context.module.imports.addSideEffect(packageName);\n    }\n\n    context.module.imports.addNamespace(packageName, namespaceName);\n};\n\nconst addInternalNamespaceImport = (context: ModuleContext, namespaceName: string): void => {\n    const directory = namespaceName.toLowerCase();\n    const isFoundational = directory === \"gobject\" || directory === \"glib\";\n    const path = isFoundational ? `../${directory}/${directory}.js` : `../${directory}/index.js`;\n\n    if (context.isTreeShaken) {\n        context.dependencies.add(directory);\n    } else if (!isFoundational) {\n        context.module.imports.addSideEffect(path);\n    }\n\n    context.module.imports.addNamespace(path, namespaceName);\n};\n\nclass ModuleContext {\n    private registrationSink: string[] | undefined;\n    private readonly hoistedBases: Map<string, string> = new Map();\n    public module: ModuleBuilder = new ModuleBuilder();\n    public namespace: GirNamespace;\n    public library: Library;\n    public dependencies: Set<string> = new Set();\n    public externalDependencies: Set<string> = new Set();\n    public bootstrapCalls: string[] = [];\n    public bootstrapModuleExports: Set<string> = new Set();\n    public bootstrapRuntimeImports: Set<string> = new Set();\n\n    constructor(namespace: GirNamespace, library: Library) {\n        this.namespace = namespace;\n        this.library = library;\n    }\n\n    get isTreeShaken(): boolean {\n        return this.library.isTreeShaken;\n    }\n\n    addRuntimeImport(name: string): void {\n        this.module.imports.addNamed(\"@gtkx/runtime\", name);\n    }\n\n    addRuntimeTypeImport(name: string): void {\n        this.module.imports.addNamed(\"@gtkx/runtime\", name, true);\n    }\n\n    hoistDescriptor(expression: string): string {\n        return this.module.hoistDescriptor(expression);\n    }\n\n    beginRegistrations(): void {\n        this.registrationSink = [];\n    }\n\n    takeRegistrations(): string[] {\n        const collected = this.registrationSink ?? [];\n        this.registrationSink = undefined;\n\n        return collected;\n    }\n\n    collectRegistration(code: string, requires: string[] = []): void {\n        if (this.registrationSink === undefined) {\n            this.module.appendRegistration(code, requires);\n\n            return;\n        }\n\n        this.registrationSink.push(code);\n    }\n\n    addBootstrapCall(code: string, options: BootstrapCallOptions = {}): void {\n        const moduleExports = options.moduleExports ?? [];\n        const runtimeImports = options.runtimeImports ?? [];\n\n        for (const name of moduleExports) {\n            this.bootstrapModuleExports.add(name);\n        }\n\n        for (const name of runtimeImports) {\n            this.bootstrapRuntimeImports.add(name);\n        }\n\n        this.bootstrapCalls.push(code);\n    }\n\n    addGObjectBootstrapImports(): void {\n        if (this.isTreeShaken) {\n            return;\n        }\n\n        if (this.namespace.name === \"GObject\") {\n            return;\n        }\n\n        if (this.namespace.name === \"GLib\") {\n            return;\n        }\n\n        this.module.imports.addSideEffect(\"../gobject/overrides/object.js\");\n        this.module.imports.addSideEffect(\"../gobject/overrides/param-spec-getters.js\");\n        this.module.imports.addSideEffect(\"../gobject/overrides/value.js\");\n    }\n\n    addCrossNamespaceImport(namespaceName: string): string {\n        if (namespaceName === this.namespace.name) {\n            return namespaceName;\n        }\n\n        const packageName = externalPackageFor(namespaceName);\n\n        if (packageName === undefined) {\n            addInternalNamespaceImport(this, namespaceName);\n        } else {\n            addExternalNamespaceImport(this, packageName, namespaceName);\n        }\n\n        return namespaceName;\n    }\n\n    declare(declaration: Declaration): void {\n        const { name, code, owner, isLocal } = declaration;\n\n        this.module.appendDeclaration({\n            name,\n            code,\n            owner: owner === undefined ? undefined : `${this.namespace.name}.${owner}`,\n            isLocal,\n        });\n    }\n\n    qualify(namespaceName: string, name: string): string {\n        if (namespaceName === this.namespace.name) {\n            return name;\n        }\n\n        return `${this.addCrossNamespaceImport(namespaceName)}.${name}`;\n    }\n\n    hoistBaseRef(expression: string): string {\n        if (!expression.includes(\".\")) {\n            return expression;\n        }\n\n        const existing = this.hoistedBases.get(expression);\n\n        if (existing !== undefined) {\n            return existing;\n        }\n\n        const local = `_${expression.replaceAll(\".\", \"_\")}`;\n        this.hoistedBases.set(expression, local);\n\n        this.module.appendDeclaration({\n            name: local,\n            code: `const ${local}: typeof ${expression} = ${expression};`,\n            isLocal: true,\n        });\n\n        return local;\n    }\n}\n\nexport { ModuleContext };\n"]}

package/dist/writer/emit.d.ts

@@ -5,5 +5,6 @@ declare const renderBracedOrEmpty: (head: string, body: string) => string;
 declare const indentMembers: (members: string[]) => string;
 declare const joinArgs: (parts: (string | undefined)[]) => string;
 declare const arrayLiteral: (elements: string[]) => string;
-export { indent, renderBlock, renderBraced, renderBracedOrEmpty, indentMembers, joinArgs, arrayLiteral };
+declare const pure: (expression: string) => string;
+export { indent, renderBlock, renderBraced, renderBracedOrEmpty, indentMembers, joinArgs, arrayLiteral, pure };
 //# sourceMappingURL=emit.d.ts.map

package/dist/writer/emit.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"emit.d.ts","sourceRoot":"","sources":["../../src/writer/emit.ts"],"names":[],"mappings":"AAAA,QAAA,MAAM,MAAM,GAAI,OAAO,MAAM,EAAE,OAAO,MAAM,KAAG,MAW9C,CAAC;AAEF,QAAA,MAAM,WAAW,GAAI,MAAM,MAAM,EAAE,MAAM,MAAM,KAAG,MAA4C,CAAC;AAC/F,QAAA,MAAM,YAAY,GAAI,MAAM,MAAM,KAAG,MAAoC,CAAC;AAE1E,QAAA,MAAM,mBAAmB,GAAI,MAAM,MAAM,EAAE,MAAM,MAAM,KAAG,MACI,CAAC;AAE/D,QAAA,MAAM,aAAa,GAAI,SAAS,MAAM,EAAE,KAAG,MAAiE,CAAC;AAE7G,QAAA,MAAM,QAAQ,GAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,EAAE,KAAG,MACuB,CAAC;AAE1E,QAAA,MAAM,YAAY,GAAI,UAAU,MAAM,EAAE,KAAG,MAQ1C,CAAC;AAEF,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,YAAY,EAAE,mBAAmB,EAAE,aAAa,EAAE,QAAQ,EAAE,YAAY,EAAE,CAAC"}
+{"version":3,"file":"emit.d.ts","sourceRoot":"","sources":["../../src/writer/emit.ts"],"names":[],"mappings":"AAAA,QAAA,MAAM,MAAM,GAAI,OAAO,MAAM,EAAE,OAAO,MAAM,KAAG,MAW9C,CAAC;AAEF,QAAA,MAAM,WAAW,GAAI,MAAM,MAAM,EAAE,MAAM,MAAM,KAAG,MAA4C,CAAC;AAC/F,QAAA,MAAM,YAAY,GAAI,MAAM,MAAM,KAAG,MAAoC,CAAC;AAE1E,QAAA,MAAM,mBAAmB,GAAI,MAAM,MAAM,EAAE,MAAM,MAAM,KAAG,MACI,CAAC;AAE/D,QAAA,MAAM,aAAa,GAAI,SAAS,MAAM,EAAE,KAAG,MAAiE,CAAC;AAE7G,QAAA,MAAM,QAAQ,GAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,EAAE,KAAG,MACuB,CAAC;AAE1E,QAAA,MAAM,YAAY,GAAI,UAAU,MAAM,EAAE,KAAG,MAQ1C,CAAC;AAEF,QAAA,MAAM,IAAI,GAAI,YAAY,MAAM,KAAG,MAAyC,CAAC;AAE7E,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,YAAY,EAAE,mBAAmB,EAAE,aAAa,EAAE,QAAQ,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC"}

package/dist/writer/emit.js

@@ -20,5 +20,6 @@ const arrayLiteral = (elements) => {
     const lines = elements.map((element) => `    ${element},`);
     return `[\n${lines.join("\n")}\n]`;
 };
-export { indent, renderBlock, renderBraced, renderBracedOrEmpty, indentMembers, joinArgs, arrayLiteral };
+const pure = (expression) => `/* @__PURE__ */ ${expression}`;
+export { indent, renderBlock, renderBraced, renderBracedOrEmpty, indentMembers, joinArgs, arrayLiteral, pure };
 //# sourceMappingURL=emit.js.map

package/dist/writer/emit.js.map

@@ -1 +1 @@
-{"version":3,"file":"emit.js","sourceRoot":"","sources":["../../src/writer/emit.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,GAAG,CAAC,KAAa,EAAE,KAAa,EAAU,EAAE;IACpD,IAAI,KAAK,IAAI,CAAC,EAAE,CAAC;QACb,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAE3C,OAAO,KAAK;SACP,KAAK,CAAC,IAAI,CAAC;SACX,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,MAAM,GAAG,IAAI,EAAE,CAAC,CAAC;SAC9D,IAAI,CAAC,IAAI,CAAC,CAAC;AACpB,CAAC,CAAC;AAEF,MAAM,WAAW,GAAG,CAAC,IAAY,EAAE,IAAY,EAAU,EAAE,CAAC,GAAG,IAAI,OAAO,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC;AAC/F,MAAM,YAAY,GAAG,CAAC,IAAY,EAAU,EAAE,CAAC,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC;AAE1E,MAAM,mBAAmB,GAAG,CAAC,IAAY,EAAE,IAAY,EAAU,EAAE,CAC/D,IAAI,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,KAAK,CAAC,CAAC,CAAC,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;AAE/D,MAAM,aAAa,GAAG,CAAC,OAAiB,EAAU,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;AAE7G,MAAM,QAAQ,GAAG,CAAC,KAA6B,EAAU,EAAE,CACvD,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAkB,EAAE,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAE1E,MAAM,YAAY,GAAG,CAAC,QAAkB,EAAU,EAAE;IAChD,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACxB,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,MAAM,KAAK,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,OAAO,GAAG,CAAC,CAAC;IAE3D,OAAO,MAAM,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC;AACvC,CAAC,CAAC;AAEF,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,YAAY,EAAE,mBAAmB,EAAE,aAAa,EAAE,QAAQ,EAAE,YAAY,EAAE,CAAC","sourcesContent":["const indent = (block: string, level: number): string => {\n    if (level <= 0) {\n        return block;\n    }\n\n    const prefix = \" \".repeat(4).repeat(level);\n\n    return block\n        .split(\"\\n\")\n        .map((line) => (line.length === 0 ? line : `${prefix}${line}`))\n        .join(\"\\n\");\n};\n\nconst renderBlock = (head: string, body: string): string => `${head} {\\n${indent(body, 1)}\\n}`;\nconst renderBraced = (body: string): string => `{\\n${indent(body, 1)}\\n}`;\n\nconst renderBracedOrEmpty = (head: string, body: string): string =>\n    body.length === 0 ? `${head} {}` : renderBlock(head, body);\n\nconst indentMembers = (members: string[]): string => members.map((member) => indent(member, 1)).join(\"\\n\\n\");\n\nconst joinArgs = (parts: (string | undefined)[]): string =>\n    parts.filter((part): part is string => part !== undefined).join(\", \");\n\nconst arrayLiteral = (elements: string[]): string => {\n    if (elements.length === 0) {\n        return \"[]\";\n    }\n\n    const lines = elements.map((element) => `    ${element},`);\n\n    return `[\\n${lines.join(\"\\n\")}\\n]`;\n};\n\nexport { indent, renderBlock, renderBraced, renderBracedOrEmpty, indentMembers, joinArgs, arrayLiteral };\n"]}
+{"version":3,"file":"emit.js","sourceRoot":"","sources":["../../src/writer/emit.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,GAAG,CAAC,KAAa,EAAE,KAAa,EAAU,EAAE;IACpD,IAAI,KAAK,IAAI,CAAC,EAAE,CAAC;QACb,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAE3C,OAAO,KAAK;SACP,KAAK,CAAC,IAAI,CAAC;SACX,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,MAAM,GAAG,IAAI,EAAE,CAAC,CAAC;SAC9D,IAAI,CAAC,IAAI,CAAC,CAAC;AACpB,CAAC,CAAC;AAEF,MAAM,WAAW,GAAG,CAAC,IAAY,EAAE,IAAY,EAAU,EAAE,CAAC,GAAG,IAAI,OAAO,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC;AAC/F,MAAM,YAAY,GAAG,CAAC,IAAY,EAAU,EAAE,CAAC,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC;AAE1E,MAAM,mBAAmB,GAAG,CAAC,IAAY,EAAE,IAAY,EAAU,EAAE,CAC/D,IAAI,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,KAAK,CAAC,CAAC,CAAC,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;AAE/D,MAAM,aAAa,GAAG,CAAC,OAAiB,EAAU,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;AAE7G,MAAM,QAAQ,GAAG,CAAC,KAA6B,EAAU,EAAE,CACvD,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAkB,EAAE,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAE1E,MAAM,YAAY,GAAG,CAAC,QAAkB,EAAU,EAAE;IAChD,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACxB,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,MAAM,KAAK,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,OAAO,GAAG,CAAC,CAAC;IAE3D,OAAO,MAAM,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC;AACvC,CAAC,CAAC;AAEF,MAAM,IAAI,GAAG,CAAC,UAAkB,EAAU,EAAE,CAAC,mBAAmB,UAAU,EAAE,CAAC;AAE7E,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,YAAY,EAAE,mBAAmB,EAAE,aAAa,EAAE,QAAQ,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC","sourcesContent":["const indent = (block: string, level: number): string => {\n    if (level <= 0) {\n        return block;\n    }\n\n    const prefix = \" \".repeat(4).repeat(level);\n\n    return block\n        .split(\"\\n\")\n        .map((line) => (line.length === 0 ? line : `${prefix}${line}`))\n        .join(\"\\n\");\n};\n\nconst renderBlock = (head: string, body: string): string => `${head} {\\n${indent(body, 1)}\\n}`;\nconst renderBraced = (body: string): string => `{\\n${indent(body, 1)}\\n}`;\n\nconst renderBracedOrEmpty = (head: string, body: string): string =>\n    body.length === 0 ? `${head} {}` : renderBlock(head, body);\n\nconst indentMembers = (members: string[]): string => members.map((member) => indent(member, 1)).join(\"\\n\\n\");\n\nconst joinArgs = (parts: (string | undefined)[]): string =>\n    parts.filter((part): part is string => part !== undefined).join(\", \");\n\nconst arrayLiteral = (elements: string[]): string => {\n    if (elements.length === 0) {\n        return \"[]\";\n    }\n\n    const lines = elements.map((element) => `    ${element},`);\n\n    return `[\\n${lines.join(\"\\n\")}\\n]`;\n};\n\nconst pure = (expression: string): string => `/* @__PURE__ */ ${expression}`;\n\nexport { indent, renderBlock, renderBraced, renderBracedOrEmpty, indentMembers, joinArgs, arrayLiteral, pure };\n"]}

package/dist/writer/imports.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"imports.d.ts","sourceRoot":"","sources":["../../src/writer/imports.ts"],"names":[],"mappings":"AAoBA,cAAM,cAAc;IAChB,OAAO,CAAC,KAAK,CAAoD;IACjE,OAAO,CAAC,UAAU,CAA2C;IAC7D,OAAO,CAAC,WAAW,CAA0B;IAE7C,OAAO,CAAC,aAAa;IAyBrB,QAAQ,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,UAAQ,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI;IAa/E,YAAY,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,UAAQ,GAAG,IAAI;IAMpE,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI;IAItC,QAAQ,IAAI,MAAM;CAkBrB;AAED,OAAO,EAAE,cAAc,EAAE,CAAC"}
+{"version":3,"file":"imports.d.ts","sourceRoot":"","sources":["../../src/writer/imports.ts"],"names":[],"mappings":"AAoBA,cAAM,cAAc;IAChB,OAAO,CAAC,KAAK,CAAoD;IACjE,OAAO,CAAC,UAAU,CAA2C;IAC7D,OAAO,CAAC,WAAW,CAA0B;IAE7C,OAAO,CAAC,aAAa;IAyBrB,QAAQ,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,UAAQ,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI;IAa/E,YAAY,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,UAAQ,GAAG,IAAI;IAcpE,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI;IAItC,QAAQ,IAAI,MAAM;CAkBrB;AAED,OAAO,EAAE,cAAc,EAAE,CAAC"}

package/dist/writer/imports.js

@@ -38,8 +38,13 @@ class ImportsBuilder {
         bucket.set(local, { name, isType: (existing?.isType ?? true) && isType });
     }
     addNamespace(specifier, alias, isType = false) {
-        if (!this.namespaces.has(specifier)) {
+        const existing = this.namespaces.get(specifier);
+        if (existing === undefined) {
             this.namespaces.set(specifier, { alias, isType });
+            return;
+        }
+        if (!isType && existing.isType) {
+            existing.isType = false;
         }
     }
     addSideEffect(specifier) {

package/dist/writer/imports.js.map

@@ -1 +1 @@
-{"version":3,"file":"imports.js","sourceRoot":"","sources":["../../src/writer/imports.ts"],"names":[],"mappings":"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","sourcesContent":["import { sortStrings, sortStringsBy, sourceStringLiteral } from \"@gtkx/utils\";\n\ntype NamespaceImport = {\n    alias: string;\n    isType: boolean;\n};\n\ntype NamedImport = {\n    name: string;\n    isType: boolean;\n};\n\nfunction formatNamedNames(namedNames: Map<string, NamedImport>): string[] {\n    return sortStringsBy(namedNames.entries(), ([local]) => local).map(([local, entry]) => {\n        const spec = entry.name === local ? entry.name : `${entry.name} as ${local}`;\n\n        return entry.isType ? `type ${spec}` : spec;\n    });\n}\n\nclass ImportsBuilder {\n    private named: Map<string, Map<string, NamedImport>> = new Map();\n    private namespaces: Map<string, NamespaceImport> = new Map();\n    private sideEffects: Set<string> = new Set();\n\n    private specifierLine(specifier: string): string | undefined {\n        const namespaceImport = this.namespaces.get(specifier);\n        const namedNames = this.named.get(specifier);\n\n        if (namespaceImport?.isType === true) {\n            return `import type * as ${namespaceImport.alias} from ${sourceStringLiteral(specifier)};`;\n        }\n\n        const parts: string[] = [];\n\n        if (namespaceImport !== undefined) {\n            parts.push(`* as ${namespaceImport.alias}`);\n        }\n\n        if (namedNames !== undefined && namedNames.size > 0) {\n            parts.push(`{ ${formatNamedNames(namedNames).join(\", \")} }`);\n        }\n\n        if (parts.length === 0) {\n            return undefined;\n        }\n\n        return `import ${parts.join(\", \")} from ${sourceStringLiteral(specifier)};`;\n    }\n\n    addNamed(specifier: string, name: string, isType = false, alias?: string): void {\n        const local = alias ?? name;\n        let bucket = this.named.get(specifier);\n\n        if (bucket === undefined) {\n            bucket = new Map();\n            this.named.set(specifier, bucket);\n        }\n\n        const existing = bucket.get(local);\n        bucket.set(local, { name, isType: (existing?.isType ?? true) && isType });\n    }\n\n    addNamespace(specifier: string, alias: string, isType = false): void {\n        if (!this.namespaces.has(specifier)) {\n            this.namespaces.set(specifier, { alias, isType });\n        }\n    }\n\n    addSideEffect(specifier: string): void {\n        this.sideEffects.add(specifier);\n    }\n\n    toSource(): string {\n        const lines: string[] = Array.from(\n            this.sideEffects,\n            (specifier) => `import ${sourceStringLiteral(specifier)};`,\n        );\n\n        const specifiers: Set<string> = new Set([...this.named.keys(), ...this.namespaces.keys()]);\n\n        for (const specifier of sortStrings(specifiers)) {\n            const line = this.specifierLine(specifier);\n\n            if (line !== undefined) {\n                lines.push(line);\n            }\n        }\n\n        return lines.length === 0 ? \"\" : `${lines.join(\"\\n\")}\\n`;\n    }\n}\n\nexport { ImportsBuilder };\n"]}
+{"version":3,"file":"imports.js","sourceRoot":"","sources":["../../src/writer/imports.ts"],"names":[],"mappings":"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","sourcesContent":["import { sortStrings, sortStringsBy, sourceStringLiteral } from \"@gtkx/utils\";\n\ntype NamespaceImport = {\n    alias: string;\n    isType: boolean;\n};\n\ntype NamedImport = {\n    name: string;\n    isType: boolean;\n};\n\nfunction formatNamedNames(namedNames: Map<string, NamedImport>): string[] {\n    return sortStringsBy(namedNames.entries(), ([local]) => local).map(([local, entry]) => {\n        const spec = entry.name === local ? entry.name : `${entry.name} as ${local}`;\n\n        return entry.isType ? `type ${spec}` : spec;\n    });\n}\n\nclass ImportsBuilder {\n    private named: Map<string, Map<string, NamedImport>> = new Map();\n    private namespaces: Map<string, NamespaceImport> = new Map();\n    private sideEffects: Set<string> = new Set();\n\n    private specifierLine(specifier: string): string | undefined {\n        const namespaceImport = this.namespaces.get(specifier);\n        const namedNames = this.named.get(specifier);\n\n        if (namespaceImport?.isType === true) {\n            return `import type * as ${namespaceImport.alias} from ${sourceStringLiteral(specifier)};`;\n        }\n\n        const parts: string[] = [];\n\n        if (namespaceImport !== undefined) {\n            parts.push(`* as ${namespaceImport.alias}`);\n        }\n\n        if (namedNames !== undefined && namedNames.size > 0) {\n            parts.push(`{ ${formatNamedNames(namedNames).join(\", \")} }`);\n        }\n\n        if (parts.length === 0) {\n            return undefined;\n        }\n\n        return `import ${parts.join(\", \")} from ${sourceStringLiteral(specifier)};`;\n    }\n\n    addNamed(specifier: string, name: string, isType = false, alias?: string): void {\n        const local = alias ?? name;\n        let bucket = this.named.get(specifier);\n\n        if (bucket === undefined) {\n            bucket = new Map();\n            this.named.set(specifier, bucket);\n        }\n\n        const existing = bucket.get(local);\n        bucket.set(local, { name, isType: (existing?.isType ?? true) && isType });\n    }\n\n    addNamespace(specifier: string, alias: string, isType = false): void {\n        const existing = this.namespaces.get(specifier);\n\n        if (existing === undefined) {\n            this.namespaces.set(specifier, { alias, isType });\n\n            return;\n        }\n\n        if (!isType && existing.isType) {\n            existing.isType = false;\n        }\n    }\n\n    addSideEffect(specifier: string): void {\n        this.sideEffects.add(specifier);\n    }\n\n    toSource(): string {\n        const lines: string[] = Array.from(\n            this.sideEffects,\n            (specifier) => `import ${sourceStringLiteral(specifier)};`,\n        );\n\n        const specifiers: Set<string> = new Set([...this.named.keys(), ...this.namespaces.keys()]);\n\n        for (const specifier of sortStrings(specifiers)) {\n            const line = this.specifierLine(specifier);\n\n            if (line !== undefined) {\n                lines.push(line);\n            }\n        }\n\n        return lines.length === 0 ? \"\" : `${lines.join(\"\\n\")}\\n`;\n    }\n}\n\nexport { ImportsBuilder };\n"]}

package/dist/writer/module.d.ts

@@ -3,6 +3,7 @@ type Declaration = {
     name: string;
     code: string;
     owner?: string | undefined;
+    isLocal?: boolean | undefined;
 };
 declare class ModuleBuilder {
     private bindings;

package/dist/writer/module.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"module.d.ts","sourceRoot":"","sources":["../../src/writer/module.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAE9C,KAAK,WAAW,GAAG;IACf,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC9B,CAAC;AA6BF,cAAM,aAAa;IACf,OAAO,CAAC,QAAQ,CAAgB;IAChC,OAAO,CAAC,YAAY,CAA0B;IAC9C,OAAO,CAAC,kBAAkB,CAAkC;IAC5D,OAAO,CAAC,aAAa,CAA0B;IAC/C,OAAO,CAAC,YAAY,CAAgB;IACpC,OAAO,CAAC,aAAa,CAA0B;IAC/C,OAAO,CAAC,aAAa,CAAkC;IACvD,OAAO,CAAC,aAAa,CAAgB;IACrC,OAAO,CAAC,aAAa,CAA0B;IACxC,OAAO,EAAE,cAAc,CAAwB;IAEtD,OAAO,CAAC,UAAU;IAalB,OAAO,CAAC,iBAAiB;IAgBzB,OAAO,CAAC,aAAa;IAmBrB,OAAO,CAAC,mBAAmB;IAa3B,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI;IAYhD,eAAe,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM;IAc3C,iBAAiB,CAAC,WAAW,EAAE,WAAW,GAAG,IAAI;IAOjD,UAAU,IAAI,OAAO;IAIrB,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,GAAE,MAAM,EAAO,GAAG,IAAI;IAQ/D,QAAQ,IAAI,MAAM;CAuBrB;AAED,OAAO,EAAE,KAAK,WAAW,EAAE,aAAa,EAAE,CAAC"}
+{"version":3,"file":"module.d.ts","sourceRoot":"","sources":["../../src/writer/module.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAE9C,KAAK,WAAW,GAAG;IACf,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3B,OAAO,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;CACjC,CAAC;AA6BF,cAAM,aAAa;IACf,OAAO,CAAC,QAAQ,CAAgB;IAChC,OAAO,CAAC,YAAY,CAA0B;IAC9C,OAAO,CAAC,kBAAkB,CAAkC;IAC5D,OAAO,CAAC,aAAa,CAA0B;IAC/C,OAAO,CAAC,YAAY,CAAgB;IACpC,OAAO,CAAC,aAAa,CAA0B;IAC/C,OAAO,CAAC,aAAa,CAAkC;IACvD,OAAO,CAAC,aAAa,CAAgB;IACrC,OAAO,CAAC,aAAa,CAA0B;IACxC,OAAO,EAAE,cAAc,CAAwB;IAEtD,OAAO,CAAC,UAAU;IAalB,OAAO,CAAC,iBAAiB;IAgBzB,OAAO,CAAC,aAAa;IAmBrB,OAAO,CAAC,mBAAmB;IAa3B,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI;IAYhD,eAAe,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM;IAc3C,iBAAiB,CAAC,WAAW,EAAE,WAAW,GAAG,IAAI;IAajD,UAAU,IAAI,OAAO;IAIrB,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,GAAE,MAAM,EAAO,GAAG,IAAI;IAQ/D,QAAQ,IAAI,MAAM;CAuBrB;AAED,OAAO,EAAE,KAAK,WAAW,EAAE,aAAa,EAAE,CAAC"}

package/dist/writer/module.js

@@ -1,3 +1,4 @@
+import { pure } from "./emit.js";
 import { ImportsBuilder } from "./imports.js";
 const EXPORTED_DECLARATION = /^export (?:abstract )?(class|const|enum|function|interface|type) ([A-Za-z_$][\w$]*)/mu;
 const SPACES_BY_KEYWORD = new Map([
@@ -81,10 +82,14 @@ class ModuleBuilder {
         }
         const name = `_desc${String(this.hoistedDescriptors.size)}`;
         this.hoistedDescriptors.set(expression, name);
-        this.appendBinding(`const ${name} = ${expression};`, name);
+        this.appendBinding(`const ${name} = ${pure(expression)};`, name);
         return name;
     }
     appendDeclaration(declaration) {
+        if (declaration.isLocal === true) {
+            this.declarations.push(declaration.code);
+            return;
+        }
         this.claimExportedName(declaration);
         this.claimTypeName(declaration);
         this.declaredNames.add(declaration.name);

package/dist/writer/module.js.map

@@ -1 +1 @@
-{"version":3,"file":"module.js","sourceRoot":"","sources":["../../src/writer/module.ts"],"names":[],"mappings":"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","sourcesContent":["import { ImportsBuilder } from \"./imports.js\";\n\ntype Declaration = {\n    name: string;\n    code: string;\n    owner?: string | undefined;\n};\n\ntype ExportedDeclaration = {\n    name: string;\n    spaces: string[];\n};\n\nconst EXPORTED_DECLARATION = /^export (?:abstract )?(class|const|enum|function|interface|type) ([A-Za-z_$][\\w$]*)/mu;\n\nconst SPACES_BY_KEYWORD: Map<string, string[]> = new Map([\n    [\"class\", [\"value\", \"type\"]],\n    [\"const\", [\"value\"]],\n    [\"enum\", [\"value\", \"type\"]],\n    [\"function\", [\"value\"]],\n    [\"interface\", []],\n    [\"type\", [\"type\"]],\n]);\n\nconst getExportedDeclaration = (code: string): ExportedDeclaration | undefined => {\n    const match = EXPORTED_DECLARATION.exec(code);\n    const spaces = SPACES_BY_KEYWORD.get(match?.[1] ?? \"\");\n    const name = match?.[2];\n\n    return spaces === undefined || name === undefined ? undefined : { name, spaces };\n};\n\nconst exportedNameText = (exported: ExportedDeclaration | undefined): string =>\n    exported === undefined ? \"no name at all\" : `'${exported.name}'`;\n\nclass ModuleBuilder {\n    private bindings: string[] = [];\n    private bindingNames: Set<string> = new Set();\n    private hoistedDescriptors: Map<string, string> = new Map();\n    private claimedSpaces: Set<string> = new Set();\n    private declarations: string[] = [];\n    private declaredNames: Set<string> = new Set();\n    private declaredTypes: Map<string, string> = new Map();\n    private registrations: string[] = [];\n    private requiredNames: Set<string> = new Set();\n    public imports: ImportsBuilder = new ImportsBuilder();\n\n    private claimSpace(name: string, space: string): void {\n        const key = `${space} ${name}`;\n\n        if (this.claimedSpaces.has(key)) {\n            throw new Error(\n                `The generated module declares '${name}' twice in its ${space} space. ` +\n                \"A module may declare each exported name once per declaration space.\",\n            );\n        }\n\n        this.claimedSpaces.add(key);\n    }\n\n    private claimExportedName(declaration: Declaration): void {\n        const exported = getExportedDeclaration(declaration.code);\n        const spaces = exported?.name === declaration.name ? exported.spaces : undefined;\n\n        if (spaces === undefined) {\n            throw new Error(\n                `The declaration recorded as '${declaration.name}' exports ${exportedNameText(exported)}. ` +\n                \"A declaration may only be recorded under the name its own code exports.\",\n            );\n        }\n\n        for (const space of spaces) {\n            this.claimSpace(declaration.name, space);\n        }\n    }\n\n    private claimTypeName(declaration: Declaration): void {\n        const { name, owner } = declaration;\n\n        if (owner === undefined) {\n            return;\n        }\n\n        const previous = this.declaredTypes.get(name);\n\n        if (previous !== undefined && previous !== owner) {\n            throw new Error(\n                `The generated type '${name}' is declared for both ${previous} and ${owner}. ` +\n                \"Rename one of them, or drop the namespace from the configuration.\",\n            );\n        }\n\n        this.declaredTypes.set(name, owner);\n    }\n\n    private verifyRegistrations(): void {\n        const missing = [...this.requiredNames].filter((name) => !this.declaredNames.has(name));\n\n        if (missing.length === 0) {\n            return;\n        }\n\n        throw new Error(\n            `The generated module registers ${missing.join(\", \")}, which it never declares. ` +\n            \"A registration may only name a symbol whose declaration the same module emits.\",\n        );\n    }\n\n    appendBinding(code: string, name?: string): void {\n        if (name !== undefined) {\n            if (this.bindingNames.has(name)) {\n                return;\n            }\n\n            this.bindingNames.add(name);\n        }\n\n        this.bindings.push(code);\n    }\n\n    hoistDescriptor(expression: string): string {\n        const existing = this.hoistedDescriptors.get(expression);\n\n        if (existing !== undefined) {\n            return existing;\n        }\n\n        const name = `_desc${String(this.hoistedDescriptors.size)}`;\n        this.hoistedDescriptors.set(expression, name);\n        this.appendBinding(`const ${name} = ${expression};`, name);\n\n        return name;\n    }\n\n    appendDeclaration(declaration: Declaration): void {\n        this.claimExportedName(declaration);\n        this.claimTypeName(declaration);\n        this.declaredNames.add(declaration.name);\n        this.declarations.push(declaration.code);\n    }\n\n    hasExports(): boolean {\n        return this.declaredNames.size > 0;\n    }\n\n    appendRegistration(code: string, requires: string[] = []): void {\n        for (const name of requires) {\n            this.requiredNames.add(name);\n        }\n\n        this.registrations.push(code);\n    }\n\n    toSource(): string {\n        this.verifyRegistrations();\n        const sections: string[] = [];\n        const importsBlock = this.imports.toSource();\n\n        if (importsBlock.length > 0) {\n            sections.push(importsBlock.trimEnd());\n        }\n\n        if (this.declarations.length > 0) {\n            sections.push(this.declarations.join(\"\\n\\n\"));\n        }\n\n        if (this.bindings.length > 0) {\n            sections.push(this.bindings.join(\"\\n\\n\"));\n        }\n\n        if (this.registrations.length > 0) {\n            sections.push(this.registrations.join(\"\\n\\n\"));\n        }\n\n        return `${sections.join(\"\\n\\n\")}\\n`;\n    }\n}\n\nexport { type Declaration, ModuleBuilder };\n"]}
+{"version":3,"file":"module.js","sourceRoot":"","sources":["../../src/writer/module.ts"],"names":[],"mappings":"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","sourcesContent":["import { pure } from \"./emit.js\";\nimport { ImportsBuilder } from \"./imports.js\";\n\ntype Declaration = {\n    name: string;\n    code: string;\n    owner?: string | undefined;\n    isLocal?: boolean | undefined;\n};\n\ntype ExportedDeclaration = {\n    name: string;\n    spaces: string[];\n};\n\nconst EXPORTED_DECLARATION = /^export (?:abstract )?(class|const|enum|function|interface|type) ([A-Za-z_$][\\w$]*)/mu;\n\nconst SPACES_BY_KEYWORD: Map<string, string[]> = new Map([\n    [\"class\", [\"value\", \"type\"]],\n    [\"const\", [\"value\"]],\n    [\"enum\", [\"value\", \"type\"]],\n    [\"function\", [\"value\"]],\n    [\"interface\", []],\n    [\"type\", [\"type\"]],\n]);\n\nconst getExportedDeclaration = (code: string): ExportedDeclaration | undefined => {\n    const match = EXPORTED_DECLARATION.exec(code);\n    const spaces = SPACES_BY_KEYWORD.get(match?.[1] ?? \"\");\n    const name = match?.[2];\n\n    return spaces === undefined || name === undefined ? undefined : { name, spaces };\n};\n\nconst exportedNameText = (exported: ExportedDeclaration | undefined): string =>\n    exported === undefined ? \"no name at all\" : `'${exported.name}'`;\n\nclass ModuleBuilder {\n    private bindings: string[] = [];\n    private bindingNames: Set<string> = new Set();\n    private hoistedDescriptors: Map<string, string> = new Map();\n    private claimedSpaces: Set<string> = new Set();\n    private declarations: string[] = [];\n    private declaredNames: Set<string> = new Set();\n    private declaredTypes: Map<string, string> = new Map();\n    private registrations: string[] = [];\n    private requiredNames: Set<string> = new Set();\n    public imports: ImportsBuilder = new ImportsBuilder();\n\n    private claimSpace(name: string, space: string): void {\n        const key = `${space} ${name}`;\n\n        if (this.claimedSpaces.has(key)) {\n            throw new Error(\n                `The generated module declares '${name}' twice in its ${space} space. ` +\n                \"A module may declare each exported name once per declaration space.\",\n            );\n        }\n\n        this.claimedSpaces.add(key);\n    }\n\n    private claimExportedName(declaration: Declaration): void {\n        const exported = getExportedDeclaration(declaration.code);\n        const spaces = exported?.name === declaration.name ? exported.spaces : undefined;\n\n        if (spaces === undefined) {\n            throw new Error(\n                `The declaration recorded as '${declaration.name}' exports ${exportedNameText(exported)}. ` +\n                \"A declaration may only be recorded under the name its own code exports.\",\n            );\n        }\n\n        for (const space of spaces) {\n            this.claimSpace(declaration.name, space);\n        }\n    }\n\n    private claimTypeName(declaration: Declaration): void {\n        const { name, owner } = declaration;\n\n        if (owner === undefined) {\n            return;\n        }\n\n        const previous = this.declaredTypes.get(name);\n\n        if (previous !== undefined && previous !== owner) {\n            throw new Error(\n                `The generated type '${name}' is declared for both ${previous} and ${owner}. ` +\n                \"Rename one of them, or drop the namespace from the configuration.\",\n            );\n        }\n\n        this.declaredTypes.set(name, owner);\n    }\n\n    private verifyRegistrations(): void {\n        const missing = [...this.requiredNames].filter((name) => !this.declaredNames.has(name));\n\n        if (missing.length === 0) {\n            return;\n        }\n\n        throw new Error(\n            `The generated module registers ${missing.join(\", \")}, which it never declares. ` +\n            \"A registration may only name a symbol whose declaration the same module emits.\",\n        );\n    }\n\n    appendBinding(code: string, name?: string): void {\n        if (name !== undefined) {\n            if (this.bindingNames.has(name)) {\n                return;\n            }\n\n            this.bindingNames.add(name);\n        }\n\n        this.bindings.push(code);\n    }\n\n    hoistDescriptor(expression: string): string {\n        const existing = this.hoistedDescriptors.get(expression);\n\n        if (existing !== undefined) {\n            return existing;\n        }\n\n        const name = `_desc${String(this.hoistedDescriptors.size)}`;\n        this.hoistedDescriptors.set(expression, name);\n        this.appendBinding(`const ${name} = ${pure(expression)};`, name);\n\n        return name;\n    }\n\n    appendDeclaration(declaration: Declaration): void {\n        if (declaration.isLocal === true) {\n            this.declarations.push(declaration.code);\n\n            return;\n        }\n\n        this.claimExportedName(declaration);\n        this.claimTypeName(declaration);\n        this.declaredNames.add(declaration.name);\n        this.declarations.push(declaration.code);\n    }\n\n    hasExports(): boolean {\n        return this.declaredNames.size > 0;\n    }\n\n    appendRegistration(code: string, requires: string[] = []): void {\n        for (const name of requires) {\n            this.requiredNames.add(name);\n        }\n\n        this.registrations.push(code);\n    }\n\n    toSource(): string {\n        this.verifyRegistrations();\n        const sections: string[] = [];\n        const importsBlock = this.imports.toSource();\n\n        if (importsBlock.length > 0) {\n            sections.push(importsBlock.trimEnd());\n        }\n\n        if (this.declarations.length > 0) {\n            sections.push(this.declarations.join(\"\\n\\n\"));\n        }\n\n        if (this.bindings.length > 0) {\n            sections.push(this.bindings.join(\"\\n\\n\"));\n        }\n\n        if (this.registrations.length > 0) {\n            sections.push(this.registrations.join(\"\\n\\n\"));\n        }\n\n        return `${sections.join(\"\\n\\n\")}\\n`;\n    }\n}\n\nexport { type Declaration, ModuleBuilder };\n"]}

package/overrides/glib/regex.ts.ejs

@@ -20,6 +20,7 @@ declare module "../glib.js" {
          * @since 2.14
          */
         matchFull(string: string, startPosition: number, matchOptions: RegexMatchFlags): [boolean, MatchInfo];
+        matchFull(string: string[], startPosition: number, matchOptions: RegexMatchFlags): [boolean, MatchInfo];
         /**
          * Using the DFA algorithm, scans for all the possible matches in `string`,
          * including overlapping ones.
@@ -38,6 +39,7 @@ declare module "../glib.js" {
          * @since 2.14
          */
         matchAllFull(string: string, startPosition: number, matchOptions: RegexMatchFlags): [boolean, MatchInfo];
+        matchAllFull(string: string[], startPosition: number, matchOptions: RegexMatchFlags): [boolean, MatchInfo];
     }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gtkx/codegen",
-  "version": "1.5.0",
+  "version": "1.6.0",
   "description": "Generates typed GTK bindings and API docs from GIR and GL registries.",
   "keywords": [
     "gtkx",
@@ -58,9 +58,9 @@
     "fast-xml-parser": "^5.11.0",
     "fast-xml-validator": "^1.4.2",
     "typescript": "^6.0.3",
-    "@gtkx/cairo": "1.5.0",
-    "@gtkx/react": "1.5.0",
-    "@gtkx/utils": "1.5.0"
+    "@gtkx/react": "1.6.0",
+    "@gtkx/utils": "1.6.0",
+    "@gtkx/cairo": "1.6.0"
   },
   "scripts": {
     "release": "tsx ../../scripts/release-package.ts"