Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(pacmak): multiple go (and python) issues #2622

Merged
merged 5 commits into from
Mar 1, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions packages/jsii-calc/lib/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,5 @@ export * from './stability';
export * from './submodules';

export * as submodule from './submodule';
export * as onlystatic from './only-static';
export * as nodirect from './no-direct-types';
4 changes: 4 additions & 0 deletions packages/jsii-calc/lib/no-direct-types/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
// THIS MODULE ONLY EXPORTS SUBMODULES: it tests the case in which a module does not export direct
// types but rather only exports submodules (see https://github.com/aws/jsii/issues/2619)
export * as sub1 from './sub1';
export * as sub2 from './sub2';
5 changes: 5 additions & 0 deletions packages/jsii-calc/lib/no-direct-types/sub1/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
export class TypeFromSub1 {
public sub1() {
return 'foo';
}
}
5 changes: 5 additions & 0 deletions packages/jsii-calc/lib/no-direct-types/sub2/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
export class TypeFromSub2 {
public sub2() {
return 'foo';
}
}
10 changes: 10 additions & 0 deletions packages/jsii-calc/lib/only-static/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
/**
* Test for https://github.com/aws/jsii/issues/2617
*/
export class OnlyStaticMethods {
public static staticMethod() {
return 'hello';
}

private constructor() {}
}
131 changes: 130 additions & 1 deletion packages/jsii-calc/test/assembly.jsii
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,30 @@
"line": 142
}
},
"jsii-calc.nodirect": {
"locationInModule": {
"filename": "lib/index.ts",
"line": 13
}
},
"jsii-calc.nodirect.sub1": {
"locationInModule": {
"filename": "lib/no-direct-types/index.ts",
"line": 3
}
},
"jsii-calc.nodirect.sub2": {
"locationInModule": {
"filename": "lib/no-direct-types/index.ts",
"line": 4
}
},
"jsii-calc.onlystatic": {
"locationInModule": {
"filename": "lib/index.ts",
"line": 12
}
},
"jsii-calc.submodule": {
"locationInModule": {
"filename": "lib/index.ts",
Expand Down Expand Up @@ -13860,6 +13884,111 @@
"name": "CompositionStringStyle",
"namespace": "composition.CompositeOperation"
},
"jsii-calc.nodirect.sub1.TypeFromSub1": {
"assembly": "jsii-calc",
"docs": {
"stability": "stable"
},
"fqn": "jsii-calc.nodirect.sub1.TypeFromSub1",
"initializer": {
"docs": {
"stability": "stable"
}
},
"kind": "class",
"locationInModule": {
"filename": "lib/no-direct-types/sub1/index.ts",
"line": 1
},
"methods": [
{
"docs": {
"stability": "stable"
},
"locationInModule": {
"filename": "lib/no-direct-types/sub1/index.ts",
"line": 2
},
"name": "sub1",
"returns": {
"type": {
"primitive": "string"
}
}
}
],
"name": "TypeFromSub1",
"namespace": "nodirect.sub1"
},
"jsii-calc.nodirect.sub2.TypeFromSub2": {
"assembly": "jsii-calc",
"docs": {
"stability": "stable"
},
"fqn": "jsii-calc.nodirect.sub2.TypeFromSub2",
"initializer": {
"docs": {
"stability": "stable"
}
},
"kind": "class",
"locationInModule": {
"filename": "lib/no-direct-types/sub2/index.ts",
"line": 1
},
"methods": [
{
"docs": {
"stability": "stable"
},
"locationInModule": {
"filename": "lib/no-direct-types/sub2/index.ts",
"line": 2
},
"name": "sub2",
"returns": {
"type": {
"primitive": "string"
}
}
}
],
"name": "TypeFromSub2",
"namespace": "nodirect.sub2"
},
"jsii-calc.onlystatic.OnlyStaticMethods": {
"assembly": "jsii-calc",
"docs": {
"stability": "stable",
"summary": "Test for https://github.com/aws/jsii/issues/2617."
},
"fqn": "jsii-calc.onlystatic.OnlyStaticMethods",
"kind": "class",
"locationInModule": {
"filename": "lib/only-static/index.ts",
"line": 4
},
"methods": [
{
"docs": {
"stability": "stable"
},
"locationInModule": {
"filename": "lib/only-static/index.ts",
"line": 5
},
"name": "staticMethod",
"returns": {
"type": {
"primitive": "string"
}
},
"static": true
}
],
"name": "OnlyStaticMethods",
"namespace": "onlystatic"
},
"jsii-calc.submodule.MyClass": {
"assembly": "jsii-calc",
"docs": {
Expand Down Expand Up @@ -14477,5 +14606,5 @@
}
},
"version": "3.20.120",
"fingerprint": "DPUvV1cBxUeRNl5GK1DVzpU7/802/Hb8znpxKRttRUk="
"fingerprint": "JMTvoEnsqFjh72kI95PtIx01MmNxAbZV41K/nIgoZ4Q="
}
2 changes: 1 addition & 1 deletion packages/jsii-pacmak/lib/targets/go.ts
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ export class Golang extends Target {
// run `go build` with local.go.mod, go 1.16 requires that we download
// modules explicit so go.sum is updated.
await go('mod', ['download', '-modfile', localGoMod], { cwd: pkgDir });
await go('build', ['-modfile', localGoMod], { cwd: pkgDir });
await go('build', ['-modfile', localGoMod, './...'], { cwd: pkgDir });

// delete local.go.mod and local.go.sum from the output directory so it doesn't get published
const localGoSum = `${path.basename(localGoMod, '.mod')}.sum`;
Expand Down
10 changes: 2 additions & 8 deletions packages/jsii-pacmak/lib/targets/go/package.ts
Original file line number Diff line number Diff line change
Expand Up @@ -125,17 +125,11 @@ export abstract class Package {
}

protected get usesRuntimePackage(): boolean {
return (
this.types.some((type) => type.usesRuntimePackage) ||
this.submodules.some((sub) => sub.usesRuntimePackage)
);
return this.types.some((type) => type.usesRuntimePackage);
}

protected get usesInitPackage(): boolean {
return (
this.types.some((type) => type.usesInitPackage) ||
this.submodules.some((sub) => sub.usesInitPackage)
);
return this.types.some((type) => type.usesInitPackage);
}

/**
Expand Down
30 changes: 18 additions & 12 deletions packages/jsii-pacmak/lib/targets/go/types/class.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import { getMemberDependencies, getParamDependencies } from '../util';
import { GoType } from './go-type';
import { GoTypeRef } from './go-type-reference';
import { GoInterface } from './interface';
import { GoParameter, GoMethod, GoProperty } from './type-member';
import { GoParameter, GoMethod, GoProperty, GoTypeMember } from './type-member';

/*
* GoClass wraps a Typescript class as a Go custom struct type
Expand Down Expand Up @@ -156,20 +156,23 @@ export class GoClass extends GoType {
code.close(')');
}

public get members(): GoTypeMember[] {
return [
...this.methods,
...this.properties,
...this.staticMethods,
...this.staticProperties,
];
}

public get usesInitPackage() {
return (
this.initializer != null ||
this.methods.some((m) => m.usesInitPackage) ||
this.properties.some((p) => p.usesInitPackage)
this.initializer != null || this.members.some((m) => m.usesInitPackage)
);
}

public get usesRuntimePackage() {
return (
this.initializer != null ||
this.methods.length > 0 ||
this.properties.length > 0
);
return this.initializer != null || this.members.length > 0;
}

protected emitInterface(context: EmitContext): void {
Expand Down Expand Up @@ -289,9 +292,8 @@ export class GoClass extends GoType {
// need to add dependencies of method arguments and constructor arguments
return [
...this.baseTypes.map((ref) => ref.pkg),
...getMemberDependencies(this.properties),
...getMemberDependencies(this.methods),
...getParamDependencies(this.methods),
...getMemberDependencies(this.members),
...getParamDependencies(this.members.filter(isGoMethod)),
];
}

Expand Down Expand Up @@ -412,3 +414,7 @@ export class StaticMethod extends ClassMethod {
code.line();
}
}

function isGoMethod(m: GoTypeMember): m is GoMethod {
return m instanceof GoMethod;
}
13 changes: 8 additions & 5 deletions packages/jsii-pacmak/lib/targets/python.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1503,12 +1503,15 @@ class PythonModule implements PythonType {
code.line();
}
code.line();
code.indent('__all__ = [');
for (const member of exportedMembers.sort()) {
// Writing one by line might be _a lot_ of lines, but it'll make reviewing changes to the list easier. Trust me.
code.line(`${member},`);

if (exportedMembers.length > 0) {
code.indent('__all__ = [');
for (const member of exportedMembers.sort()) {
// Writing one by line might be _a lot_ of lines, but it'll make reviewing changes to the list easier. Trust me.
code.line(`${member},`);
}
code.unindent(']');
}
code.unindent(']');

// Finally, we'll use publication to ensure that all of the non-public names
// get hidden from dir(), tab-complete, etc.
Expand Down
Loading