Skip to content

Commit 160798b

Browse files
committed
Avoid importing twice in autogen
1 parent 3170f30 commit 160798b

File tree

3 files changed

+15
-0
lines changed

3 files changed

+15
-0
lines changed

js/scripts/generate-wrappers.js

+10
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,16 @@ Handlebars.registerHelper('rst', function (data, indent) {
131131
return new Handlebars.SafeString(out);
132132
});
133133

134+
Handlebars.registerHelper('notSuper', function (v1, options) {
135+
if (v1 === (
136+
options.data.root.superClass.modelName ||
137+
options.data.root.superClass.className
138+
)) {
139+
return options.inverse(this);
140+
}
141+
return options.fn(this);
142+
});
143+
134144
//
135145
// Helper Functions
136146
//

js/scripts/templates/js_wrapper.mustache

+3
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
//
44

55
var _ = require('underscore');
6+
var Promise = require('bluebird');
67
var THREE = require('three');
78
var widgets = require('@jupyter-widgets/base');
89
var dataserializers = require('jupyter-dataserializers');
@@ -11,7 +12,9 @@ var serializers = require('{{ relativePathToBase }}/_base/serializers');
1112
var {{ superClass.modelName }} = require('{{ superClass.requirePath }}').{{ superClass.modelName }};
1213

1314
{{#each dependencies as |dep depName|}}
15+
{{#notSuper dep.modelName}}
1416
var {{ dep.modelName }} = require('{{ dep.requirePath }}').{{ dep.modelName }};
17+
{{/notSuper}}
1518
{{/each}}
1619

1720
var {{ modelName }} = {{ superClass.modelName }}.extend({

js/scripts/templates/py_wrapper.mustache

+2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@ from {{ py_base_relative_path }}traits import *
1616
from {{ superClass.pyRelativePath }} import {{ superClass.className }}
1717

1818
{{#each dependencies as |dep depName|}}
19+
{{#notSuper dep.className}}
1920
from {{ dep.pyRelativePath }} import {{ dep.className }}
21+
{{/notSuper}}
2022
{{/each}}
2123

2224
{{#unless hasOverride}}

0 commit comments

Comments
 (0)