angular-three 2.0.0-beta.280 → 2.0.0-beta.281
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json
CHANGED
|
@@ -42,7 +42,12 @@ async function initGenerator(tree, { skipGenerateExperience = false } = {}) {
|
|
|
42
42
|
});
|
|
43
43
|
if (generateExperience !== 'none') {
|
|
44
44
|
const projects = (0, devkit_1.getProjects)(tree);
|
|
45
|
-
const applicationProjects = Array.from(projects.
|
|
45
|
+
const applicationProjects = Array.from(projects.entries()).reduce((acc, [projectName, project]) => {
|
|
46
|
+
if (project.projectType === 'application') {
|
|
47
|
+
acc.push({ name: projectName, ...project });
|
|
48
|
+
}
|
|
49
|
+
return acc;
|
|
50
|
+
}, []);
|
|
46
51
|
let selectedProject;
|
|
47
52
|
if (applicationProjects.length === 1) {
|
|
48
53
|
selectedProject = applicationProjects[0].name;
|
|
@@ -84,7 +89,7 @@ async function initGenerator(tree, { skipGenerateExperience = false } = {}) {
|
|
|
84
89
|
if (!isStandalone) {
|
|
85
90
|
return warnExperienceWasNotGenerated(tree, `AppComponent is not a Standalone Component`);
|
|
86
91
|
}
|
|
87
|
-
let updatedContent = tsquery_1.tsquery.replace(appComponentContent, 'Identifier[name="imports"]
|
|
92
|
+
let updatedContent = tsquery_1.tsquery.replace(appComponentContent, 'PropertyAssignment:has(Identifier[name="imports"]) ArrayLiteralExpression', (node) => {
|
|
88
93
|
return `[${node.elements.map((element) => element['escapedText']).join(', ')}, NgtCanvas]`;
|
|
89
94
|
});
|
|
90
95
|
updatedContent = tsquery_1.tsquery.replace(updatedContent, 'SourceFile', (node) => {
|
|
@@ -98,7 +103,7 @@ ${node.getFullText()}
|
|
|
98
103
|
const appComponentContentAst = tsquery_1.tsquery.ast(appComponentContent);
|
|
99
104
|
const classMembersQuery = 'ClassDeclaration > :matches(PropertyDeclaration,MethodDeclaration)';
|
|
100
105
|
const members = tsquery_1.tsquery.match(appComponentContentAst, classMembersQuery);
|
|
101
|
-
if (members.length === 0) {
|
|
106
|
+
if (members.length === 0 || generateExperience === 'replace') {
|
|
102
107
|
updatedContent = tsquery_1.tsquery.replace(updatedContent, 'ClassDeclaration', (node) => {
|
|
103
108
|
const withoutBraces = node.getFullText().slice(0, -1);
|
|
104
109
|
return `
|
|
@@ -110,7 +115,7 @@ ${withoutBraces}
|
|
|
110
115
|
else {
|
|
111
116
|
updatedContent = tsquery_1.tsquery.replace(updatedContent, classMembersQuery, (node) => {
|
|
112
117
|
return `
|
|
113
|
-
|
|
118
|
+
sceneGraph = Experience;
|
|
114
119
|
${node.getFullText()}`;
|
|
115
120
|
});
|
|
116
121
|
}
|
|
@@ -118,17 +123,17 @@ ${node.getFullText()}`;
|
|
|
118
123
|
const updatedTemplateContent = generateExperience === 'append'
|
|
119
124
|
? `
|
|
120
125
|
${appComponentTemplateContent}
|
|
121
|
-
<ngt-canvas [sceneGraph]="
|
|
122
|
-
: `<ngt-canvas [sceneGraph]="
|
|
126
|
+
<ngt-canvas [sceneGraph]="sceneGraph" />`
|
|
127
|
+
: `<ngt-canvas [sceneGraph]="sceneGraph" />`;
|
|
123
128
|
tree.write(appComponentTemplatePath, updatedTemplateContent);
|
|
124
129
|
}
|
|
125
130
|
else {
|
|
126
|
-
updatedContent = tsquery_1.tsquery.replace(updatedContent, 'Identifier[name="template"]
|
|
131
|
+
updatedContent = tsquery_1.tsquery.replace(updatedContent, 'PropertyAssignment:has(Identifier[name="template"]) NoSubstitutionTemplateLiteral', (node) => {
|
|
127
132
|
return generateExperience === 'append'
|
|
128
133
|
? `\`
|
|
129
134
|
${node.getFullText()}
|
|
130
|
-
<ngt-canvas [sceneGraph]="
|
|
131
|
-
: `\`<ngt-canvas [sceneGraph]="
|
|
135
|
+
<ngt-canvas [sceneGraph]="sceneGraph" />\``
|
|
136
|
+
: `\`<ngt-canvas [sceneGraph]="sceneGraph" />\``;
|
|
132
137
|
});
|
|
133
138
|
}
|
|
134
139
|
tree.write(appComponentPath, updatedContent);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../libs/plugin/src/generators/init/generator.ts"],"names":[],"mappings":";;AAuBA,
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../libs/plugin/src/generators/init/generator.ts"],"names":[],"mappings":"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"}
|